fix some pylint issues

[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 369cea38ff8562041c04d37c2641f154e71c9b1e..683b04a48649fa5e491d09d3b21f8c05b8a20f41 100644 (file)
--- a/tests/transportpce_tests/1.2.1/test_topoPortMapping.py
+++ b/tests/transportpce_tests/1.2.1/test_topoPortMapping.py
@@ -9,12 +9,14 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-import json
-import signal
+# 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
-import psutil
 from common import test_utils
 
 
@@ -29,6 +31,7 @@ class TransportPCEtesting(unittest.TestCase):
 
     @classmethod
     def tearDownClass(cls):
+        # pylint: disable=not-an-iterable
         for process in cls.processes:
             test_utils.shutdown_process(process)
         print("all processes killed")
@@ -42,40 +45,19 @@ class TransportPCEtesting(unittest.TestCase):
         self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201)
 
     # Verify the termination points of the ROADMA
-    def test_02_compareOpenroadmTopologyPortMapping_rdm(self):
-        urlTopo = ("{}/config/ietf-network:networks/network/openroadm-topology"
-                   .format(test_utils.RESTCONF_BASE_URL))
-        responseTopo = requests.request("GET", urlTopo, headers=test_utils.TYPE_APPLICATION_JSON,
-                                        auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD))
+    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'])
-        nbMapCumul = 0
-        nbMappings = 0
         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
-            urlMapListFull = urlMapList.format(test_utils.RESTCONF_BASE_URL)
-            responseMapList = requests.request("GET", urlMapListFull, headers=test_utils.TYPE_APPLICATION_JSON,
-                                               auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD))
-            resMapList = responseMapList.json()
-
-            nbMappings = len(resMapList['nodes'][0]['mapping']) - nbMapCumul
+            test_utils.portmapping_request(nodeMapId)
             nbTp = len(resTopo['network'][0]['node'][i]['ietf-network-topology:termination-point'])
-            nbMapCurrent = 0
             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
-                    urlMapFull = urlMap.format(test_utils.RESTCONF_BASE_URL)
-                    responseMap = requests.request("GET", urlMapFull, headers=test_utils.TYPE_APPLICATION_JSON,
-                                                   auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD))
-                    self.assertEqual(responseMap.status_code, requests.codes.ok)
-                    if responseMap.status_code == requests.codes.ok:
-                        nbMapCurrent += 1
-            nbMapCumul += nbMapCurrent
-        nbMappings -= nbMapCurrent
-        self.assertEqual(nbMappings, 0)
+                    test_utils.portmapping_request(nodeMapId+"/mapping/"+tpId)
 
     # Disconnect the ROADMA
     def test_03_disconnect_rdm(self):
@@ -88,8 +70,8 @@ class TransportPCEtesting(unittest.TestCase):
         self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201)
 
 #     #Verify the termination points related to XPDR
-    def test_05_compareOpenroadmTopologyPortMapping_xpdr(self):
-        self.test_02_compareOpenroadmTopologyPortMapping_rdm()
+    def test_05_compare_Openroadm_topology_portmapping_xpdr(self):
+        self.test_02_compare_Openroadm_topology_portmapping_rdm()
 
     # Disconnect the XPDRA
     def test_06_disconnect_device(self):