Modified further based on Travis failures

Author: shweta

test/integration/component/test_project_usage.py

@@ -350,7 +350,7 @@ def test_01_vm_usage(self):
 
         self.assertEqual(
                             qresult.count('VOLUME.DELETE'),
-                            2,
+                            1,
                             "Check VOLUME.DELETE in events table"
                         )
         return

test/integration/component/test_usage.py

@@ -574,9 +574,8 @@ def tearDown(self):
             "basic",
             "sg",
             "eip",
-            "advancedns",
-            "simulator"],
-        required_hardware="false")
+            "advancedns"],
+        required_hardware="true")
     def test_01_volume_usage(self):
         """Test Create/delete a volume and verify correct usage is recorded
         """
@@ -697,10 +696,6 @@ def test_01_volume_usage(self):
             self.testdata["coreos_volume"][
                 "url"] = self.testdata["coreos_volume"]["urlxen"]
             self.testdata["coreos_volume"]["format"] = "VHD"
-        elif self.hypervisor == "simulator":
-            self.testdata["coreos_volume"][
-                "url"] = self.testdata["coreos_volume"]["urlxen"]
-            self.testdata["coreos_volume"]["format"] = "VHD"
 
         volume_uploaded = Volume.upload(
             self.apiclient,