X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Ftransportpce_tests%2F1.2.1%2Ftest02_topo_portmapping.py;h=d409cfa600a76e3e98be80d21d4819c797faf71c;hb=b3d4257ba36696849b4391f39c4ae904407a72e1;hp=b975fdca95f07e3ee719d606fd5c5df8b22d1546;hpb=2665436ed0ebfd207e55264f87b9c40fcb1db75c;p=transportpce.git

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 b975fdca9..d409cfa60 100644
--- a/tests/transportpce_tests/1.2.1/test02_topo_portmapping.py
+++ b/tests/transportpce_tests/1.2.1/test02_topo_portmapping.py
@@ -12,7 +12,6 @@
 # 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
@@ -22,7 +21,7 @@ import sys
 sys.path.append('transportpce_tests/common/')
 # pylint: disable=wrong-import-position
 # pylint: disable=import-error
-import test_utils_rfc8040  # nopep8
+import test_utils  # nopep8
 
 
 class TransportPCEtesting(unittest.TestCase):
@@ -32,48 +31,48 @@ class TransportPCEtesting(unittest.TestCase):
 
     @classmethod
     def setUpClass(cls):
-        cls.processes = test_utils_rfc8040.start_tpce()
-        cls.processes = test_utils_rfc8040.start_sims([('xpdra', cls.NODE_VERSION), ('roadma', cls.NODE_VERSION)])
+        cls.processes = test_utils.start_tpce()
+        cls.processes = test_utils.start_sims([('xpdra', cls.NODE_VERSION), ('roadma', cls.NODE_VERSION)])
 
     @classmethod
     def tearDownClass(cls):
         # pylint: disable=not-an-iterable
         for process in cls.processes:
-            test_utils_rfc8040.shutdown_process(process)
+            test_utils.shutdown_process(process)
         print("all processes killed")
 
     def setUp(self):
-        time.sleep(10)
+        time.sleep(2)
 
     # Connect the ROADMA
     def test_01_connect_rdm(self):
-        response = test_utils_rfc8040.mount_device("ROADMA01", ('roadma', self.NODE_VERSION))
-        self.assertEqual(response.status_code, requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
+        response = test_utils.mount_device("ROADMA01", ('roadma', self.NODE_VERSION))
+        self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201)
 
     # Verify the termination points of the ROADMA
     def test_02_compare_Openroadm_topology_portmapping_rdm(self):
-        resTopo = test_utils_rfc8040.get_ietf_network_request('openroadm-topology', 'config')
+        resTopo = test_utils.get_ietf_network_request('openroadm-topology', 'config')
         self.assertEqual(resTopo['status_code'], requests.codes.ok)
-        for val in resTopo['network'][0]['node']:
-            nodeId = val['node-id']
+        for node in resTopo['network'][0]['node']:
+            nodeId = node['node-id']
             nodeMapId = nodeId.split("-")[0]
-            response = test_utils_rfc8040.get_portmapping_node_info(nodeMapId)
+            response = test_utils.get_portmapping_node_attr(nodeMapId, "node-info", None)
             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)
+                    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_rfc8040.unmount_device("ROADMA01")
+        response = test_utils.unmount_device("ROADMA01")
         self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
 
 #     #Connect the XPDRA
     def test_04_connect_xpdr(self):
-        response = test_utils_rfc8040.mount_device("XPDRA01", ('xpdra', self.NODE_VERSION))
-        self.assertEqual(response.status_code, requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
+        response = test_utils.mount_device("XPDRA01", ('xpdra', self.NODE_VERSION))
+        self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201)
 
 #     #Verify the termination points related to XPDR
     def test_05_compare_Openroadm_topology_portmapping_xpdr(self):
@@ -81,7 +80,7 @@ class TransportPCEtesting(unittest.TestCase):
 
     # Disconnect the XPDRA
     def test_06_disconnect_device(self):
-        response = test_utils_rfc8040.unmount_device("XPDRA01")
+        response = test_utils.unmount_device("XPDRA01")
         self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))