test: fix test/integration/smoke/test_register_userdata.py which caused networks not to be deleted (apache#9244)

by moving the test under new domain/account instead of ROOT account

Author: weizhouapache

test/integration/smoke/test_register_userdata.py

@@ -28,7 +28,7 @@
                              NATRule,
                              Template)
 from marvin.lib.common import get_test_template, get_zone, list_virtual_machines
-from marvin.lib.utils import (validateList, cleanup_resources)
+from marvin.lib.utils import validateList
 from nose.plugins.attrib import attr
 from marvin.codes import PASS,FAIL
 import base64
@@ -87,6 +87,7 @@ def setUp(self):
         # Get Zone, Domain and Default Built-in template
         self.domain = get_domain(self.apiclient)
         self.zone = get_zone(self.apiclient, self.testClient.getZoneForTests())
+        self.hypervisor = self.testClient.getHypervisorInfo()
 
         #create a user account
         self.account = Account.create(
@@ -96,7 +97,7 @@ def setUp(self):
         )
 
         self.testdata["mode"] = self.zone.networktype
-        self.template = get_template(self.apiclient, self.zone.id, self.testdata["ostype"])
+        self.template = get_test_template(self.apiclient, self.zone.id, self.hypervisor)
 
         #create a service offering
         small_service_offering = self.testdata["service_offerings"]["small"]
@@ -115,25 +116,21 @@ def setUp(self):
             self.testdata["network"],
             networkofferingid=self.no_isolate.id,
             zoneid=self.zone.id,
-            accountid="admin",
-            domainid=1
+            accountid=self.account.name,
+            domainid=self.account.domainid
         )
 
         #build cleanup list
         self.cleanup = [
+            self.account,
+            self.no_isolate,
             self.service_offering,
             self.isolated_network,
-            self.no_isolate,
-            self.account,
         ]
 
 
     def tearDown(self):
-        try:
-            cleanup_resources(self.apiclient, self.cleanup)
-        except Exception as e:
-            self.debug("Warning! Exception in tearDown: %s" % e)
-
+        super(TestRegisteredUserdata, self).tearDown()
 
     @attr(tags=['advanced', 'simulator', 'basic', 'sg'], required_hardware=False)
     def test_CRUD_operations_userdata(self):
@@ -192,22 +189,21 @@ def test_deploy_vm_with_registered_userdata(self):
             self.apiclient,
             self.services["virtual_machine"],
             zoneid=self.zone.id,
-            accountid="admin",
-            domainid=1,
+            accountid=self.account.name,
+            domainid=self.account.domainid,
             serviceofferingid=self.service_offering.id,
             templateid=self.template.id,
             networkids=[self.isolated_network.id],
             userdataid=self.userdata2.userdata.id
         )
         self.cleanup.append(self.virtual_machine)
-        self.cleanup.append(self.userdata2)
 
         networkid = self.virtual_machine.nic[0].networkid
         src_nat_list = PublicIPAddress.list(
             self.apiclient,
             associatednetworkid=networkid,
-            account="admin",
-            domainid=1,
+            account=self.account.name,
+            domainid=self.account.domainid,
             listall=True,
             issourcenat=True,
         )
@@ -320,23 +316,22 @@ def test_deploy_vm_with_registered_userdata_with_params(self):
             self.apiclient,
             self.services["virtual_machine"],
             zoneid=self.zone.id,
-            accountid="admin",
-            domainid=1,
+            accountid=self.account.name,
+            domainid=self.account.domainid,
             serviceofferingid=self.service_offering.id,
             templateid=self.template.id,
             networkids=[self.isolated_network.id],
             userdataid=self.userdata2.userdata.id,
             userdatadetails=[{"key1": "value1"}]
         )
         self.cleanup.append(self.virtual_machine)
