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=46bf27a676ddb1b9a0e1978c9b7b4a3dbb0cd2ce;hpb=dd5eacee084b286f314860366b30040eb7781944;p=transportpce.git diff --git a/tests/transportpce_tests/common/test_utils.py b/tests/transportpce_tests/common/test_utils.py index 46bf27a67..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 @@ -131,7 +133,7 @@ def start_karaf(): executable = os.path.join( os.path.dirname(os.path.realpath(__file__)), "..", "..", "..", KARAF_INSTALLDIR, "target", "assembly", "bin", "karaf") - with open('odl.log', 'w') as outfile: + with open('odl.log', 'w', encoding='utf-8') as outfile: return subprocess.Popen( ["sh", executable, "server"], stdout=outfile, stderr=outfile, stdin=None) @@ -142,7 +144,7 @@ def start_lighty(): os.path.dirname(os.path.realpath(__file__)), "..", "..", "..", "lighty", "target", "tpce", "clean-start-controller.sh") - with open(TPCE_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) @@ -393,6 +395,7 @@ def service_delete_request(servicename: str, "tail-retention": "no"}}} return post_request(URL_SERV_DELETE, attr) + def service_path_request(operation: str, servicename: str, wavenumber: str, nodes, centerfreq: str, slotwidth: int, minfreq: float, maxfreq: float, lowerslotnumber: int, higherslotnumber: int): @@ -446,20 +449,24 @@ def path_computation_request(requestid: str, servicename: str, serviceaend, serv attr.update(other_attr) 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) + 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) + return post_request(URL_TAPI_TOPOLOGY_DETAILS, attr) + def tapi_get_node_details_request(topologyidorname, nodeidorname): attr = { @@ -468,12 +475,15 @@ def tapi_get_node_details_request(topologyidorname, nodeidorname): "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(): @@ -488,7 +498,7 @@ 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) @@ -504,7 +514,7 @@ def wait_until_log_contains(log_file, regexp, time_to_wait=60): 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)