rationalize service deletion in E2E functests

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

diff --git a/tests/transportpce_tests/1.2.1/test_topoPortMapping.py b/tests/transportpce_tests/1.2.1/test_topoPortMapping.py
index 576999ac48c64ee797c7339c7ed7f0198bb66eb1..1c3ef934c80864f6871d966a06fa00bc759d6b81 100644 (file)
--- a/tests/transportpce_tests/1.2.1/test_topoPortMapping.py
+++ b/tests/transportpce_tests/1.2.1/test_topoPortMapping.py
@@ -40,8 +40,7 @@ class TransportPCEtesting(unittest.TestCase):
 
     # Verify the termination points of the ROADMA
     def test_02_compareOpenroadmTopologyPortMapping_rdm(self):
-        urlTopo = "{}/config/ietf-network:networks/network/openroadm-topology"
-        responseTopo = test_utils.get_request(urlTopo)
+        responseTopo = test_utils.get_ordm_topo_request("")
         resTopo = responseTopo.json()
         nbNode = len(resTopo['network'][0]['node'])
         nbMapCumul = 0
@@ -49,8 +48,7 @@ class TransportPCEtesting(unittest.TestCase):
         for i in range(0, nbNode):
             nodeId = resTopo['network'][0]['node'][i]['node-id']
             nodeMapId = nodeId.split("-")[0]
-            urlMapList = "{}/config/transportpce-portmapping:network/nodes/" + nodeMapId
-            responseMapList = test_utils.get_request(urlMapList)
+            responseMapList = test_utils.portmapping_request(nodeMapId)
             resMapList = responseMapList.json()
             nbMappings = len(resMapList['nodes'][0]['mapping']) - nbMapCumul
             nbTp = len(resTopo['network'][0]['node'][i]['ietf-network-topology:termination-point'])
@@ -58,8 +56,7 @@ class TransportPCEtesting(unittest.TestCase):
             for j in range(0, nbTp):
                 tpId = resTopo['network'][0]['node'][i]['ietf-network-topology:termination-point'][j]['tp-id']
                 if((not "CP" in tpId) and (not "CTP" in tpId)):
-                    urlMap = "{}/config/transportpce-portmapping:network/nodes/" + nodeMapId + "/mapping/" + tpId
-                    responseMap = test_utils.get_request(urlMap)
+                    responseMap = test_utils.portmapping_request(nodeMapId+"/mapping/"+tpId)
 
     # Disconnect the ROADMA
     def test_03_disconnect_rdm(self):