From f44a88668f359b6b338e8e9eb4eeaa6cac69acf6 Mon Sep 17 00:00:00 2001 From: veleza Date: Tue, 16 Nov 2021 11:28:43 +0000 Subject: [PATCH] Updated run_conformance_tests.py Change-Id: Ic67d050505554046dc52e3baaba367bc0702d7cc Signed-off-by: veleza --- conformance-tests/run_conformance_tests.py | 33 ++++++++++++++-------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/conformance-tests/run_conformance_tests.py b/conformance-tests/run_conformance_tests.py index 02a8221..926d4bc 100644 --- a/conformance-tests/run_conformance_tests.py +++ b/conformance-tests/run_conformance_tests.py @@ -1,4 +1,4 @@ -# Copyright 2020 ETSI OSM +## Copyright 2020 ETSI OSM # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -35,33 +35,46 @@ def get_suite_path(suite_name): def run_test_suite(suite_dir, suite_name, arg_file): print("robot -d {}/repo/{}/reports --argumentfile {} .".format(conformance_folder, suite_name, arg_file)) - run(["robot --loglevel=TRACE -d {}/reports/{} --argumentfile {} .".format(conformance_folder, - suite_name, arg_file)], cwd=suite_dir, shell=True) + run(["robot --loglevel=TRACE -d {}/reports/{} --argumentfile {} .".format(conformance_folder, suite_name, arg_file)], cwd=suite_dir, shell=True) def sub_env_vars(file_dir, file_name): - run(["envsubst < {0} > {0}".format(file_name)], cwd=file_dir, shell=True) + run(["cat {} | envsubst | cat > {}".format(file_name, get_suite_path(file_name.split(".")[0]) + "/" + file_name)], cwd=file_dir, shell=True) # RESOURCE CREATION HAPPENS BELOW -nsd_id, vnfd_id = "", "" -osm = OSM(osm_hostname) +nsd_id, vnfd_id, ns_id = "", "", "" + +if ':' in osm_hostname: + port = osm_hostname.split(':')[-1] +else: + port = "9999" +osm_hostname = osm_hostname.split(':')[0] + +osm = OSM(osm_hostname, port) os.environ["AUTH_TOKEN"] = osm.get_auth_token() try: vnfd_id = osm.create_vnfd(get_package_path("hackfest_basic_vnf/hackfest_basic_vnfd.yaml")) nsd_id = osm.create_nsd(get_package_path("hackfest_basic_ns/hackfest_basic_nsd.yaml")) + ns_id = osm.create_ns("Test_NS", nsd_id, "osm") except ResourceException as e: print(e.message) -print("VNFD: {}\nNSD: {}".format(vnfd_id, nsd_id)) +print("VNFD: {}\nNSD: {}\nNS: {}".format(vnfd_id, nsd_id, ns_id)) + # Apply relevant env variables (required for test vars) os.environ["NSD_INFO_ID"] = nsd_id +os.environ["VNFD_INFO_ID"] = vnfd_id +os.environ["NS_INFO_ID"] = ns_id +os.environ["NFVO_HOST"] = osm_hostname +os.environ["NFVO_PORT"] = port # RESOURCE CREATION HAPPENS ABOVE + # Copy test selection files over to relevant directories (_, _, filenames) = next(os.walk(test_lists_folder)) for f in filenames: @@ -69,18 +82,16 @@ for f in filenames: # Apply ENV Variables sub_env_vars(test_lists_folder, f) - # Then copy to appropriate directory - print("Copying {} to {}".format(f, get_suite_path(f.split(".")[0]))) - copy("{}/{}".format(test_lists_folder, f), get_suite_path(f.split(".")[0])) - # Run the robot tests (_, directories, _) = next(os.walk(sol005_folder)) for d in directories: run_test_suite("{}/{}".format(sol005_folder, d), d, d + ".txt") + # We then need to clear the created resources try: + osm.delete_ns(ns_id) osm.delete_nsd(nsd_id) osm.delete_vnfd(vnfd_id) except ResourceException as e: -- 2.17.1