From 72f607c986b0b3e1c9905dfb42ab85409a33195c Mon Sep 17 00:00:00 2001 From: "guillaume.lambert" Date: Fri, 4 Sep 2020 11:32:21 +0200 Subject: [PATCH] fix few bugs and unused issues in functional tests pointed out by pylint JIRA: TRNSPRTPCE-320 Signed-off-by: guillaume.lambert Change-Id: I37d95d2df919fd020fecf2750452442fb482ffb7 (cherry picked from commit 389574d637e154f75abb5244f50e0130b08e177c) --- .../transportpce_tests/1.2.1/test_end2end.py | 1 - tests/transportpce_tests/1.2.1/test_gnpy.py | 8 ------- tests/transportpce_tests/1.2.1/test_olm.py | 1 - tests/transportpce_tests/1.2.1/test_pce.py | 1 - .../test_renderer_service_path_nominal.py | 1 - .../1.2.1/test_topoPortMapping.py | 9 ++------ .../transportpce_tests/1.2.1/test_topology.py | 5 +---- .../transportpce_tests/2.2.1/test_end2end.py | 1 - tests/transportpce_tests/2.2.1/test_olm.py | 1 - .../2.2.1/test_otn_renderer.py | 21 +++++++++---------- .../2.2.1/test_otn_topology.py | 2 -- .../test_renderer_service_path_nominal.py | 1 - .../2.2.1/test_topoPortMapping.py | 1 - .../transportpce_tests/2.2.1/test_topology.py | 5 +---- 14 files changed, 14 insertions(+), 44 deletions(-) diff --git a/tests/transportpce_tests/1.2.1/test_end2end.py b/tests/transportpce_tests/1.2.1/test_end2end.py index 7854f06fc..5266a6095 100644 --- a/tests/transportpce_tests/1.2.1/test_end2end.py +++ b/tests/transportpce_tests/1.2.1/test_end2end.py @@ -11,7 +11,6 @@ # pylint: disable=no-member # pylint: disable=too-many-public-methods -import json import time import unittest diff --git a/tests/transportpce_tests/1.2.1/test_gnpy.py b/tests/transportpce_tests/1.2.1/test_gnpy.py index de8e19f2a..da5040523 100644 --- a/tests/transportpce_tests/1.2.1/test_gnpy.py +++ b/tests/transportpce_tests/1.2.1/test_gnpy.py @@ -13,7 +13,6 @@ # pylint: disable=too-many-public-methods import unittest -import json import os import sys import time @@ -23,13 +22,6 @@ from common import test_utils class TransportGNPYtesting(unittest.TestCase): - @classmethod - def __init_logfile(cls): - GNPY_LOGFILE = os.path.join(os.path.dirname(os.path.realpath(__file__)), - "..", "..", "transportpce_tests", "gnpy.log") - if os.path.isfile(GNPY_LOFGILE): - os.remove(GNPY_LOFGILE) - topo_cllinet_data = None topo_ordnet_data = None topo_ordtopo_data = None diff --git a/tests/transportpce_tests/1.2.1/test_olm.py b/tests/transportpce_tests/1.2.1/test_olm.py index 3315a049e..0d4aca507 100644 --- a/tests/transportpce_tests/1.2.1/test_olm.py +++ b/tests/transportpce_tests/1.2.1/test_olm.py @@ -14,7 +14,6 @@ import unittest import time -import json import requests from common import test_utils diff --git a/tests/transportpce_tests/1.2.1/test_pce.py b/tests/transportpce_tests/1.2.1/test_pce.py index 4b4443bed..58d4a6cc8 100644 --- a/tests/transportpce_tests/1.2.1/test_pce.py +++ b/tests/transportpce_tests/1.2.1/test_pce.py @@ -12,7 +12,6 @@ # pylint: disable=too-many-public-methods import unittest -import json import os import sys import time diff --git a/tests/transportpce_tests/1.2.1/test_renderer_service_path_nominal.py b/tests/transportpce_tests/1.2.1/test_renderer_service_path_nominal.py index 33b0f3cec..fd420db7a 100644 --- a/tests/transportpce_tests/1.2.1/test_renderer_service_path_nominal.py +++ b/tests/transportpce_tests/1.2.1/test_renderer_service_path_nominal.py @@ -13,7 +13,6 @@ # pylint: disable=too-many-public-methods import unittest -import json import time import requests from common import test_utils diff --git a/tests/transportpce_tests/1.2.1/test_topoPortMapping.py b/tests/transportpce_tests/1.2.1/test_topoPortMapping.py index f1a460103..48b501fa7 100644 --- a/tests/transportpce_tests/1.2.1/test_topoPortMapping.py +++ b/tests/transportpce_tests/1.2.1/test_topoPortMapping.py @@ -46,20 +46,15 @@ class TransportPCEtesting(unittest.TestCase): 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] - responseMapList = test_utils.portmapping_request(nodeMapId) - 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)): - responseMap = test_utils.portmapping_request(nodeMapId+"/mapping/"+tpId) + test_utils.portmapping_request(nodeMapId+"/mapping/"+tpId) # Disconnect the ROADMA def test_03_disconnect_rdm(self): diff --git a/tests/transportpce_tests/1.2.1/test_topology.py b/tests/transportpce_tests/1.2.1/test_topology.py index 87423ca6e..c30bb7992 100644 --- a/tests/transportpce_tests/1.2.1/test_topology.py +++ b/tests/transportpce_tests/1.2.1/test_topology.py @@ -12,7 +12,6 @@ # pylint: disable=no-member # pylint: disable=too-many-public-methods -import json import time import unittest import requests @@ -472,7 +471,6 @@ class TransportPCETopologyTesting(unittest.TestCase): R2RLink = ['ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX', 'ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX'] for i in range(0, nbLink): - nodeType = res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'] link_id = res['network'][0]['ietf-network-topology:link'][i]['link-id'] if(link_id in R2RLink): find = False @@ -733,7 +731,6 @@ class TransportPCETopologyTesting(unittest.TestCase): 'ROADMB01-DEG1-DEG1-TTP-TXRXtoROADMA01-DEG2-DEG2-TTP-TXRX', 'ROADMB01-DEG2-DEG2-TTP-TXRXtoROADMC01-DEG1-DEG1-TTP-TXRX'] for i in range(0, nbLink): - nodeType = res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'] link_id = res['network'][0]['ietf-network-topology:link'][i]['link-id'] if(link_id in R2RLink): find = False @@ -858,7 +855,7 @@ class TransportPCETopologyTesting(unittest.TestCase): nbNode = len(res['network'][0]['node']) self.assertEqual(nbNode, 1) for i in range(0, nbNode-1): - self.assertNotEqual(res['network'][0]['node'][1]['org-openroadm-clli-network:clli'], 'NodeC') + self.assertNotEqual(res['network'][0]['node'][i]['org-openroadm-clli-network:clli'], 'NodeC') def test_35_disconnect_XPDRA(self): response = test_utils.unmount_device("XPDRA01") diff --git a/tests/transportpce_tests/2.2.1/test_end2end.py b/tests/transportpce_tests/2.2.1/test_end2end.py index e45603b68..99a50a287 100644 --- a/tests/transportpce_tests/2.2.1/test_end2end.py +++ b/tests/transportpce_tests/2.2.1/test_end2end.py @@ -12,7 +12,6 @@ # pylint: disable=too-many-public-methods import unittest -import json import time import requests from common import test_utils diff --git a/tests/transportpce_tests/2.2.1/test_olm.py b/tests/transportpce_tests/2.2.1/test_olm.py index a09a1e65f..f7b331ccc 100644 --- a/tests/transportpce_tests/2.2.1/test_olm.py +++ b/tests/transportpce_tests/2.2.1/test_olm.py @@ -14,7 +14,6 @@ import unittest import time -import json import requests from common import test_utils diff --git a/tests/transportpce_tests/2.2.1/test_otn_renderer.py b/tests/transportpce_tests/2.2.1/test_otn_renderer.py index f4ec82795..4646fb1fd 100644 --- a/tests/transportpce_tests/2.2.1/test_otn_renderer.py +++ b/tests/transportpce_tests/2.2.1/test_otn_renderer.py @@ -13,7 +13,6 @@ # pylint: disable=too-many-public-methods import unittest -import json import time import requests from common import test_utils @@ -52,16 +51,16 @@ class TransportPCEtesting(unittest.TestCase): def test_02_get_portmapping_CLIENT4(self): response = test_utils.portmapping_request("SPDR-SA1/mapping/XPDR1-CLIENT4") self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertEqual('CP1-SFP4-P1', res['mapping'][0]['supporting-port']) - self.assertEqual('CP1-SFP4', res['mapping'][0]['supporting-circuit-pack-name']) - self.assertEqual('XPDR1-CLIENT4', res['mapping'][0]['logical-connection-point']) - self.assertEqual('bidirectional', res['mapping'][0]['port-direction']) - self.assertEqual('xpdr-client', res['mapping'][0]['port-qual']) - self.assertEqual('FqlcrxV7p3g=', res['mapping'][0]['lcp-hash-val']) - self.assertIn('org-openroadm-port-types:if-10GE-ODU2e', res['mapping'][0]['supported-interface-capability']) - self.assertIn('org-openroadm-port-types:if-10GE-ODU2', res['mapping'][0]['supported-interface-capability']) - self.assertIn('org-openroadm-port-types:if-10GE', res['mapping'][0]['supported-interface-capability']) + res_mapping = (response.json())['mapping'][0] + self.assertEqual('CP1-SFP4-P1', res_mapping['supporting-port']) + self.assertEqual('CP1-SFP4', res_mapping['supporting-circuit-pack-name']) + self.assertEqual('XPDR1-CLIENT4', res_mapping['logical-connection-point']) + self.assertEqual('bidirectional', res_mapping['port-direction']) + self.assertEqual('xpdr-client', res_mapping['port-qual']) + self.assertEqual('FqlcrxV7p3g=', res_mapping['lcp-hash-val']) + self.assertIn('org-openroadm-port-types:if-10GE-ODU2e', res_mapping['supported-interface-capability']) + self.assertIn('org-openroadm-port-types:if-10GE-ODU2', res_mapping['supported-interface-capability']) + self.assertIn('org-openroadm-port-types:if-10GE', res_mapping['supported-interface-capability']) def test_03_get_portmapping_NETWORK1(self): response = test_utils.portmapping_request("SPDR-SA1/mapping/XPDR1-NETWORK1") diff --git a/tests/transportpce_tests/2.2.1/test_otn_topology.py b/tests/transportpce_tests/2.2.1/test_otn_topology.py index e4f5c8d68..4dd6ab7b2 100644 --- a/tests/transportpce_tests/2.2.1/test_otn_topology.py +++ b/tests/transportpce_tests/2.2.1/test_otn_topology.py @@ -100,7 +100,6 @@ class TransportPCEtesting(unittest.TestCase): network = 0 for j in range(0, nbTps): tpType = res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j]['org-openroadm-common-network:tp-type'] - tpId = res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j]['tp-id'] if (tpType == 'XPONDER-CLIENT'): client += 1 elif (tpType == 'XPONDER-NETWORK'): @@ -119,7 +118,6 @@ class TransportPCEtesting(unittest.TestCase): network = 0 for j in range(0, nbTps): tpType = res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j]['org-openroadm-common-network:tp-type'] - tpId = res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j]['tp-id'] if (tpType == 'XPONDER-CLIENT'): client += 1 elif (tpType == 'XPONDER-NETWORK'): diff --git a/tests/transportpce_tests/2.2.1/test_renderer_service_path_nominal.py b/tests/transportpce_tests/2.2.1/test_renderer_service_path_nominal.py index e59de8c8d..f3c47d0a1 100644 --- a/tests/transportpce_tests/2.2.1/test_renderer_service_path_nominal.py +++ b/tests/transportpce_tests/2.2.1/test_renderer_service_path_nominal.py @@ -13,7 +13,6 @@ # pylint: disable=too-many-public-methods import unittest -import json #from unittest.result import failfast import requests from common import test_utils diff --git a/tests/transportpce_tests/2.2.1/test_topoPortMapping.py b/tests/transportpce_tests/2.2.1/test_topoPortMapping.py index 14e258d55..f92aefdb8 100644 --- a/tests/transportpce_tests/2.2.1/test_topoPortMapping.py +++ b/tests/transportpce_tests/2.2.1/test_topoPortMapping.py @@ -13,7 +13,6 @@ # pylint: disable=too-many-public-methods import unittest -import json import time import requests from common import test_utils diff --git a/tests/transportpce_tests/2.2.1/test_topology.py b/tests/transportpce_tests/2.2.1/test_topology.py index 0d3bb206b..8fa74bfc6 100644 --- a/tests/transportpce_tests/2.2.1/test_topology.py +++ b/tests/transportpce_tests/2.2.1/test_topology.py @@ -14,7 +14,6 @@ import unittest import time -import json import logging import requests from common import test_utils @@ -478,7 +477,6 @@ class TransportPCEtesting(unittest.TestCase): R2RLink = ['ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX', 'ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX'] for i in range(0, nbLink): - nodeType = res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'] link_id = res['network'][0]['ietf-network-topology:link'][i]['link-id'] if(link_id in R2RLink): find = False @@ -745,7 +743,6 @@ class TransportPCEtesting(unittest.TestCase): 'ROADM-B1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG1-DEG1-TTP-TXRX', 'ROADM-B1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG2-DEG2-TTP-TXRX'] for i in range(0, nbLink): - nodeType = res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'] link_id = res['network'][0]['ietf-network-topology:link'][i]['link-id'] if(link_id in R2RLink): find = False @@ -925,7 +922,7 @@ class TransportPCEtesting(unittest.TestCase): nbNode = len(res['network'][0]['node']) self.assertEqual(nbNode, 1) for i in range(0, nbNode-1): - self.assertNotEqual(res['network'][0]['node'][1]['org-openroadm-clli-network:clli'], 'NodeC') + self.assertNotEqual(res['network'][0]['node'][i]['org-openroadm-clli-network:clli'], 'NodeC') def test_35_disconnect_XPDRA(self): response = test_utils.unmount_device("XPDR-A1") -- 2.36.6