Repository: cloudstack Updated Branches: refs/heads/master b11e3bc60 -> 7537c33bc
CLOUDSTACK-7585 -Automation - Fix test_acl_sharednetwork.py and test_acl_sharednetwork_deployVM-impersonation.py to pick 'Shared Network' network offering when creating networks Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7537c33b Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7537c33b Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7537c33b Branch: refs/heads/master Commit: 7537c33bcdda65672fdd8f81509e6885aa536932 Parents: b11e3bc Author: Sangeetha Hariharan <[email protected]> Authored: Thu Sep 18 17:44:07 2014 -0700 Committer: Sangeetha Hariharan <[email protected]> Committed: Thu Sep 18 19:53:28 2014 -0700 ---------------------------------------------------------------------- test/integration/component/test_acl_sharednetwork.py | 3 ++- .../test_acl_sharednetwork_deployVM-impersonation.py | 9 ++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7537c33b/test/integration/component/test_acl_sharednetwork.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_acl_sharednetwork.py b/test/integration/component/test_acl_sharednetwork.py index 12a590e..5d57f30 100644 --- a/test/integration/component/test_acl_sharednetwork.py +++ b/test/integration/component/test_acl_sharednetwork.py @@ -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 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7537c33b/test/integration/component/test_acl_sharednetwork_deployVM-impersonation.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_acl_sharednetwork_deployVM-impersonation.py b/test/integration/component/test_acl_sharednetwork_deployVM-impersonation.py index fba3d33..a05a2d8 100644 --- a/test/integration/component/test_acl_sharednetwork_deployVM-impersonation.py +++ b/test/integration/component/test_acl_sharednetwork_deployVM-impersonation.py @@ -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,
