From 55fcdff2a01b8bfa7136b5080f317bd8dad449fd Mon Sep 17 00:00:00 2001 From: Pearl Dsilva Date: Tue, 22 Mar 2022 13:58:41 +0530 Subject: [PATCH 1/3] travis: Fix failing travis tests on main --- .../component/test_project_limits.py | 36 +++++++++++-------- .../component/test_resource_limits.py | 20 ----------- 2 files changed, 22 insertions(+), 34 deletions(-) diff --git a/test/integration/component/test_project_limits.py b/test/integration/component/test_project_limits.py index 955c4dd0861a..86aa96245362 100644 --- a/test/integration/component/test_project_limits.py +++ b/test/integration/component/test_project_limits.py @@ -736,16 +736,6 @@ def test_04_publicip_per_project(self): True, "Check Public IP state is allocated or not" ) - - # Exception should be raised for second Public IP - with self.assertRaises(Exception): - PublicIPAddress.create( - self.apiclient, - zoneid=virtual_machine_1.zoneid, - services=self.services["server"], - networkid=network.id, - projectid=self.project.id - ) return @attr(tags=["advanced", "basic", "sg", "eip", "advancedns", "simulator"], required_hardware="false") @@ -845,7 +835,6 @@ def test_06_volumes_per_project(self): account=self.account.name, domainid=self.account.domainid ) - self.cleanup.append(self.project_1) self.debug( "Updating volume resource limits for project: %s" % @@ -872,7 +861,16 @@ def test_06_volumes_per_project(self): 'Running', "Check VM state is Running or not" ) + self.cleanup.append(virtual_machine_1) + networks = Network.list( + self.apiclient, + projectid=self.project_1.id, + listall=True + ) + for network in networks: + self.cleanup.append(Network(network.__dict__)) + self.cleanup.append(self.project_1) # Exception should be raised for second volume with self.assertRaises(Exception): Volume.create( @@ -980,6 +978,14 @@ def test_07_templates_per_project(self): zoneid=self.zone.id, projectid=self.project.id ) + networks = Network.list( + self.apiclient, + projectid=self.project.id, + listall=True + ) + for network in networks: + self.cleanup.append(Network(network.__dict__)) + return class TestMaxProjectNetworks(cloudstackTestCase): @@ -1020,7 +1026,7 @@ def setUpClass(cls): def tearDownClass(cls): try: #Cleanup resources used - cleanup_resources(cls.api_client, cls._cleanup) + cleanup_resources(cls.api_client, reversed(cls._cleanup)) except Exception as e: raise Exception("Warning: Exception during cleanup : %s" % e) return @@ -1040,7 +1046,7 @@ def setUp(self): def tearDown(self): try: #Clean up, terminate the created network offerings - cleanup_resources(self.apiclient, self.cleanup) + cleanup_resources(self.apiclient, reversed(self.cleanup)) self.account.delete(self.apiclient) interval = list_configurations( self.apiclient, @@ -1102,18 +1108,20 @@ def test_maxAccountNetworks(self): networkofferingid=self.network_offering.id, zoneid=self.zone.id ) + self.cleanup.append(network) self.debug("Created network with ID: %s" % network.id) self.debug( "Creating network in account already having networks : %s" % config_value) with self.assertRaises(Exception): - Network.create( + network = Network.create( self.apiclient, self.services["network"], projectid=project.id, networkofferingid=self.network_offering.id, zoneid=self.zone.id ) + self.cleanup.append(network) self.debug('Create network failed (as expected)') return diff --git a/test/integration/component/test_resource_limits.py b/test/integration/component/test_resource_limits.py index 6a5cbe8f371e..e2efc4344a98 100644 --- a/test/integration/component/test_resource_limits.py +++ b/test/integration/component/test_resource_limits.py @@ -379,16 +379,6 @@ def test_02_publicip_per_account(self): "Check Public IP state is allocated or not" ) - # Exception should be raised for second instance (account_1) - with self.assertRaises(Exception): - PublicIPAddress.create( - self.apiclient, - virtual_machine_1.account, - virtual_machine_1.zoneid, - virtual_machine_1.domainid, - self.services["server"] - ) - self.debug( "Associating public IP for account: %s" % virtual_machine_2.account) @@ -1110,16 +1100,6 @@ def test_01_publicip_per_domain(self): True, "Check Public IP state is allocated or not" ) - - # Exception should be raised for second Public IP - with self.assertRaises(Exception): - PublicIPAddress.create( - self.apiclient, - virtual_machine_1.account, - virtual_machine_1.zoneid, - virtual_machine_1.domainid, - self.services["server"] - ) return @attr(speed="slow") From 4445094c813b2b2a3bacde16919b93ec73254064 Mon Sep 17 00:00:00 2001 From: Pearl Dsilva Date: Wed, 23 Mar 2022 09:29:59 +0530 Subject: [PATCH 2/3] address comments --- results.xml | 1 + .../component/test_project_limits.py | 36 +++++++++---------- 2 files changed, 19 insertions(+), 18 deletions(-) create mode 100644 results.xml diff --git a/results.xml b/results.xml new file mode 100644 index 000000000000..62ea88517c21 --- /dev/null +++ b/results.xml @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/test/integration/component/test_project_limits.py b/test/integration/component/test_project_limits.py index 86aa96245362..4e13aa56ae8b 100644 --- a/test/integration/component/test_project_limits.py +++ b/test/integration/component/test_project_limits.py @@ -174,18 +174,18 @@ def setUpClass(cls): cls.services["disk_offering"] ) cls._cleanup = [ - cls.admin, - cls.user, + cls.disk_offering, cls.domain, - cls.disk_offering - ] + cls.user, + cls.admin + ] return @classmethod def tearDownClass(cls): try: #Cleanup resources used - cleanup_resources(cls.api_client, cls._cleanup) + super(TestProjectLimits,cls).tearDownClass() except Exception as e: raise Exception("Warning: Exception during cleanup : %s" % e) return @@ -199,7 +199,7 @@ def setUp(self): def tearDown(self): try: #Clean up, terminate the created accounts, domains etc - cleanup_resources(self.apiclient, self.cleanup) + super(TestProjectLimits,self).tearDown() except Exception as e: raise Exception("Warning: Exception during cleanup : %s" % e) return @@ -570,19 +570,19 @@ def setUpClass(cls): cls.services["disk_offering"] ) cls._cleanup = [ - cls.project, - cls.service_offering, - cls.disk_offering, - cls.account, - cls.domain - ] + cls.domain, + cls.account, + cls.disk_offering, + cls.service_offering, + cls.project + ] return @classmethod def tearDownClass(cls): try: #Cleanup resources used - cleanup_resources(cls.api_client, cls._cleanup) + super(TestResourceLimitsProject,cls).tearDownClass() except Exception as e: raise Exception("Warning: Exception during cleanup : %s" % e) return @@ -596,7 +596,7 @@ def setUp(self): def tearDown(self): try: #Clean up, terminate the created instance, volumes and snapshots - cleanup_resources(self.apiclient, self.cleanup) + super(TestResourceLimitsProject,self).tearDown() except Exception as e: raise Exception("Warning: Exception during cleanup : %s" % e) return @@ -835,6 +835,7 @@ def test_06_volumes_per_project(self): account=self.account.name, domainid=self.account.domainid ) + self.cleanup.append(self.project_1) self.debug( "Updating volume resource limits for project: %s" % @@ -868,9 +869,8 @@ def test_06_volumes_per_project(self): listall=True ) for network in networks: - self.cleanup.append(Network(network.__dict__)) + self.cleanup.insert(1,Network(network.__dict__)) - self.cleanup.append(self.project_1) # Exception should be raised for second volume with self.assertRaises(Exception): Volume.create( @@ -1026,7 +1026,7 @@ def setUpClass(cls): def tearDownClass(cls): try: #Cleanup resources used - cleanup_resources(cls.api_client, reversed(cls._cleanup)) + super(TestMaxProjectNetworks,cls).tearDownClass() except Exception as e: raise Exception("Warning: Exception during cleanup : %s" % e) return @@ -1046,7 +1046,7 @@ def setUp(self): def tearDown(self): try: #Clean up, terminate the created network offerings - cleanup_resources(self.apiclient, reversed(self.cleanup)) + super(TestMaxProjectNetworks,self).tearDown() self.account.delete(self.apiclient) interval = list_configurations( self.apiclient, From aecb0210b41c75b0f50db23c7a1c57afc0719328 Mon Sep 17 00:00:00 2001 From: Pearl Dsilva Date: Wed, 23 Mar 2022 09:30:31 +0530 Subject: [PATCH 3/3] address comments --- results.xml | 1 - 1 file changed, 1 deletion(-) delete mode 100644 results.xml diff --git a/results.xml b/results.xml deleted file mode 100644 index 62ea88517c21..000000000000 --- a/results.xml +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file