-        self.cleanup.append(self.userdata2)
 
         networkid = self.virtual_machine.nic[0].networkid
         src_nat_list = PublicIPAddress.list(
             self.apiclient,
             associatednetworkid=networkid,
-            account="admin",
-            domainid=1,
+            account=self.account.name,
+            domainid=self.account.domainid,
             listall=True,
             issourcenat=True,
         )
@@ -493,15 +488,14 @@ def test_deploy_vm_with_registered_userdata_with_override_policy_allow(self):
             self.apiclient,
             self.services["virtual_machine"],
             zoneid=self.zone.id,
-            accountid="admin",
-            domainid=1,
+            accountid=self.account.name,
+            domainid=self.account.domainid,
             serviceofferingid=self.service_offering.id,
             templateid=self.template.id,
             networkids=[self.isolated_network.id],
             userdataid=self.apiUserdata.userdata.id
         )
         self.cleanup.append(self.virtual_machine)
-        self.cleanup.append(self.apiUserdata)
 
         self.template = Template.linkUserDataToTemplate(
             self.apiclient,
@@ -512,8 +506,8 @@ def test_deploy_vm_with_registered_userdata_with_override_policy_allow(self):
         src_nat_list = PublicIPAddress.list(
             self.apiclient,
             associatednetworkid=networkid,
-            account="admin",
-            domainid=1,
+            account=self.account.name,
+            domainid=self.account.domainid,
             listall=True,
             issourcenat=True,
         )
@@ -623,16 +617,14 @@ def test_deploy_vm_with_registered_userdata_with_override_policy_append(self):
             self.apiclient,
             self.services["virtual_machine"],
             zoneid=self.zone.id,
-            accountid="admin",
-            domainid=1,
+            accountid=self.account.name,
+            domainid=self.account.domainid,
             serviceofferingid=self.service_offering.id,
             templateid=self.template.id,
             networkids=[self.isolated_network.id],
             userdataid=self.apiUserdata.userdata.id
         )
         self.cleanup.append(self.virtual_machine)
-        self.cleanup.append(self.apiUserdata)
-        self.cleanup.append(self.templateUserdata)
 
         self.template = Template.linkUserDataToTemplate(
             self.apiclient,
@@ -643,8 +635,8 @@ def test_deploy_vm_with_registered_userdata_with_override_policy_append(self):
         src_nat_list = PublicIPAddress.list(
             self.apiclient,
             associatednetworkid=networkid,
-            account="admin",
-            domainid=1,
+            account=self.account.name,
+            domainid=self.account.domainid,
             listall=True,
             issourcenat=True,
         )
@@ -770,8 +762,8 @@ def test_deploy_vm_with_registered_userdata_with_override_policy_deny(self):
                 self.apiclient,
                 self.services["virtual_machine"],
                 zoneid=self.zone.id,
-                accountid="admin",
-                domainid=1,
+                accountid=self.account.name,
+                domainid=self.account.domainid,
                 serviceofferingid=self.service_offering.id,
                 templateid=self.template.id,
                 networkids=[self.isolated_network.id],
@@ -781,9 +773,6 @@ def test_deploy_vm_with_registered_userdata_with_override_policy_deny(self):
             self.debug("Deploy VM with userdata passed during deployment failed as expected because template userdata override policy is deny. Exception here is : %s" %
                        e.exception)
 
-        self.cleanup.append(self.apiUserdata)
-        self.cleanup.append(self.templateUserdata)
-
         self.template = Template.linkUserDataToTemplate(
             self.apiclient,
             templateid=self.template.id
@@ -809,7 +798,6 @@ def test_user_userdata_crud(self):
             account=self.account.name,
             domainid=self.account.domainid
         )
-        self.cleanup.append(self.userdata)
 
         list_userdata = UserData.list(self.apiclient, id=self.userdata.userdata.id, listall=True)
         self.assertNotEqual(
@@ -853,4 +841,3 @@ def test_user_userdata_crud(self):
             self.userapiclient,
             id=self.userdata.userdata.id
         )
-        self.cleanup.remove(self.userdata)