diff --git a/test/integration/component/test_project_usage.py b/test/integration/component/test_project_usage.py index 0c7374ea7a7..829cbc7e09a 100644 --- a/test/integration/component/test_project_usage.py +++ b/test/integration/component/test_project_usage.py @@ -350,7 +350,7 @@ class TestVmUsage(cloudstackTestCase): self.assertEqual( qresult.count('VOLUME.DELETE'), - 2, + 1, "Check VOLUME.DELETE in events table" ) return diff --git a/test/integration/component/test_usage.py b/test/integration/component/test_usage.py index f5475fd4653..e6c65650496 100644 --- a/test/integration/component/test_usage.py +++ b/test/integration/component/test_usage.py @@ -574,9 +574,8 @@ class TestVolumeUsage(cloudstackTestCase): "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 @@ class TestVolumeUsage(cloudstackTestCase): 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,