X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Ftransportpce_tests%2Fcommon%2Ftest_utils.py;h=c18a4d1f5ee1288834881c70e5f9835ae3864ef9;hb=80c1e9a96ad3e992fb6504463ce1eaacd1e5a7e9;hp=65bd2bba804641036efcdfcea02652c1bfbb0b7f;hpb=d3f738ebc8fb5f7501cde960cd887f115cd96eba;p=transportpce.git diff --git a/tests/transportpce_tests/common/test_utils.py b/tests/transportpce_tests/common/test_utils.py index 65bd2bba8..c18a4d1f5 100644 --- a/tests/transportpce_tests/common/test_utils.py +++ b/tests/transportpce_tests/common/test_utils.py @@ -13,6 +13,7 @@ import json import os +# pylint: disable=wrong-import-order import sys import re import signal @@ -22,6 +23,7 @@ import time import psutil import requests +# pylint: disable=import-error import simulators SIMS = simulators.SIMS @@ -42,15 +44,21 @@ URL_CONFIG_CLLI_NET = "{}/config/ietf-network:networks/network/clli-network/" URL_CONFIG_ORDM_NET = "{}/config/ietf-network:networks/network/openroadm-network/" URL_PORTMAPPING = "{}/config/transportpce-portmapping:network/nodes/" URL_OPER_SERV_LIST = "{}/operational/org-openroadm-service:service-list/" -URL_GET_NBINOTIFICATIONS_SERV = "{}/operations/nbi-notifications:get-notifications-service/" +URL_GET_NBINOTIFICATIONS_PROCESS_SERV = "{}/operations/nbi-notifications:get-notifications-process-service/" URL_GET_NBINOTIFICATIONS_ALARM_SERV = "{}/operations/nbi-notifications:get-notifications-alarm-service/" URL_SERV_CREATE = "{}/operations/org-openroadm-service:service-create" URL_SERV_DELETE = "{}/operations/org-openroadm-service:service-delete" URL_SERVICE_PATH = "{}/operations/transportpce-device-renderer:service-path" URL_OTN_SERVICE_PATH = "{}/operations/transportpce-device-renderer:otn-service-path" +URL_TAPI_CREATE_CONNECTIVITY = "{}/operations/tapi-connectivity:create-connectivity-service" +URL_TAPI_DELETE_CONNECTIVITY = "{}/operations/tapi-connectivity:delete-connectivity-service" URL_CREATE_OTS_OMS = "{}/operations/transportpce-device-renderer:create-ots-oms" URL_PATH_COMPUTATION_REQUEST = "{}/operations/transportpce-pce:path-computation-request" URL_FULL_PORTMAPPING = "{}/config/transportpce-portmapping:network" +URL_TAPI_TOPOLOGY_DETAILS = "{}/operations/tapi-topology:get-topology-details" +URL_TAPI_NODE_DETAILS = "{}/operations/tapi-topology:get-node-details" +URL_TAPI_SIP_LIST = "{}/operations/tapi-common:get-service-interface-point-list" +URL_TAPI_SERVICE_LIST = "{}/operations/tapi-connectivity:get-connectivity-service-list" TYPE_APPLICATION_JSON = {'Content-Type': 'application/json', 'Accept': 'application/json'} TYPE_APPLICATION_XML = {'Content-Type': 'application/xml', 'Accept': 'application/xml'} @@ -59,9 +67,6 @@ CODE_SHOULD_BE_200 = 'Http status code should be 200' CODE_SHOULD_BE_201 = 'Http status code should be 201' SIM_LOG_DIRECTORY = os.path.join(os.path.dirname(os.path.realpath(__file__)), "log") -KARAF_LOG = os.path.join( - os.path.dirname(os.path.realpath(__file__)), - "..", "..", "..", "karaf", "target", "assembly", "data", "log", "karaf.log") process_list = [] @@ -71,8 +76,17 @@ if "USE_ODL_ALT_RESTCONF_PORT" in os.environ: else: RESTCONF_BASE_URL = "http://localhost:8181/restconf" +if "USE_ODL_ALT_KARAF_INSTALL_DIR" in os.environ: + KARAF_INSTALLDIR = os.environ['USE_ODL_ALT_KARAF_INSTALL_DIR'] +else: + KARAF_INSTALLDIR = "karaf" + +KARAF_LOG = os.path.join( + os.path.dirname(os.path.realpath(__file__)), + "..", "..", "..", KARAF_INSTALLDIR, "target", "assembly", "data", "log", "karaf.log") + if "USE_LIGHTY" in os.environ and os.environ['USE_LIGHTY'] == 'True': - TPCE_LOG = 'odl.log' + TPCE_LOG = 'odl-' + str(os.getpid()) + '.log' else: TPCE_LOG = KARAF_LOG @@ -102,7 +116,7 @@ def start_tpce(): else: process = start_karaf() start_msg = KARAF_OK_START_MSG - if wait_until_log_contains(TPCE_LOG, start_msg, time_to_wait=120): + if wait_until_log_contains(TPCE_LOG, start_msg, time_to_wait=300): print("OpenDaylight started !") else: print("OpenDaylight failed to start !") @@ -118,8 +132,8 @@ def start_karaf(): print("starting KARAF TransportPCE build...") executable = os.path.join( os.path.dirname(os.path.realpath(__file__)), - "..", "..", "..", "karaf", "target", "assembly", "bin", "karaf") - with open('odl.log', 'w') as outfile: + "..", "..", "..", KARAF_INSTALLDIR, "target", "assembly", "bin", "karaf") + with open('odl.log', 'w', encoding='utf-8') as outfile: return subprocess.Popen( ["sh", executable, "server"], stdout=outfile, stderr=outfile, stdin=None) @@ -130,7 +144,7 @@ def start_lighty(): os.path.dirname(os.path.realpath(__file__)), "..", "..", "..", "lighty", "target", "tpce", "clean-start-controller.sh") - with open('odl.log', 'w') as outfile: + with open(TPCE_LOG, 'w', encoding='utf-8') as outfile: return subprocess.Popen( ["sh", executable], stdout=outfile, stderr=outfile, stdin=None) @@ -139,7 +153,7 @@ def install_karaf_feature(feature_name: str): print("installing feature " + feature_name) executable = os.path.join( os.path.dirname(os.path.realpath(__file__)), - "..", "..", "..", "karaf", "target", "assembly", "bin", "client") + "..", "..", "..", KARAF_INSTALLDIR, "target", "assembly", "bin", "client") return subprocess.run([executable], input='feature:install ' + feature_name + '\n feature:list | grep ' + feature_name + ' \n logout \n', @@ -193,6 +207,7 @@ def put_xmlrequest(url, data): headers=TYPE_APPLICATION_XML, auth=(ODL_LOGIN, ODL_PWD)) + def put_jsonrequest(url, data): return requests.request( "PUT", url.format(RESTCONF_BASE_URL), @@ -200,6 +215,7 @@ def put_jsonrequest(url, data): headers=TYPE_APPLICATION_JSON, auth=(ODL_LOGIN, ODL_PWD)) + def rawput_request(url, data): return requests.request( "PUT", url.format(RESTCONF_BASE_URL), @@ -207,6 +223,7 @@ def rawput_request(url, data): headers=TYPE_APPLICATION_JSON, auth=(ODL_LOGIN, ODL_PWD)) + def rawpost_request(url, data): return requests.request( "POST", url.format(RESTCONF_BASE_URL), @@ -233,7 +250,7 @@ def mount_device(node_id, sim): "netconf-node-topology:tcp-only": "false", "netconf-node-topology:pass-through": {}}]} response = put_request(url, body) - if wait_until_log_contains(TPCE_LOG, re.escape("Triggering notification stream NETCONF for node " + node_id), 60): + if wait_until_log_contains(TPCE_LOG, re.escape("Triggering notification stream NETCONF for node " + node_id), 180): print("Node " + node_id + " correctly added to tpce topology", end='... ', flush=True) else: print("Node " + node_id + " still not added to tpce topology", end='... ', flush=True) @@ -246,7 +263,7 @@ def mount_device(node_id, sim): def unmount_device(node_id): url = URL_CONFIG_NETCONF_TOPO + "node/" + node_id response = delete_request(url) - if wait_until_log_contains(TPCE_LOG, re.escape("onDeviceDisConnected: " + node_id), 60): + if wait_until_log_contains(TPCE_LOG, re.escape("onDeviceDisConnected: " + node_id), 180): print("Node " + node_id + " correctly deleted from tpce topology", end='... ', flush=True) else: print("Node " + node_id + " still not deleted from tpce topology", end='... ', flush=True) @@ -347,8 +364,8 @@ def portmapping_request(suffix: str): return get_request(url) -def get_notifications_service_request(attr): - return post_request(URL_GET_NBINOTIFICATIONS_SERV, attr) +def get_notifications_process_service_request(attr): + return post_request(URL_GET_NBINOTIFICATIONS_PROCESS_SERV, attr) def get_notifications_alarm_service_request(attr): @@ -433,6 +450,40 @@ def path_computation_request(requestid: str, servicename: str, serviceaend, serv return post_request(URL_PATH_COMPUTATION_REQUEST, {"input": attr}) +def tapi_create_connectivity_request(topologyidorname): + return post_request(URL_TAPI_CREATE_CONNECTIVITY, topologyidorname) + + +def tapi_delete_connectivity_request(serviceidorname): + attr = { + "input": { + "service-id-or-name": serviceidorname}} + return post_request(URL_TAPI_DELETE_CONNECTIVITY, attr) + + +def tapi_get_topology_details_request(topologyidorname): + attr = { + "input": { + "topology-id-or-name": topologyidorname}} + return post_request(URL_TAPI_TOPOLOGY_DETAILS, attr) + + +def tapi_get_node_details_request(topologyidorname, nodeidorname): + attr = { + "input": { + "topology-id-or-name": topologyidorname, + "node-id-or-name": nodeidorname}} + return post_request(URL_TAPI_NODE_DETAILS, attr) + + +def tapi_get_sip_details_request(): + return post_request(URL_TAPI_SIP_LIST, "") + + +def tapi_get_service_list_request(): + return post_request(URL_TAPI_SERVICE_LIST, "") + + def shutdown_process(process): if process is not None: for child in psutil.Process(process.pid).children(): @@ -447,14 +498,14 @@ def start_honeynode(log_file: str, sim): sample_directory = os.path.join(os.path.dirname(os.path.realpath(__file__)), "..", "..", "sample_configs", "openroadm", sim[1]) if os.path.isfile(executable): - with open(log_file, 'w') as outfile: + with open(log_file, 'w', encoding='utf-8') as outfile: return subprocess.Popen( [executable, SIMS[sim]['port'], os.path.join(sample_directory, SIMS[sim]['configfile'])], stdout=outfile, stderr=outfile) return None -def wait_until_log_contains(log_file, regexp, time_to_wait=20): +def wait_until_log_contains(log_file, regexp, time_to_wait=60): # pylint: disable=lost-exception stringfound = False filefound = False @@ -463,7 +514,7 @@ def wait_until_log_contains(log_file, regexp, time_to_wait=20): with TimeOut(seconds=time_to_wait): while not os.path.exists(log_file): time.sleep(0.2) - filelogs = open(log_file, 'r') + filelogs = open(log_file, 'r', encoding='utf-8') filelogs.seek(0, 2) filefound = True print("Searching for pattern '" + regexp + "' in " + os.path.basename(log_file), end='... ', flush=True)