summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuha Kosonen <juha.kosonen@nokia.com>2016-05-10 07:24:26 +0000
committerJose Lausuch <jose.lausuch@ericsson.com>2016-05-10 09:07:33 +0000
commit7eeab2d73796b1054c20b41329835adc090bbf3c (patch)
tree151201ca3fb1219c5fd646b2a2951846d2ba40bc
parent668c0134d35a2041012851ae4a38de2977d6aafc (diff)
Create a private shared network for Rally
Since functest-net will be obsolete, own private network, subnet and router is created for Rally tests. JIRA: FUNCTEST-240 Change-Id: I8a30e2b4fe12238dba526c21188c85f75bacc0b8 Signed-off-by: Juha Kosonen <juha.kosonen@nokia.com>
-rw-r--r--ci/config_functest.yaml4
-rwxr-xr-xtestcases/VIM/OpenStack/CI/libraries/run_rally-cert.py31
2 files changed, 31 insertions, 4 deletions
diff --git a/ci/config_functest.yaml b/ci/config_functest.yaml
index 92e3fb8a4..29a74afd5 100644
--- a/ci/config_functest.yaml
+++ b/ci/config_functest.yaml
@@ -69,6 +69,10 @@ tempest:
rally:
deployment_name: opnfv-rally
+ network_name: rally-net
+ subnet_name: rally-subnet
+ subnet_cidr: 192.168.140.0/24
+ router_name: rally-router
vIMS:
general:
diff --git a/testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py b/testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py
index 6aa6ee064..4dc1e16d5 100755
--- a/testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py
+++ b/testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py
@@ -67,6 +67,7 @@ parser.add_argument("-z", "--sanity",
args = parser.parse_args()
client_dict = {}
+network_dict = {}
if args.verbose:
RALLY_STDERR = subprocess.STDOUT
@@ -103,8 +104,11 @@ RESULTS_DIR = functest_yaml.get("general").get("directories").get(
TEMPEST_CONF_FILE = functest_yaml.get("general").get("directories").get(
"dir_results") + '/tempest/tempest.conf'
TEST_DB = functest_yaml.get("results").get("test_db_url")
-PRIVATE_NETWORK = functest_yaml.get("general").get("openstack").get(
- "neutron_private_net_name")
+
+PRIVATE_NET_NAME = functest_yaml.get("rally").get("network_name")
+PRIVATE_SUBNET_NAME = functest_yaml.get("rally").get("subnet_name")
+PRIVATE_SUBNET_CIDR = functest_yaml.get("rally").get("subnet_cidr")
+ROUTER_NAME = functest_yaml.get("rally").get("router_name")
GLANCE_IMAGE_NAME = functest_yaml.get("general").get("openstack").get(
"image_name")
@@ -209,8 +213,7 @@ def build_task_args(test_file_name):
else:
task_args['floating_network'] = ''
- net_id = openstack_utils.get_network_id(client_dict['neutron'],
- PRIVATE_NETWORK)
+ net_id = network_dict['net_id']
task_args['netid'] = str(net_id)
task_args['live_migration'] = live_migration_supported()
@@ -379,6 +382,7 @@ def run_task(test_name):
def main():
global SUMMARY
+ global network_dict
# configure script
if not (args.test_name in tests):
logger.error('argument not valid')
@@ -438,6 +442,25 @@ def main():
% (GLANCE_IMAGE_NAME, image_id))
image_exists = True
+ logger.debug("Creating network '%s'..." % PRIVATE_NET_NAME)
+ network_dict = openstack_utils.create_network_full(logger,
+ client_dict['neutron'],
+ PRIVATE_NET_NAME,
+ PRIVATE_SUBNET_NAME,
+ ROUTER_NAME,
+ PRIVATE_SUBNET_CIDR)
+ if not network_dict:
+ logger.error("Failed to create network...")
+ exit(-1)
+ else:
+ if not openstack_utils.update_neutron_net(client_dict['neutron'],
+ network_dict['net_id'],
+ shared=True):
+ logger.error("Failed to update network...")
+ exit(-1)
+ else:
+ logger.debug("Network '%s' available..." % PRIVATE_NET_NAME)
+
if args.test_name == "all":
for test_name in tests:
if not (test_name == 'all' or