diff options
author | 2016-08-25 11:20:17 +0800 | |
---|---|---|
committer | 2016-08-26 16:21:30 +0800 | |
commit | 007868e4810aaf9a2664b030281fe7c818fc3494 (patch) | |
tree | 2e060b693956ab112ce1dff28e489377c1057387 /testcases/OpenStack/tempest | |
parent | 874eac1d00c9624d084b3c7b01075a7645c5b840 (diff) |
refactor create shared network process to eliminate reduplicate
Some places shared network is created through create_network_full first,
then update it to shared, abstract a uniformed method to eliminate reduplicate
JIRA: FUNCTEST-437
Change-Id: I13c20ab061323188c5eb3b8c861674df38083c62
Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
Diffstat (limited to 'testcases/OpenStack/tempest')
-rwxr-xr-x | testcases/OpenStack/tempest/run_tempest.py | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/testcases/OpenStack/tempest/run_tempest.py b/testcases/OpenStack/tempest/run_tempest.py index 10b22c9f..306664fe 100755 --- a/testcases/OpenStack/tempest/run_tempest.py +++ b/testcases/OpenStack/tempest/run_tempest.py @@ -125,7 +125,6 @@ def get_info(file_result): def create_tempest_resources(): keystone_client = os_utils.get_keystone_client() - neutron_client = os_utils.get_neutron_client() logger.debug("Creating tenant and user for Tempest suite") tenant_id = os_utils.create_tenant(keystone_client, @@ -140,22 +139,12 @@ def create_tempest_resources(): logger.error("Error : Failed to create %s user" % USER_NAME) logger.debug("Creating private network for Tempest suite") - network_dic = os_utils.create_network_full(neutron_client, - PRIVATE_NET_NAME, - PRIVATE_SUBNET_NAME, - ROUTER_NAME, - PRIVATE_SUBNET_CIDR) - if network_dic: - if not os_utils.update_neutron_net(neutron_client, - network_dic['net_id'], - shared=True): - logger.error("Failed to update private network...") - exit(-1) - else: - logger.debug("Network '%s' is available..." % PRIVATE_NET_NAME) - else: - logger.error("Private network creation failed") - exit(-1) + network_dic = os_utils.create_shared_network_full(PRIVATE_NET_NAME, + PRIVATE_SUBNET_NAME, + ROUTER_NAME, + PRIVATE_SUBNET_CIDR) + if not network_dic: + exit(1) logger.debug("Creating image for Tempest suite") _, image_id = os_utils.get_or_create_image(GLANCE_IMAGE_NAME, |