Refactor test_utils_rfc8040.py portmapping methods

[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 e83a284a221260238a92c3cca7afdae5a2efe07f..18d2a7d3e407f7d5210af17f20c72deeff2c2ccc 100644 (file)
--- a/tests/transportpce_tests/common/test_utils_rfc8040.py
+++ b/tests/transportpce_tests/common/test_utils_rfc8040.py
@@ -108,7 +108,6 @@ def delete_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),
@@ -282,7 +281,7 @@ def mount_device(node: str, sim: str):
         'netconf-node-topology:tcp-only': 'false',
         'netconf-node-topology:pass-through': {}}]}
     response = put_request(url[RESTCONF_VERSION].format('{}', node), body)
-    if wait_until_log_contains(TPCE_LOG, re.escape('Triggering notification stream NETCONF for node ' + node), 180):
+    if wait_until_log_contains(TPCE_LOG, 'Triggering notification stream NETCONF for node ' + node, 180):
         print('Node ' + node + ' correctly added to tpce topology', end='... ', flush=True)
     else:
         print('Node ' + node + ' still not added to tpce topology', end='... ', flush=True)
@@ -376,67 +375,28 @@ def del_node_attribute_request(node: str, attribute: str, attribute_value: str):
 #
 
 
-def get_portmapping(node: str):
+def get_portmapping_node_attr(node: str, attr: str, value: str):
+    # pylint: disable=consider-using-f-string
     url = {'rfc8040': '{}/data/transportpce-portmapping:network/nodes={}',
            'draft-bierman02': '{}/config/transportpce-portmapping:network/nodes/{}'}
-    response = get_request(url[RESTCONF_VERSION].format('{}', node))
-    res = response.json()
-    return_key = {'rfc8040': 'transportpce-portmapping:nodes',
-                  'draft-bierman02': 'nodes'}
-    nodes = res[return_key[RESTCONF_VERSION]]
-    return {'status_code': response.status_code,
-            'nodes': nodes}
-
-
-def get_portmapping_node_info(node: str):
-    url = {'rfc8040': '{}/data/transportpce-portmapping:network/nodes={}/node-info',
-           'draft-bierman02': '{}/config/transportpce-portmapping:network/nodes/{}/node-info'}
-    response = get_request(url[RESTCONF_VERSION].format('{}', node))
+    target_url = url[RESTCONF_VERSION].format('{}', node)
+    if attr is not None:
+        target_url = (target_url + '/{}').format('{}', attr)
+        if value is not None:
+            suffix = {'rfc8040': '={}', 'draft-bierman02': '/{}'}
+            target_url = (target_url + suffix[RESTCONF_VERSION]).format('{}', value)
+    else:
+        attr = 'nodes'
+    response = get_request(target_url)
     res = response.json()
-    return_key = {'rfc8040': 'transportpce-portmapping:node-info',
-                  'draft-bierman02': 'node-info'}
+    return_key = {'rfc8040': 'transportpce-portmapping:' + attr,
+                  'draft-bierman02': attr}
     if return_key[RESTCONF_VERSION] in res.keys():
-        node_info = res[return_key[RESTCONF_VERSION]]
+        return_output = res[return_key[RESTCONF_VERSION]]
     else:
-        node_info = res['errors']['error'][0]
-    return {'status_code': response.status_code,
-            'node-info': node_info}
-
-
-def portmapping_request(node: str, mapping: str):
-    url = {'rfc8040': '{}/data/transportpce-portmapping:network/nodes={}/mapping={}',
-           'draft-bierman02': '{}/config/transportpce-portmapping:network/nodes/{}/mapping/{}'}
-    response = get_request(url[RESTCONF_VERSION].format('{}', node, mapping))
-    res = response.json()
-    return_key = {'rfc8040': 'transportpce-portmapping:mapping',
-                  'draft-bierman02': 'mapping'}
-    mapping = res[return_key[RESTCONF_VERSION]]
-    return {'status_code': response.status_code,
-            '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/{}'}
-    response = get_request(url[RESTCONF_VERSION].format('{}', node, mc_capa))
-    res = response.json()
-    return_key = {'rfc8040': 'transportpce-portmapping:mc-capabilities',
-                  'draft-bierman02': 'mc-capabilities'}
-    capabilities = res[return_key[RESTCONF_VERSION]]
+        return_output = res['errors']['error'][0]
     return {'status_code': response.status_code,
-            'mc-capabilities': capabilities}
+            attr: return_output}
 
 #
 # Topology operations