From: Juha Kosonen <juha.kosonen@nokia.com>
Date: Fri, 22 Jan 2016 15:48:39 +0000 (+0000)
Subject: Removed unnecessary references to public subnet cidr
X-Git-Tag: brahmaputra.1.0~129
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=d3e389b0283d724aa6087c26c46f6327c2ac1ae3;p=functest.git

Removed unnecessary references to public subnet cidr

Change-Id: I9961fcdd9fca6ae98f4c1b38c7eae119447132e4
Signed-off-by: Juha Kosonen <juha.kosonen@nokia.com>
(cherry picked from commit b8a2d3f517a2c599b603da491229527278b0e87d)
---

diff --git a/testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py b/testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py
index 47a382b08..d2128d9ac 100755
--- a/testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py
+++ b/testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py
@@ -107,8 +107,6 @@ RESULTS_DIR = functest_yaml.get("general").get("directories"). \
 TEST_DB = functest_yaml.get("results").get("test_db_url")
 FLOATING_NETWORK = functest_yaml.get("general"). \
     get("openstack").get("neutron_public_net_name")
-FLOATING_SUBNET_CIDR = functest_yaml.get("general"). \
-    get("openstack").get("neutron_public_subnet_cidr")
 PRIVATE_NETWORK = functest_yaml.get("general"). \
     get("openstack").get("neutron_private_net_name")
 
@@ -180,7 +178,6 @@ def build_task_args(test_file_name):
     task_args['flavor_name'] = FLAVOR_NAME
     task_args['glance_image_location'] = GLANCE_IMAGE_PATH
     task_args['floating_network'] = FLOATING_NETWORK
-    task_args['floating_subnet_cidr'] = FLOATING_SUBNET_CIDR
     task_args['netid'] = functest_utils.get_network_id(client_dict['neutron'],
                                     PRIVATE_NETWORK).encode('ascii', 'ignore')
     task_args['tmpl_dir'] = TEMPLATE_DIR
diff --git a/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-heat.yaml b/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-heat.yaml
index 6debb415a..dd8b282a6 100644
--- a/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-heat.yaml
+++ b/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-heat.yaml
@@ -15,7 +15,6 @@
           public_net: {{ floating_network }}
           image: {{ image_name }}
           flavor: {{ flavor_name }}
-          cidr: {{ floating_subnet_cidr }}
       context:
         {{ user_context(tenants_amount, users_amount, use_existing_users) }}
       runner: