else:
RESTCONF_VERSION = 'rfc8040'
-RESTCONF_BASE_URL = 'http://localhost:' + RESTCONF_PORT + RESTCONF_PATH_PREFIX[RESTCONF_VERSION]
+RESTCONF_BASE_URL = 'http://localhost:' + str(RESTCONF_PORT) + RESTCONF_PATH_PREFIX[RESTCONF_VERSION]
if 'USE_ODL_ALT_KARAF_INSTALL_DIR' in os.environ:
KARAF_INSTALLDIR = os.environ['USE_ODL_ALT_KARAF_INSTALL_DIR']
def check_device_connection(node: str):
- url = {'rfc8040': '{}/data/network-topology:network-topology/topology=topology-netconf/node={}',
+ url = {'rfc8040': '{}/data/network-topology:network-topology/topology=topology-netconf/node={}?content=nonconfig',
'draft-bierman02': '{}/operational/network-topology:network-topology/topology/topology-netconf/node/{}'}
response = get_request(url[RESTCONF_VERSION].format('{}', node))
res = response.json()
def check_node_attribute_request(node: str, attribute: str, attribute_value: str):
# pylint: disable=line-too-long
- url = {'rfc8040': '{}/data/network-topology:network-topology/topology=topology-netconf/node={}/yang-ext:mount/org-openroadm-device:org-openroadm-device/{}={}', # nopep8
- 'draft-bierman02': '{}/config/network-topology:network-topology/topology/topology-netconf/node/{}/yang-ext:mount/org-openroadm-device:org-openroadm-device/{}/{}'} # nopep8
+ url = {'rfc8040': '{}/data/network-topology:network-topology/topology=topology-netconf/node={}/yang-ext:mount/org-openroadm-device:org-openroadm-device/{}={}?content=nonconfig', # nopep8
+ 'draft-bierman02': '{}/operational/network-topology:network-topology/topology/topology-netconf/node/{}/yang-ext:mount/org-openroadm-device:org-openroadm-device/{}/{}'} # nopep8
response = get_request(url[RESTCONF_VERSION].format('{}', node, attribute, attribute_value))
res = response.json()
return_key = {'rfc8040': 'org-openroadm-device:' + attribute,
def device_renderer_service_path_request(payload: dict):
url = "{}/operations/transportpce-device-renderer:service-path"
if RESTCONF_VERSION == 'draft-bierman02':
- data = prepend_dict_keys(payload, 'transportpce-device-renderer:')
+ data = prepend_dict_keys({'input': payload}, 'transportpce-device-renderer:')
else:
- data = payload
- return post_request(url, data)
+ 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}