Update transportpce-topology enums

[transportpce.git] / tests / transportpce_tests / 1.2.1 / test02_topo_portmapping.py

diff --git a/tests/transportpce_tests/1.2.1/test02_topo_portmapping.py b/tests/transportpce_tests/1.2.1/test02_topo_portmapping.py
index f8ebc2b2f3d3bd4fa39c40ef938a6f4b5ac972eb..653ae84555ea42df5b59d77c6e953a74b3278a5c 100644 (file)
--- a/tests/transportpce_tests/1.2.1/test02_topo_portmapping.py
+++ b/tests/transportpce_tests/1.2.1/test02_topo_portmapping.py
@@ -52,15 +52,15 @@ class TransportPCEtesting(unittest.TestCase):
 
     # Verify the termination points of the ROADMA
     def test_02_compare_Openroadm_topology_portmapping_rdm(self):
-        responseTopo = test_utils_rfc8040.get_request(test_utils_rfc8040.URL_CONFIG_ORDM_TOPO)
-        resTopo = responseTopo.json()
-        for val in resTopo['ietf-network:network'][0]['node']:
-            nodeId = val['node-id']
+        resTopo = test_utils_rfc8040.get_ietf_network_request('openroadm-topology', 'config')
+        self.assertEqual(resTopo['status_code'], requests.codes.ok)
+        for node in resTopo['network'][0]['node']:
+            nodeId = node['node-id']
             nodeMapId = nodeId.split("-")[0]
             response = test_utils_rfc8040.get_portmapping_node_info(nodeMapId)
             self.assertEqual(response['status_code'], requests.codes.ok)
-            for val2 in val['ietf-network-topology:termination-point']:
-                tpId = val2['tp-id']
+            for tp in node['ietf-network-topology:termination-point']:
+                tpId = tp['tp-id']
                 if (not "CP" in tpId) and (not "CTP" in tpId):
                     response2 = test_utils_rfc8040.portmapping_request(nodeMapId, tpId)
                     self.assertEqual(response2['status_code'], requests.codes.ok)