etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-7585 -Automation - Fix test_acl_sharednetwork.py and test_acl_sharednetwork_deployVM-impersonation.py to pick 'Shared Network' network offering when creating networks

This commit is contained in:
Sangeetha Hariharan 2014-09-18 17:44:07 -07:00
parent b11e3bc60a
commit 7537c33bcd
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/integration/component/test_acl_sharednetwork.py
View File

@ -261,7 +261,8 @@ class TestSharedNetwork(cloudstackTestCase):
list_shared_network_offerings_response = NetworkOffering.list(
cls.apiclient,
name="DefaultSharedNetworkOffering"
name="DefaultSharedNetworkOffering",
displayText="Offering for Shared networks"
)
cls.shared_network_offering_id = list_shared_network_offerings_response[0].id

9
test/integration/component/test_acl_sharednetwork_deployVM-impersonation.py
View File

@ -261,8 +261,15 @@ class TestSharedNetworkImpersonation(cloudstackTestCase):
list_shared_network_offerings_response = NetworkOffering.list(
cls.apiclient,
name="DefaultSharedNetworkOffering"
name="DefaultSharedNetworkOffering",
displayText="Offering for Shared networks"
)
#Override name parameter so that there is no overlap with names being used in other shared network test suites
cls.acldata["network_all"]["name"]=cls.acldata["network_all"]["name"]+"-impersonation"
cls.acldata["network_domain_with_no_subdomain_access"]["name"]=cls.acldata["network_domain_with_no_subdomain_access"]["name"]+"-impersonation"
cls.acldata["network_domain_with_subdomain_access"]["name"]=cls.acldata["network_domain_with_subdomain_access"]["name"]+"-impersonation"
cls.acldata["network_account"]["name"]=cls.acldata["network_account"]["name"]+"-impersonation"
cls.shared_network_offering_id = list_shared_network_offerings_response[0].id
cls.shared_network_all = Network.create(
cls.apiclient,