mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
test: fix test/integration/smoke/test_register_userdata.py which caused networks not to be deleted (#9244)
by moving the test under new domain/account instead of ROOT account
This commit is contained in:
Wei Zhou
GitHub
parent
ce9b2c52f3
commit
8d02e5f808
@ -28,7 +28,7 @@ from marvin.lib.base import (ServiceOffering,
|
||||
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 @@ class TestRegisteredUserdata(cloudstackTestCase):
|
||||
# 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 @@ class TestRegisteredUserdata(cloudstackTestCase):
|
||||
)
|
||||
|
||||
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 @@ class TestRegisteredUserdata(cloudstackTestCase):
|
||||
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 @@ class TestRegisteredUserdata(cloudstackTestCase):
|
||||
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,8 +316,8 @@ class TestRegisteredUserdata(cloudstackTestCase):
|
||||
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],
|
||||
@ -329,14 +325,13 @@ class TestRegisteredUserdata(cloudstackTestCase):
|
||||
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 @@ class TestRegisteredUserdata(cloudstackTestCase):
|
||||
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 @@ class TestRegisteredUserdata(cloudstackTestCase):
|
||||
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 @@ class TestRegisteredUserdata(cloudstackTestCase):
|
||||
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 @@ class TestRegisteredUserdata(cloudstackTestCase):
|
||||
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 @@ class TestRegisteredUserdata(cloudstackTestCase):
|
||||
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 @@ class TestRegisteredUserdata(cloudstackTestCase):
|
||||
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 @@ class TestRegisteredUserdata(cloudstackTestCase):
|
||||
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 @@ class TestRegisteredUserdata(cloudstackTestCase):
|
||||
self.userapiclient,
|
||||
id=self.userdata.userdata.id
|
||||
)
|
||||
self.cleanup.remove(self.userdata)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user