From bfe16977211fa441edd2fc9084512149eca4e9c4 Mon Sep 17 00:00:00 2001 From: dahn Date: Fri, 10 Jun 2022 13:26:30 +0200 Subject: [PATCH] some component tests fixes (#5442) * allow 3 hosts or more * make numbering consistent * stray TODO removed Co-authored-by: Daan Hoogland --- .../broken/test_vpc_vm_life_cycle.py | 2 +- test/integration/component/test_host_ha.py | 49 ++++++------------- .../component/test_rootvolume_resize.py | 6 +-- 3 files changed, 19 insertions(+), 38 deletions(-) diff --git a/test/integration/broken/test_vpc_vm_life_cycle.py b/test/integration/broken/test_vpc_vm_life_cycle.py index c1868d009f9..9290835c2e6 100644 --- a/test/integration/broken/test_vpc_vm_life_cycle.py +++ b/test/integration/broken/test_vpc_vm_life_cycle.py @@ -19,7 +19,7 @@ from nose.plugins.attrib import attr from component.test_vpc_vm_life_cycle import Services -class TestVMLifeCycleSharedNwVPC(cloudstackTesTODOtCase): +class TestVMLifeCycleSharedNwVPC(cloudstackTestCase): @classmethod def setUpClass(cls): diff --git a/test/integration/component/test_host_ha.py b/test/integration/component/test_host_ha.py index d32e708b081..e6dd20bfe6b 100644 --- a/test/integration/component/test_host_ha.py +++ b/test/integration/component/test_host_ha.py @@ -17,22 +17,19 @@ """ BVT tests for Hosts Maintenance """ -# Import Local Modules -from marvin.codes import FAILED from marvin.cloudstackTestCase import * -from marvin.cloudstackAPI import * from marvin.lib.utils import * from marvin.lib.base import * from marvin.lib.common import * from nose.plugins.attrib import attr -from time import sleep - _multiprocess_shared_ = False class TestHostHA(cloudstackTestCase): + hostCountMsg = "Host HA can be tested with at least two hosts, only %s found" + def setUp(self): self.logger = logging.getLogger('TestHM') self.stream_handler = logging.StreamHandler() @@ -86,17 +83,8 @@ class TestHostHA(cloudstackTestCase): "timeout": 10, } - def tearDown(self): - try: - # Clean up, terminate the created templates - cleanup_resources(self.apiclient, self.cleanup) - - except Exception as e: - raise Exception("Warning: Exception during cleanup : %s" % e) - - return - + super(TestHostHA, self).tearDown() def createVMs(self, hostId, number, local): @@ -319,11 +307,9 @@ class TestHostHA(cloudstackTestCase): for host in listHost: self.logger.debug('Hypervisor = {}'.format(host.id)) - - if len(listHost) != 2: - self.logger.debug("Host HA can be tested with two host only %s, found" % len(listHost)) - raise unittest.SkipTest("Host HA can be tested with two host only %s, found" % len(listHost)) - + if len(listHost) < 2: + self.logger.debug(self.hostCountMsg % len(listHost)) + raise unittest.SkipTest(self.hostCountMsg % len(listHost)) no_of_vms = self.noOfVMsOnHost(listHost[0].id) @@ -331,7 +317,6 @@ class TestHostHA(cloudstackTestCase): self.logger.debug("Number of VMS on hosts = %s" % no_of_vms) - if no_of_vms < 5: self.logger.debug("test_01: Create VMs as there are not enough vms to check host ha") no_vm_req = 5 - no_of_vms @@ -396,10 +381,9 @@ class TestHostHA(cloudstackTestCase): for host in listHost: self.logger.debug('Hypervisor = {}'.format(host.id)) - - if len(listHost) != 2: - self.logger.debug("Host HA can be tested with two host only %s, found" % len(listHost)) - raise unittest.SkipTest("Host HA can be tested with two host only %s, found" % len(listHost)) + if len(listHost) < 2: + self.logger.debug(self.hostCountMsg % len(listHost)) + raise unittest.SkipTest(self.hostCountMsg % len(listHost)) no_of_vms = self.noOfVMsOnHost(listHost[0].id) @@ -473,10 +457,9 @@ class TestHostHA(cloudstackTestCase): for host in listHost: self.logger.debug('Hypervisor = {}'.format(host.id)) - - if len(listHost) != 2: - self.logger.debug("Host HA can be tested with two host only %s, found" % len(listHost)) - raise unittest.SkipTest("Host HA can be tested with two host only %s, found" % len(listHost)) + if len(listHost) < 2: + self.logger.debug(self.hostCountMsg % len(listHost)) + raise unittest.SkipTest(self.hostCountMsg % len(listHost)) no_of_vms = self.noOfVMsOnHost(listHost[0].id) @@ -548,10 +531,9 @@ class TestHostHA(cloudstackTestCase): for host in listHost: self.logger.debug('Hypervisor = {}'.format(host.id)) - - if len(listHost) != 2: - self.logger.debug("Host HA can be tested with two host only %s, found" % len(listHost)) - raise unittest.SkipTest("Host HA can be tested with two host only %s, found" % len(listHost)) + if len(listHost) < 2: + self.logger.debug(self.hostCountMsg % len(listHost)) + raise unittest.SkipTest(self.hostCountMsg % len(listHost)) no_of_vms = self.noOfVMsOnHost(listHost[0].id) @@ -559,7 +541,6 @@ class TestHostHA(cloudstackTestCase): self.logger.debug("Number of VMS on hosts = %s" % no_of_vms) - if no_of_vms < 5: self.logger.debug("test_01: Create VMs as there are not enough vms to check host ha") no_vm_req = 5 - no_of_vms diff --git a/test/integration/component/test_rootvolume_resize.py b/test/integration/component/test_rootvolume_resize.py index 1b1a6fe6db1..7e58d1e3f42 100644 --- a/test/integration/component/test_rootvolume_resize.py +++ b/test/integration/component/test_rootvolume_resize.py @@ -773,7 +773,7 @@ class TestResizeVolume(cloudstackTestCase): return @attr(tags=["advanced"], required_hardware="true") - def test_5_vmdeployment_with_size(self): + def test_05_vmdeployment_with_size(self): """Test vm deployment with new rootdisk size parameter # Validate the following @@ -855,7 +855,7 @@ class TestResizeVolume(cloudstackTestCase): @attr(tags=["advanced"], required_hardware="true") - def test_6_resized_rootvolume_with_lessvalue(self): + def test_06_resized_rootvolume_with_lessvalue(self): """Test resize root volume with less than original volume size # Validate the following @@ -939,7 +939,7 @@ class TestResizeVolume(cloudstackTestCase): # @attr(tags=["advanced"], required_hrdware="true") @attr(tags=["TODO"], required_hrdware="true") - def test_7_usage_events_after_rootvolume_resized_(self): + def test_07_usage_events_after_rootvolume_resized_(self): """Test check usage events after root volume resize # Validate the following