From 7537c33bcdda65672fdd8f81509e6885aa536932 Mon Sep 17 00:00:00 2001 From: Sangeetha Hariharan Date: Thu, 18 Sep 2014 17:44:07 -0700 Subject: [PATCH] CLOUDSTACK-7585 -Automation - Fix test_acl_sharednetwork.py and test_acl_sharednetwork_deployVM-impersonation.py to pick 'Shared Network' network offering when creating networks --- test/integration/component/test_acl_sharednetwork.py | 3 ++- .../test_acl_sharednetwork_deployVM-impersonation.py | 9 ++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/test/integration/component/test_acl_sharednetwork.py b/test/integration/component/test_acl_sharednetwork.py index 12a590e3c5d..5d57f301ba5 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 diff --git a/test/integration/component/test_acl_sharednetwork_deployVM-impersonation.py b/test/integration/component/test_acl_sharednetwork_deployVM-impersonation.py index fba3d3340bf..a05a2d89bb4 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,