X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Ftransportpce_tests%2Fcommon%2Ftest_utils.py;h=da746393c0d903d82b00df8ce5ddfb9229a2e10b;hb=64975190383a3682d35b8e434b8be43606f1f81a;hp=7f2cc1d33edd1f6c8a1aaeb46f6577871f4d893e;hpb=78881abcc31dc039c374bcc15266030e8dabcf87;p=transportpce.git diff --git a/tests/transportpce_tests/common/test_utils.py b/tests/transportpce_tests/common/test_utils.py index 7f2cc1d33..da746393c 100644 --- a/tests/transportpce_tests/common/test_utils.py +++ b/tests/transportpce_tests/common/test_utils.py @@ -13,6 +13,7 @@ import sys import re import signal import subprocess +import time import psutil import requests @@ -33,6 +34,18 @@ ODL_LOGIN = "admin" ODL_PWD = "admin" NODES_LOGIN = "admin" NODES_PWD = "admin" +URL_CONFIG_NETCONF_TOPO = "{}/config/network-topology:network-topology/topology/topology-netconf/" +URL_CONFIG_ORDM_TOPO = "{}/config/ietf-network:networks/network/openroadm-topology/" +URL_CONFIG_OTN_TOPO = "{}/config/ietf-network:networks/network/otn-topology/" +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_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_CREATE_OTS_OMS = "{}/operations/transportpce-device-renderer:create-ots-oms" TYPE_APPLICATION_JSON = {'Content-Type': 'application/json', 'Accept': 'application/json'} TYPE_APPLICATION_XML = {'Content-Type': 'application/xml', 'Accept': 'application/xml'} @@ -121,28 +134,70 @@ def install_karaf_feature(feature_name: str): universal_newlines=True) -def post_request(url, data, username, password): +def get_request(url): return requests.request( - "POST", url, data=json.dumps(data), - headers=TYPE_APPLICATION_JSON, auth=(username, password)) + "GET", url.format(RESTCONF_BASE_URL), + headers=TYPE_APPLICATION_JSON, + auth=(ODL_LOGIN, ODL_PWD)) + + +def post_request(url, data): + if data: + return requests.request( + "POST", url.format(RESTCONF_BASE_URL), + data=json.dumps(data), + headers=TYPE_APPLICATION_JSON, + auth=(ODL_LOGIN, ODL_PWD)) + else: + return requests.request( + "POST", url.format(RESTCONF_BASE_URL), + headers=TYPE_APPLICATION_JSON, + auth=(ODL_LOGIN, ODL_PWD)) + + +def post_xmlrequest(url, data): + if data: + return requests.request( + "POST", url.format(RESTCONF_BASE_URL), + data=data, + headers=TYPE_APPLICATION_XML, + auth=(ODL_LOGIN, ODL_PWD)) + + +def put_request(url, data): + return requests.request( + "PUT", url.format(RESTCONF_BASE_URL), + data=json.dumps(data), + headers=TYPE_APPLICATION_JSON, + auth=(ODL_LOGIN, ODL_PWD)) -def put_request(url, data, username, password): +def put_xmlrequest(url, data): return requests.request( - "PUT", url, data=json.dumps(data), headers=TYPE_APPLICATION_JSON, - auth=(username, password)) + "PUT", url.format(RESTCONF_BASE_URL), + data=data, + headers=TYPE_APPLICATION_XML, + auth=(ODL_LOGIN, ODL_PWD)) -def delete_request(url, username, password): +def rawput_request(url, data): return requests.request( - "DELETE", url, headers=TYPE_APPLICATION_JSON, - auth=(username, password)) + "PUT", url.format(RESTCONF_BASE_URL), + data=data, + headers=TYPE_APPLICATION_JSON, + auth=(ODL_LOGIN, ODL_PWD)) + + +def delete_request(url): + return requests.request( + "DELETE", url.format(RESTCONF_BASE_URL), + headers=TYPE_APPLICATION_JSON, + auth=(ODL_LOGIN, ODL_PWD)) def mount_device(node_id, sim): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/node/" - + node_id).format(RESTCONF_BASE_URL) - headers = {"node": [{ + url = URL_CONFIG_NETCONF_TOPO+"node/"+node_id + body = {"node": [{ "node-id": node_id, "netconf-node-topology:username": NODES_LOGIN, "netconf-node-topology:password": NODES_PWD, @@ -150,7 +205,7 @@ def mount_device(node_id, sim): "netconf-node-topology:port": SIMS[sim]['port'], "netconf-node-topology:tcp-only": "false", "netconf-node-topology:pass-through": {}}]} - response = put_request(url, headers, ODL_LOGIN, ODL_PWD) + response = put_request(url, body) if wait_until_log_contains(TPCE_LOG, re.escape("Triggering notification stream NETCONF for node "+node_id), 60): print("Node "+node_id+" correctly added to tpce topology", end='... ', flush=True) else: @@ -162,9 +217,8 @@ def mount_device(node_id, sim): def unmount_device(node_id): - url = ("{}/config/network-topology:network-topology/topology/topology-netconf/node/" - + node_id).format(RESTCONF_BASE_URL) - response = delete_request(url, ODL_LOGIN, ODL_PWD) + 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): print("Node "+node_id+" correctly deleted from tpce topology", end='... ', flush=True) else: @@ -172,8 +226,9 @@ def unmount_device(node_id): return response -def generate_link_data(xpdr_node: str, xpdr_num: str, network_num: str, rdm_node: str, srg_num: str, - termination_num: str): +def connect_xpdr_to_rdm_request(xpdr_node: str, xpdr_num: str, network_num: str, + rdm_node: str, srg_num: str, termination_num: str): + url = "{}/operations/transportpce-networkutils:init-xpdr-rdm-links" data = { "networkutils:input": { "networkutils:links-input": { @@ -186,7 +241,134 @@ def generate_link_data(xpdr_node: str, xpdr_num: str, network_num: str, rdm_node } } } - return data + return post_request(url, data) + + +def connect_rdm_to_xpdr_request(xpdr_node: str, xpdr_num: str, network_num: str, + rdm_node: str, srg_num: str, termination_num: str): + url = "{}/operations/transportpce-networkutils:init-rdm-xpdr-links" + data = { + "networkutils:input": { + "networkutils:links-input": { + "networkutils:xpdr-node": xpdr_node, + "networkutils:xpdr-num": xpdr_num, + "networkutils:network-num": network_num, + "networkutils:rdm-node": rdm_node, + "networkutils:srg-num": srg_num, + "networkutils:termination-point-num": termination_num + } + } + } + return post_request(url, data) + + +def check_netconf_node_request(node: str, suffix: str): + url = URL_CONFIG_NETCONF_TOPO + ( + "node/" + node + "/yang-ext:mount/org-openroadm-device:org-openroadm-device/" + suffix + ) + return get_request(url) + + +def get_netconf_oper_request(node: str): + url = "{}/operational/network-topology:network-topology/topology/topology-netconf/node/" + node + return get_request(url) + + +def get_ordm_topo_request(suffix: str): + url = URL_CONFIG_ORDM_TOPO + suffix + return get_request(url) + + +def add_oms_attr_request(link: str, attr): + url = URL_CONFIG_ORDM_TOPO + ( + "ietf-network-topology:link/" + link + "/org-openroadm-network-topology:OMS-attributes/span" + ) + return put_request(url, attr) + + +def del_oms_attr_request(link: str): + url = URL_CONFIG_ORDM_TOPO + ( + "ietf-network-topology:link/" + link + "/org-openroadm-network-topology:OMS-attributes/span" + ) + return delete_request(url) + + +def get_clli_net_request(): + return get_request(URL_CONFIG_CLLI_NET) + + +def get_ordm_net_request(): + return get_request(URL_CONFIG_ORDM_NET) + + +def get_otn_topo_request(): + return get_request(URL_CONFIG_OTN_TOPO) + + +def del_link_request(link: str): + url = URL_CONFIG_ORDM_TOPO + ("ietf-network-topology:link/" + link) + return delete_request(url) + + +def del_node_request(node: str): + url = URL_CONFIG_CLLI_NET + ("node/" + node) + return delete_request(url) + + +def portmapping_request(suffix: str): + url = URL_PORTMAPPING + suffix + return get_request(url) + + +def get_service_list_request(suffix: str): + url = URL_OPER_SERV_LIST + suffix + return get_request(url) + + +def service_create_request(attr): + return post_request(URL_SERV_CREATE, attr) + +def service_delete_request(servicename : str, + requestid = "e3028bae-a90f-4ddd-a83f-cf224eba0e58", + notificationurl="http://localhost:8585/NotificationServer/notify"): + attr = {"input": { + "sdnc-request-header": { + "request-id": requestid, + "rpc-action": "service-delete", + "request-system-id": "appname", + "notification-url": notificationurl}, + "service-delete-req-info": { + "service-name": servicename, + "tail-retention": "no"}}} + return post_request(URL_SERV_DELETE, attr) + + +def service_path_request(operation: str, servicename: str, wavenumber: str, nodes): + attr = {"renderer:input": { + "renderer:service-name": servicename, + "renderer:wave-number": wavenumber, + "renderer:modulation-format": "qpsk", + "renderer:operation": operation, + "renderer:nodes": nodes}} + return post_request(URL_SERVICE_PATH, attr) + + +def otn_service_path_request(operation: str, servicename: str, servicerate: str, servicetype: str, nodes, eth_attr=None): + attr = {"service-name": servicename, + "operation": operation, + "service-rate": servicerate, + "service-type": servicetype, + "nodes": nodes} + if eth_attr: + attr.update(eth_attr) + return post_request(URL_OTN_SERVICE_PATH, {"renderer:input": attr}) + + +def create_ots_oms_request(nodeid: str, lcp: str): + attr = {"input": { + "node-id": nodeid, + "logical-connection-point": lcp}} + return post_request(URL_CREATE_OTS_OMS, attr) def shutdown_process(process): @@ -206,30 +388,36 @@ def start_honeynode(log_file: str, node_port: str, node_config_file_name: str): def wait_until_log_contains(log_file, regexp, time_to_wait=20): - found = False - tail = None + stringfound = False + filefound = False + line = None try: with TimeOut(seconds=time_to_wait): + while not os.path.exists(log_file): + time.sleep(0.2) + filelogs = open(log_file, 'r') + filelogs.seek(0, 2) + filefound = True print("Searching for pattern '"+regexp+"' in "+os.path.basename(log_file), end='... ', flush=True) - tail = subprocess.Popen(['tail', '-F', log_file], stdout=subprocess.PIPE, stderr=subprocess.PIPE) compiled_regexp = re.compile(regexp) while True: - line = tail.stdout.readline().decode('utf-8') + line = filelogs.readline() if compiled_regexp.search(line): - print("String found!", end=' ') - found = True + print("Pattern found!", end=' ') + stringfound = True break + if not line: + time.sleep(0.1) except TimeoutError: - print("String not found after "+str(time_to_wait), end=" seconds! ", flush=True) + print("Pattern not found after "+str(time_to_wait), end=" seconds! ", flush=True) + except PermissionError: + print("Permission Error when trying to access the log file", end=" ... ", flush=True) finally: - if tail is not None: - print("Stopping tail command", end='... ', flush=True) - tail.stderr.close() - tail.stdout.close() - tail.kill() - tail.wait() - return found -# TODO try to find an alternative to subprocess+tail -f (such as https://pypi.org/project/tailhead/) + if filefound: + filelogs.close() + else: + print("log file does not exist or is not accessible... ", flush=True) + return stringfound class TimeOut: