tests: component test ports/fixes in python3 (#5082)

* cleanup plan

* more robust cleanup within member method

* ss_domain_limits fixed

* egress 'icmp' instead of 'all' and cleanup

* configdrive syntax, fixed to be up to par with py2

* cleanup fixed the lb secondary ip tests?

* deal with different base64 encoding in py3 for userdata

* cleanup of multiple_ips_per_nic

* cleanup and reformat of test_volumes

* cleanup and fixes for test_ps_domain_limits.py

* cleanup and fix of test_ps_limits.py

* fix occasional match of float against int

* cleanup and fix test_ps_resize_volume.py

* cleanup and fix test_snapshots

* cleanup ss_max_limits and fix for float vs int problem in API

* mere cleanup of test_volume_destroy_recover

* add missing command creation

* cleanup of test_vpc_on_host_maintenance

* cleanup test_vpc_network

* cleanup, comments and logging in test_vpc_network_lbrules

* cleanup of test_vpc_network_pfrules

* cleanup and format code for test_vpc_network_staticnatrule

* f string instead of conversion specifiers

* check http and ssh fix and cleanup (for vpc pfrules tests)

* generalise create network method

* make ip optional in creating webserver

* remove unused code and add rules to enable ssh

* more cleanup

* remove unused code and cleanup

* small cleanup, mostly precarous run environment required

* cleanup and removed unused code

* advancedsg only, cleanup, pulled in services

* reformat/cleanup

* log result of error after verify rule

* add nw_off_no_services

* tags=["TODO"] for escalations_networks

* tags=["TODO"] for organization_states

* tags=["TODO"] for browse_templates

* tags=["TODO"] for configdrive

* tags=["TODO"] for vpc_vms_deployment

* add remove network cleanup and fixes

* move tests that fail on all platforms out of the way

Co-authored-by: Daan Hoogland <[email protected]>

Author: DaanHoogland

test/integration/component/maint/test_escalation_templates.py renamed to test/integration/broken/maint/test_escalation_templates.py

@@ -88,13 +88,8 @@ def setUpClass(cls):
 
     @classmethod
     def tearDownClass(cls):
-        try:
-            # Cleanup resources used
-            cleanup_resources(cls.apiclient, cls.cleanup)
+        super(TestlistTemplates, cls).tearDownClass()
 
-        except Exception as e:
-            raise Exception("Warning: Exception during cleanup : %s" % e)
-        return
     def RestartServers(self):
         """ Restart management server and usage server """
 

test/integration/component/maint/test_escalations_hosts.py renamed to test/integration/broken/maint/test_escalations_hosts.py

@@ -18,7 +18,6 @@
 from nose.plugins.attrib import attr
 from marvin.cloudstackTestCase import cloudstackTestCase
 import unittest
-from marvin.lib.utils import cleanup_resources
 from marvin.lib.base import (Account,
                              Host,
                              VPC,
@@ -58,6 +57,7 @@ def setUpClass(cls):
             cls.api_client,
             cls.services["vpc_offering"]
         )
+        cls._cleanup.append(cls.vpc_off)
         cls.vpc_off.update(cls.api_client, state='Enabled')
         cls.hosts = Host.list(
             cls.api_client,
@@ -93,15 +93,11 @@ def setUpClass(cls):
                             "Failed to enable maintenance mode on %s" %
                             host.name)
                     timeout = timeout - 1
-
-        cls._cleanup.append(cls.vpc_off)
         return
 
     @classmethod
     def tearDownClass(cls):
         try:
-            # Cleanup resources used
-            cleanup_resources(cls.api_client, cls._cleanup)
             for host in cls.hosts:
                 Host.cancelMaintenance(
                     cls.api_client,
@@ -117,7 +113,9 @@ def tearDownClass(cls):
                         "Failed to cancel maintenance mode on %s" %
                         (host.name))
         except Exception as e:
-            raise Exception("Warning: Exception during cleanup : %s" % e)
+            raise Exception("Warning: Exception during resetting hosts maintenance : %s" % e)
+        finally:
+            super(TestVPCHostMaintenance, cls).tearDownClass()
         return
 
     def setUp(self):
@@ -138,12 +136,7 @@ def setUp(self):
         return
 
     def tearDown(self):
-        try:
-            # Clean up, terminate the created network offerings
-            cleanup_resources(self.apiclient, self.cleanup)
-        except Exception as e:
-            raise Exception("Warning: Exception during cleanup : %s" % e)
-        return
+        super(TestVPCHostMaintenance, self).tearDown()
 
     def validate_vpc_offering(self, vpc_offering):
         """Validates the VPC offering"""
@@ -217,5 +210,6 @@ def test_01_create_vpc_host_maintenance(self):
             domainid=self.account.domainid,
             start=False
         )
+        self.cleanup.append(vpc)
         self.validate_vpc_network(vpc, state='enabled')
         return