Merge branch '4.20' of https://github.com/apache/cloudstack into support-xen84-py3

Author: Pearl1594

test/integration/smoke/test_guest_os.py

@@ -47,19 +47,14 @@ def setUpClass(cls):
 
         cls.hypervisor = cls.get_hypervisor_type()
 
-    @classmethod
     def setUp(self):
         self.apiclient = self.testClient.getApiClient()
 
         #build cleanup list
         self.cleanup = []
 
-    @classmethod
     def tearDown(self):
-        try:
-            cleanup_resources(self.apiclient, self.cleanup)
-        except Exception as e:
-            self.debug("Warning! Exception in tearDown: %s" % e)
+        super(TestGuestOS, self).tearDown()
 
     @classmethod
     def get_hypervisor_type(cls):
@@ -95,6 +90,7 @@ def test_CRUD_operations_guest_OS(self):
             osdisplayname="testCentOS",
             oscategoryid=os_category.id
         )
+        self.cleanup.append(self.guestos1)
         list_guestos = GuestOS.list(self.apiclient, id=self.guestos1.id, listall=True)
         self.assertNotEqual(
             len(list_guestos),
@@ -112,6 +108,7 @@ def test_CRUD_operations_guest_OS(self):
             self.apiclient,
             id=self.guestos1.id
         )
+        self.cleanup.remove(self.guestos1)
 
     @attr(tags=['advanced', 'simulator', 'basic', 'sg'], required_hardware=False)
     def test_CRUD_operations_guest_OS_mapping(self):
@@ -127,6 +124,7 @@ def test_CRUD_operations_guest_OS_mapping(self):
             osdisplayname="testCentOS",
             oscategoryid=os_category.id
         )
+        self.cleanup.append(self.guestos1)
 
         if self.hypervisor.hypervisor.lower() not in ["xenserver", "vmware"]:
             raise unittest.SkipTest("OS name check with hypervisor is supported only on XenServer and VMware")
@@ -138,6 +136,7 @@ def test_CRUD_operations_guest_OS_mapping(self):
             hypervisorversion=self.hypervisor.hypervisorversion,
             osnameforhypervisor="testOSMappingName"
         )
+        self.cleanup.append(self.guestosmapping1)
 
         list_guestos_mapping = GuestOsMapping.list(self.apiclient, id=self.guestosmapping1.id, listall=True)
         self.assertNotEqual(
@@ -156,11 +155,13 @@ def test_CRUD_operations_guest_OS_mapping(self):
             self.apiclient,
             id=self.guestosmapping1.id
         )
+        self.cleanup.remove(self.guestosmapping1)
 
         GuestOS.remove(
             self.apiclient,
             id=self.guestos1.id
         )
+        self.cleanup.remove(self.guestos1)
 
     @attr(tags=['advanced', 'simulator', 'basic', 'sg'], required_hardware=False)
     def test_guest_OS_mapping_check_with_hypervisor(self):
@@ -176,6 +177,7 @@ def test_guest_OS_mapping_check_with_hypervisor(self):
             osdisplayname="testOSname1",
             oscategoryid=os_category.id
         )
+        self.cleanup.append(self.guestos1)
 
         if self.hypervisor.hypervisor.lower() not in ["xenserver", "vmware"]:
             raise unittest.SkipTest("OS name check with hypervisor is supported only on XenServer and VMware")
@@ -196,6 +198,7 @@ def test_guest_OS_mapping_check_with_hypervisor(self):
             osnameforhypervisor=testosname,
             osmappingcheckenabled=True
         )
+        self.cleanup.append(self.guestosmapping1)
 
         list_guestos_mapping = GuestOsMapping.list(self.apiclient, id=self.guestosmapping1.id, listall=True)
         self.assertNotEqual(
@@ -214,11 +217,13 @@ def test_guest_OS_mapping_check_with_hypervisor(self):
             self.apiclient,
             id=self.guestosmapping1.id
         )
+        self.cleanup.remove(self.guestosmapping1)
 
         GuestOS.remove(
             self.apiclient,
             id=self.guestos1.id
         )
+        self.cleanup.remove(self.guestos1)
 
     @attr(tags=['advanced', 'simulator', 'basic', 'sg'], required_hardware=False)
     def test_guest_OS_mapping_check_with_hypervisor_failure(self):
@@ -234,6 +239,7 @@ def test_guest_OS_mapping_check_with_hypervisor_failure(self):
             osdisplayname="testOSname2",
             oscategoryid=os_category.id
         )
+        self.cleanup.append(self.guestos1)
 
         if self.hypervisor.hypervisor.lower() not in ["xenserver", "vmware"]:
             raise unittest.SkipTest("OS name check with hypervisor is supported only on XenServer and VMware")
@@ -249,15 +255,18 @@ def test_guest_OS_mapping_check_with_hypervisor_failure(self):
                 osnameforhypervisor=testosname,
                 osmappingcheckenabled=True
             )
+            self.cleanup.append(self.guestosmapping1)
             GuestOsMapping.remove(
                 self.apiclient,
                 id=self.guestosmapping1.id
             )
+            self.cleanup.remove(self.guestosmapping1)
             self.fail("Since os mapping name is wrong, this API should fail")
         except CloudstackAPIException as e:
             self.debug("Addition guest OS mapping failed as expected %s " % e)
         GuestOS.remove(
             self.apiclient,
             id=self.guestos1.id
         )
+        self.cleanup.remove(self.guestos1)
         return

tools/marvin/marvin/lib/base.py

@@ -4576,6 +4576,7 @@ class Project:
     def __init__(self, items):
         self.__dict__.update(items)
 
+
     @classmethod
     def create(cls, apiclient, services, account=None, domainid=None, userid=None, accountid=None):
         """Create project"""
@@ -6720,7 +6721,7 @@ def list(cls, apiclient, id=None, name=None, **kwargs):
 class GuestOS:
     """Manage Guest OS"""
 
-    def __init__(self, items, services):
+    def __init__(self, items):
         self.__dict__.update(items)
 
     @classmethod
@@ -6735,7 +6736,7 @@ def add(cls, apiclient, osdisplayname=None,
         if details is not None:
             cmd.details = details
 
-        return (apiclient.addGuestOs(cmd))
+        return GuestOS(apiclient.addGuestOs(cmd).__dict__)
 
     @classmethod
     def remove(cls, apiclient, id):
@@ -6772,10 +6773,13 @@ def list(cls, apiclient, id=None, oscategoryid=None, description=None, **kwargs)
 
         return (apiclient.listOsTypes(cmd))
 
+    def delete(self, apiclient):
+        self.remove(apiclient, self.id)
+
 class GuestOsMapping:
     """Manage Guest OS Mappings"""
 
-    def __init__(self, items, services):
+    def __init__(self, items):
         self.__dict__.update(items)
 
     @classmethod
@@ -6793,7 +6797,7 @@ def add(cls, apiclient, ostypeid=None,
         if forced is not None:
             cmd.forced = forced
 
-        return (apiclient.addGuestOsMapping(cmd))
+        return GuestOsMapping(apiclient.addGuestOsMapping(cmd).__dict__)
 
     @classmethod
     def remove(cls, apiclient, id):
@@ -6837,6 +6841,9 @@ def list(cls, apiclient, id=None, ostypeid=None, osdisplayname=None,
 
         return (apiclient.listGuestOsMapping(cmd))
 
+    def delete(self, apiclient):
+        self.remove(apiclient, self.id)
+
 class VMSchedule:
 
     def __init__(self, items):