From 41eaec87fe939a8511dc6c0ec63976b53cbf5578 Mon Sep 17 00:00:00 2001 From: Juha Kosonen Date: Tue, 9 Feb 2016 14:04:17 +0000 Subject: Remove obsolete public network definitions Use functest_utils.py routines in run_rally-cert.py to retrive external network name instead of static definition in config_functest.yaml. Also change the network name and id setting in task arguments. Change-Id: Iced9e9a28e79d6ac6ddd2f9f593481949f5fc8a0 Signed-off-by: Juha Kosonen --- testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py | 15 ++++++++++----- testcases/config_functest.yaml | 6 ------ 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py b/testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py index 0fb6ce7d4..de1d11d87 100755 --- a/testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py +++ b/testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py @@ -108,8 +108,6 @@ CONCURRENCY = 4 RESULTS_DIR = functest_yaml.get("general").get("directories"). \ get("dir_rally_res") TEST_DB = functest_yaml.get("results").get("test_db_url") -FLOATING_NETWORK = functest_yaml.get("general"). \ - get("openstack").get("neutron_public_net_name") PRIVATE_NETWORK = functest_yaml.get("general"). \ get("openstack").get("neutron_private_net_name") @@ -180,9 +178,6 @@ def build_task_args(test_file_name): task_args['image_name'] = GLANCE_IMAGE_NAME task_args['flavor_name'] = FLAVOR_NAME task_args['glance_image_location'] = GLANCE_IMAGE_PATH - task_args['floating_network'] = FLOATING_NETWORK - task_args['netid'] = functest_utils.get_network_id(client_dict['neutron'], - PRIVATE_NETWORK).encode('ascii', 'ignore') task_args['tmpl_dir'] = TEMPLATE_DIR task_args['sup_dir'] = SUPPORT_DIR task_args['users_amount'] = USERS_AMOUNT @@ -190,6 +185,16 @@ def build_task_args(test_file_name): task_args['iterations'] = ITERATIONS_AMOUNT task_args['concurrency'] = CONCURRENCY + ext_net = functest_utils.get_external_net(client_dict['neutron']) + if ext_net: + task_args['floating_network'] = str(ext_net) + else: + task_args['floating_network'] = '' + + net_id = functest_utils.get_network_id(client_dict['neutron'], + PRIVATE_NETWORK) + task_args['netid'] = str(net_id) + return task_args diff --git a/testcases/config_functest.yaml b/testcases/config_functest.yaml index f32314ac6..2f034f940 100644 --- a/testcases/config_functest.yaml +++ b/testcases/config_functest.yaml @@ -49,12 +49,6 @@ general: image_file_name: cirros-0.3.4-x86_64-disk.img image_disk_format: qcow2 - #Public network. Optional - neutron_public_net_name: net04_ext - neutron_public_subnet_name: net04_ext__subnet - neutron_public_subnet_cidr: 172.16.9.0/24 - neutron_public_subnet_start: 172.16.9.130 - neutron_public_subnet_end: 172.16.9.254 #Private network for functest. Will be created by config_functest.py neutron_private_net_name: functest-net neutron_private_subnet_name: functest-subnet -- cgit 1.2.3-korg