X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Ftransportpce_tests%2Fcommon%2Ftest_utils_rfc8040.py;h=c37d808db2dad4dc059c69859625130e1e829237;hb=c1f58e4363b2ce99bf87053117d453ff04183273;hp=db1b6c56c5c4d9d9dd89e61777ead5b65a7ffbd5;hpb=1d3d9a367184f331ec0dcf9b0b7ea22973da24a1;p=transportpce.git

diff --git a/tests/transportpce_tests/common/test_utils_rfc8040.py b/tests/transportpce_tests/common/test_utils_rfc8040.py
index db1b6c56c..c37d808db 100644
--- a/tests/transportpce_tests/common/test_utils_rfc8040.py
+++ b/tests/transportpce_tests/common/test_utils_rfc8040.py
@@ -555,116 +555,18 @@ def device_renderer_create_ots_oms_request(nodeid: str, lcp: str):
     return post_request(url, data)
 
 
-def device_renderer_service_path_request(payload: dict):
-    url = "{}/operations/transportpce-device-renderer:service-path"
-    if RESTCONF_VERSION == 'draft-bierman02':
-        data = prepend_dict_keys({'input': payload}, 'transportpce-device-renderer:')
-    else:
-        data = {'input': payload}
-    response = post_request(url, data)
-    res = response.json()
-    return_key = {'rfc8040': 'transportpce-device-renderer:output',
-                  'draft-bierman02': 'output'}
-    return_output = res[return_key[RESTCONF_VERSION]]
-    return {'status_code': response.status_code,
-            'output': return_output}
-
-
-def device_renderer_otn_service_path_request(payload: dict):
-    url = "{}/operations/transportpce-device-renderer:otn-service-path"
-    if RESTCONF_VERSION == 'draft-bierman02':
-        data = prepend_dict_keys({'input': payload}, 'transportpce-device-renderer:')
-    else:
-        data = {'input': payload}
-    response = post_request(url, data)
-    res = response.json()
-    return_key = {'rfc8040': 'transportpce-device-renderer:output',
-                  'draft-bierman02': 'output'}
-    return_output = res[return_key[RESTCONF_VERSION]]
-    return {'status_code': response.status_code,
-            'output': return_output}
-
-
-def renderer_service_implementation_request(payload: dict):
-    url = "{}/operations/transportpce-renderer:service-implementation-request"
-    if RESTCONF_VERSION == 'draft-bierman02':
-        data = prepend_dict_keys({'input': payload}, 'transportpce-renderer:')
-    else:
-        data = {'input': payload}
-    response = post_request(url, data)
-    res = response.json()
-    return_key = {'rfc8040': 'transportpce-renderer:output',
-                  'draft-bierman02': 'output'}
-    return_output = res[return_key[RESTCONF_VERSION]]
-    return {'status_code': response.status_code,
-            'output': return_output}
-
-
-def olm_get_pm_request(payload: dict):
-    url = "{}/operations/transportpce-olm:get-pm"
-    if RESTCONF_VERSION == 'draft-bierman02':
-        data = prepend_dict_keys({'input': payload}, 'transportpce-olm:')
-    else:
-        data = {'input': payload}
-    response = post_request(url, data)
-    res = response.json()
-    return_key = {'rfc8040': 'transportpce-olm:output',
-                  'draft-bierman02': 'output'}
-    return_output = res[return_key[RESTCONF_VERSION]]
-    return {'status_code': response.status_code,
-            'output': return_output}
-
-
-def olm_calculate_spanloss_base_request(payload: dict):
-    url = "{}/operations/transportpce-olm:calculate-spanloss-base"
-    if RESTCONF_VERSION == 'draft-bierman02':
-        data = prepend_dict_keys({'input': payload}, 'transportpce-olm:')
-    else:
-        data = {'input': payload}
-    response = post_request(url, data)
-    res = response.json()
-    return_key = {'rfc8040': 'transportpce-olm:output',
-                  'draft-bierman02': 'output'}
-    return_output = res[return_key[RESTCONF_VERSION]]
-    return {'status_code': response.status_code,
-            'output': return_output}
-
-
-def olm_service_power_setup_request(payload: dict):
-    url = "{}/operations/transportpce-olm:service-power-setup"
-    if RESTCONF_VERSION == 'draft-bierman02':
-        data = prepend_dict_keys({'input': payload}, 'transportpce-olm:')
+def transportpce_api_rpc_request(api_module: str, rpc: str, payload: dict):
+    # pylint: disable=consider-using-f-string
+    url = "{}/operations/{}:{}".format('{}', api_module, rpc)
+    if payload is None:
+        data = None
+    elif RESTCONF_VERSION == 'draft-bierman02':
+        data = prepend_dict_keys({'input': payload}, api_module + ':')
     else:
         data = {'input': payload}
     response = post_request(url, data)
     res = response.json()
-    return_key = {'rfc8040': 'transportpce-olm:output',
-                  'draft-bierman02': 'output'}
-    return_output = res[return_key[RESTCONF_VERSION]]
-    return {'status_code': response.status_code,
-            'output': return_output}
-
-
-def olm_service_power_turndown_request(payload: dict):
-    url = "{}/operations/transportpce-olm:service-power-turndown"
-    if RESTCONF_VERSION == 'draft-bierman02':
-        data = prepend_dict_keys({'input': payload}, 'transportpce-olm:')
-    else:
-        data = {'input': payload}
-    response = post_request(url, data)
-    res = response.json()
-    return_key = {'rfc8040': 'transportpce-olm:output',
-                  'draft-bierman02': 'output'}
-    return_output = res[return_key[RESTCONF_VERSION]]
-    return {'status_code': response.status_code,
-            'output': return_output}
-
-
-def olm_calculate_spanloss_current_request():
-    url = "{}/operations/transportpce-olm:calculate-spanloss-current"
-    response = post_request(url, None)
-    res = response.json()
-    return_key = {'rfc8040': 'transportpce-olm:output',
+    return_key = {'rfc8040': api_module + ':output',
                   'draft-bierman02': 'output'}
     return_output = res[return_key[RESTCONF_VERSION]]
     return {'status_code': response.status_code,