X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Ftransportpce_tests%2Fcommon%2Ftest_utils.py;h=c2447a992fb8577cf73af4d559661aec17fa1870;hb=4a3e94824b3d608fa3b21eee21f5dae220dc41fd;hp=fc8a4f69cec71e514d4df31e7d3ae6ceb9438bcf;hpb=dd3a2a048df0afd2dfcf1b701dd4cc8bda76afdb;p=transportpce.git diff --git a/tests/transportpce_tests/common/test_utils.py b/tests/transportpce_tests/common/test_utils.py index fc8a4f69c..c2447a992 100644 --- a/tests/transportpce_tests/common/test_utils.py +++ b/tests/transportpce_tests/common/test_utils.py @@ -137,7 +137,8 @@ def install_karaf_feature(feature_name: str): os.path.dirname(os.path.realpath(__file__)), "..", "..", "..", "karaf", "target", "assembly", "bin", "client") return subprocess.run([executable], - input='feature:install ' + feature_name + '\n feature:list | grep tapi \n logout \n', + input='feature:install ' + feature_name + '\n feature:list | grep ' + + feature_name + ' \n logout \n', universal_newlines=True, check=False) @@ -150,6 +151,7 @@ def get_request(url): def post_request(url, data): if data: + print(json.dumps(data)) return requests.request( "POST", url.format(RESTCONF_BASE_URL), data=json.dumps(data), @@ -359,13 +361,21 @@ def service_delete_request(servicename: str, return post_request(URL_SERV_DELETE, attr) -def service_path_request(operation: str, servicename: str, wavenumber: str, nodes): +def service_path_request(operation: str, servicename: str, wavenumber: str, nodes, centerfreq: str, + slotwidth: int, minfreq: float, maxfreq: float, lowerslotnumber: int, + higherslotnumber: int): attr = {"renderer:input": { "renderer:service-name": servicename, "renderer:wave-number": wavenumber, - "renderer:modulation-format": "qpsk", + "renderer:modulation-format": "dp-qpsk", "renderer:operation": operation, - "renderer:nodes": nodes}} + "renderer:nodes": nodes, + "renderer:center-freq": centerfreq, + "renderer:width": slotwidth, + "renderer:min-freq": minfreq, + "renderer:max-freq": maxfreq, + "renderer:lower-spectral-slot-number": lowerslotnumber, + "renderer:higher-spectral-slot-number": higherslotnumber}} return post_request(URL_SERVICE_PATH, attr)