Code Review / transportpce.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Refactor func tests transportpce api rpc calls 2/2
[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 b2cfc4c4c75599fb626f9699dd289ca9a4ce7feb..785f2a6d8f5c329c305921d8ba07f54838c35813 100644 (file)
--- a/tests/transportpce_tests/common/test_utils_rfc8040.py
+++ b/tests/transportpce_tests/common/test_utils_rfc8040.py
@@ -63,7 +63,7 @@ if 'USE_ODL_RESTCONF_VERSION' in os.environ:
 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']
@@ -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,41 @@ def check_device_connection(node: str):
             'connection-status': connection_status}
 
 
-def check_interface_request(node: str, interface: 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/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))
+    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:interface',
-                  'draft-bierman02': 'interface'}
+    return_key = {'rfc8040': 'org-openroadm-device:' + attribute,
+                  'draft-bierman02': attribute}
     if return_key[RESTCONF_VERSION] in res.keys():
-        interface = res[return_key[RESTCONF_VERSION]]
+        response_attribute = res[return_key[RESTCONF_VERSION]]
     else:
-        interface = res['errors']['error'][0]
+        response_attribute = 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
+            attribute: response_attribute}
 
 
-def check_roadm_connections_request(node: str, connections: str):
+def check_node_attribute2_request(node: str, attribute: str, attribute_value: str, attribute2: 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))
+    url = {'rfc8040': '{}/data/network-topology:network-topology/topology=topology-netconf/node={}/yang-ext:mount/org-openroadm-device:org-openroadm-device/{}={}/{}?content=config',  # nopep8
+           'draft-bierman02': '{}/config/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, attribute2))
     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]]
+    if attribute2 in res.keys():
+        response_attribute = res[attribute2]
     else:
-        roadm_connections = res['errors']['error'][0]
+        response_attribute = res['errors']['error'][0]
     return {'status_code': response.status_code,
-            'roadm-connections': roadm_connections}
+            attribute2: response_attribute}
 
 
-def del_roadm_connections_request(node: str, connections: 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/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))
-    res = response.json()
-    return_key = {'rfc8040': 'org-openroadm-device:circuit-packs',
-                  'draft-bierman02': 'circuit-packs'}
-    if return_key[RESTCONF_VERSION] in res.keys():
-        cp = res[return_key[RESTCONF_VERSION]]
-    else:
-        cp = res['errors']['error'][0]
-    return {'status_code': response.status_code,
-            'circuit-packs': cp}
-
-
-def del_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
-    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
 
 #
@@ -437,6 +399,18 @@ def portmapping_request(node: str, mapping: str):
             'mapping': mapping}
 
 
+def portmapping_switching_pool_request(node: str, switching_pool: str):
+    url = {'rfc8040': '{}/data/transportpce-portmapping:network/nodes={}/switching-pool-lcp={}',
+           'draft-bierman02': '{}/config/transportpce-portmapping:network/nodes/{}/switching-pool-lcp/{}'}
+    response = get_request(url[RESTCONF_VERSION].format('{}', node, switching_pool))
+    res = response.json()
+    return_key = {'rfc8040': 'transportpce-portmapping:switching-pool-lcp',
+                  'draft-bierman02': 'switching-pool-lcp'}
+    switching_pool = res[return_key[RESTCONF_VERSION]]
+    return {'status_code': response.status_code,
+            'switching_pool': switching_pool}
+
+
 def portmapping_mc_capa_request(node: str, mc_capa: str):
     url = {'rfc8040': '{}/data/transportpce-portmapping:network/nodes={}/mc-capabilities={}',
            'draft-bierman02': '{}/config/transportpce-portmapping:network/nodes/{}/mc-capabilities/{}'}
@@ -533,7 +507,7 @@ def del_ietf_network_node_request(network: str, node: str, content: str):
     return response
 
 #
-# TransportPCE network-utils and service-path operations
+# TransportPCE internal API RPCs
 #
 
 
@@ -551,28 +525,19 @@ def prepend_dict_keys(input_dict: dict, prefix: str):
     return return_dict
 
 
-def connect_xpdr_to_rdm_request(payload: dict):
-    url = "{}/operations/transportpce-networkutils:init-xpdr-rdm-links"
-    if RESTCONF_VERSION == 'draft-bierman02':
-        data = prepend_dict_keys({'input': {'links-input': payload}}, 'networkutils:')
-    else:
-        data = {'input': {'links-input': payload}}
-    return post_request(url, data)
-
-
-def connect_rdm_to_xpdr_request(payload: dict):
-    url = "{}/operations/transportpce-networkutils:init-rdm-xpdr-links"
-    if RESTCONF_VERSION == 'draft-bierman02':
-        data = prepend_dict_keys({'input': {'links-input': payload}}, 'networkutils:')
+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': {'links-input': payload}}
-    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(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': api_module + ':output',
+                  'draft-bierman02': 'output'}
+    return_output = res[return_key[RESTCONF_VERSION]]
+    return {'status_code': response.status_code,
+            'output': return_output}
Repository for Transport PCE project.