Merge changes I082f82ac,I951224b0,Icecd1b21,Ifafa74b6,I9b384c72, ...

[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 9cfad63eb3863c227c79ea78e53d196cb9fdf4a9..d409cfa600a76e3e98be80d21d4819c797faf71c 100644 (file)
--- a/tests/transportpce_tests/1.2.1/test02_topo_portmapping.py
+++ b/tests/transportpce_tests/1.2.1/test02_topo_portmapping.py
@@ -12,13 +12,15 @@
 # pylint: disable=no-member
 # pylint: disable=too-many-public-methods
 # a pylint false positive due to unittest
-# pylint: disable=no-self-use
 
 import time
 import unittest
 import requests
+# pylint: disable=wrong-import-order
 import sys
 sys.path.append('transportpce_tests/common/')
+# pylint: disable=wrong-import-position
+# pylint: disable=import-error
 import test_utils  # nopep8
 
 
@@ -40,7 +42,7 @@ class TransportPCEtesting(unittest.TestCase):
         print("all processes killed")
 
     def setUp(self):
-        time.sleep(10)
+        time.sleep(2)
 
     # Connect the ROADMA
     def test_01_connect_rdm(self):
@@ -49,23 +51,23 @@ class TransportPCEtesting(unittest.TestCase):
 
     # Verify the termination points of the ROADMA
     def test_02_compare_Openroadm_topology_portmapping_rdm(self):
-        responseTopo = test_utils.get_ordm_topo_request("")
-        resTopo = responseTopo.json()
-        nbNode = len(resTopo['network'][0]['node'])
-        for i in range(0, nbNode):
-            nodeId = resTopo['network'][0]['node'][i]['node-id']
+        resTopo = test_utils.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]
-            test_utils.portmapping_request(nodeMapId)
-            nbTp = len(resTopo['network'][0]['node'][i]['ietf-network-topology:termination-point'])
-            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)):
-                    test_utils.portmapping_request(nodeMapId+"/mapping/"+tpId)
+            response = test_utils.get_portmapping_node_attr(nodeMapId, "node-info", None)
+            self.assertEqual(response['status_code'], requests.codes.ok)
+            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.get_portmapping_node_attr(nodeMapId, "mapping", tpId)
+                    self.assertEqual(response2['status_code'], requests.codes.ok)
 
     # Disconnect the ROADMA
     def test_03_disconnect_rdm(self):
         response = test_utils.unmount_device("ROADMA01")
-        self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200)
+        self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
 
 #     #Connect the XPDRA
     def test_04_connect_xpdr(self):
@@ -79,7 +81,7 @@ class TransportPCEtesting(unittest.TestCase):
     # Disconnect the XPDRA
     def test_06_disconnect_device(self):
         response = test_utils.unmount_device("XPDRA01")
-        self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200)
+        self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
 
 
 if __name__ == "__main__":