Merge "Fix func. tests utils base URL generation issue"

[transportpce.git] / tests / transportpce_tests / common / test_utils_rfc8040.py

diff --git a/tests/transportpce_tests/common/test_utils_rfc8040.py b/tests/transportpce_tests/common/test_utils_rfc8040.py
index c65c51ddd7af7eda3e26d853984105ea0ad17309..590577cd4796d12c7ba510725de27677cea964f9 100644 (file)
--- a/tests/transportpce_tests/common/test_utils_rfc8040.py
+++ b/tests/transportpce_tests/common/test_utils_rfc8040.py
@@ -304,7 +304,7 @@ def unmount_device(node: str):
 
 
 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()
@@ -318,79 +318,27 @@ def check_device_connection(node: str):
             'connection-status': connection_status}
 
 
-def check_interface_request(node: str, interface: 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/interface={}',  # nopep8
-           'draft-bierman02': '{}/operational/network-topology:network-topology/topology/topology-netconf/node/{}/yang-ext:mount/org-openroadm-device:org-openroadm-device/interface/{}'}  # nopep8
-    response = get_request(url[RESTCONF_VERSION].format('{}', node, interface))
-    res = response.json()
-    return_key = {'rfc8040': 'org-openroadm-device:interface',
-                  'draft-bierman02': 'interface'}
-    if return_key[RESTCONF_VERSION] in res.keys():
-        interface = res[return_key[RESTCONF_VERSION]]
-    else:
-        interface = res['errors']['error'][0]
-    return {'status_code': response.status_code,
-            'interface': interface}
-
-
-def del_interface_request(node: str, interface: 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/interface={}',  # nopep8
-           'draft-bierman02': '{}/config/network-topology:network-topology/topology/topology-netconf/node/{}/yang-ext:mount/org-openroadm-device:org-openroadm-device/interface/{}'}  # nopep8
-    # draft-bierman02: note this is config here and not operational as previously in check_interface_request
-    response = delete_request(url[RESTCONF_VERSION].format('{}', node, interface))
-    return response
-
-
-def check_roadm_connections_request(node: str, connections: 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/roadm-connections={}',  # nopep8
-           'draft-bierman02': '{}/operational/network-topology:network-topology/topology/topology-netconf/node/{}/yang-ext:mount/org-openroadm-device:org-openroadm-device/roadm-connections/{}'}  # nopep8
-    response = get_request(url[RESTCONF_VERSION].format('{}', node, connections))
-    res = response.json()
-    return_key = {'rfc8040': 'org-openroadm-device:roadm-connections',
-                  'draft-bierman02': 'roadm-connections'}
-    if return_key[RESTCONF_VERSION] in res.keys():
-        roadm_connections = res[return_key[RESTCONF_VERSION]]
-    else:
-        roadm_connections = res['errors']['error'][0]
-    return {'status_code': response.status_code,
-            'roadm-connections': roadm_connections}
-
-
-def del_roadm_connections_request(node: str, connections: str):
+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/roadm-connections={}',  # nopep8
-           'draft-bierman02': '{}/config/network-topology:network-topology/topology/topology-netconf/node/{}/yang-ext:mount/org-openroadm-device:org-openroadm-device/roadm-connections/{}'}  # nopep8
-    # draft-bierman02: note this is config here and not operational as previously in check_interface_request
-    response = delete_request(url[RESTCONF_VERSION].format('{}', node, connections))
-    return response
-
-
-def check_circuit_packs_request(node: str, circuit_packs: 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/circuit-packs={}',  # nopep8
-           'draft-bierman02': '{}/config/network-topology:network-topology/topology/topology-netconf/node/{}/yang-ext:mount/org-openroadm-device:org-openroadm-device/circuit-packs/{}'}  # nopep8
-    # draft-bierman02: note this is config here and not operational as previously in check_interface_request
-    # FIXME: https://jira.opendaylight.org/browse/TRNSPRTPCE-591
-    response = get_request(url[RESTCONF_VERSION].format('{}', node, circuit_packs))
+    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:circuit-packs',
-                  'draft-bierman02': 'circuit-packs'}
+    return_key = {'rfc8040': 'org-openroadm-device:' + attribute,
+                  'draft-bierman02': attribute}
     if return_key[RESTCONF_VERSION] in res.keys():
-        cp = res[return_key[RESTCONF_VERSION]]
+        response_attribute = res[return_key[RESTCONF_VERSION]]
     else:
-        cp = res['errors']['error'][0]
+        response_attribute = res['errors']['error'][0]
     return {'status_code': response.status_code,
-            'circuit-packs': cp}
+            attribute: response_attribute}
 
 
-def del_circuit_packs_request(node: str, circuit_packs: str):
+def del_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/circuit-packs={}',  # nopep8
-           'draft-bierman02': '{}/config/network-topology:network-topology/topology/topology-netconf/node/{}/yang-ext:mount/org-openroadm-device:org-openroadm-device/circuit-packs/{}'}  # nopep8
-    response = delete_request(url[RESTCONF_VERSION].format('{}', node, circuit_packs))
+    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
+    response = delete_request(url[RESTCONF_VERSION].format('{}', node, attribute, attribute_value))
     return response
 
 #
@@ -575,4 +523,25 @@ def device_renderer_service_path_request(payload: dict):
         data = prepend_dict_keys(payload, 'transportpce-device-renderer:')
     else:
         data = payload
-    return post_request(url, data)
+    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(payload, 'transportpce-device-renderer:')
+    else:
+        data = 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}