From ee7ab2eebe53b3360b2bbd9648afc3c1523bc1d5 Mon Sep 17 00:00:00 2001 From: "guillaume.lambert" Date: Thu, 10 Sep 2020 11:42:53 +0200 Subject: [PATCH 1/1] remove dead code from topology221 test JIRA: TRNSPRTPCE-320 Signed-off-by: guillaume.lambert Change-Id: I3657ce7a6af97b8043577c38cd579df352d32718 (cherry picked from commit f3259f5e419dea1bd0f295201c5c044ed1a6c951) --- .../transportpce_tests/2.2.1/test_topology.py | 65 ------------------- 1 file changed, 65 deletions(-) diff --git a/tests/transportpce_tests/2.2.1/test_topology.py b/tests/transportpce_tests/2.2.1/test_topology.py index 936ccfc5d..6c755aaa9 100644 --- a/tests/transportpce_tests/2.2.1/test_topology.py +++ b/tests/transportpce_tests/2.2.1/test_topology.py @@ -803,71 +803,6 @@ class TransportPCEtesting(unittest.TestCase): response = test_utils.del_node_request("NodeC") self.assertEqual(response.status_code, requests.codes.ok) -# def test_24_check_roadm2roadm_links_deletion(self): -# response = test_utils.get_ordm_topo_request("") -# self.assertEqual(response.status_code, requests.codes.ok) -# res = response.json() -# #Write the response in the log -# with open('./transportpce_tests/log/response.log', 'a') as outfile1: -# outfile1.write(str(res)) -# #Tests related to links -# nbLink=len(res['network'][0]['ietf-network-topology:link']) -# self.assertEqual(nbLink,8) -# expressLink=['ROADMA-DEG2-DEG2-CTP-TXRXtoROADMA-DEG1-DEG1-CTP-TXRX', -# 'ROADMA-DEG1-DEG1-CTP-TXRXtoROADMA-DEG2-DEG2-CTP-TXRX'] -# addLink=['ROADMA-SRG1-SRG1-CP-TXRXtoROADMA-DEG2-DEG2-CTP-TXRX', -# 'ROADMA-SRG1-SRG1-CP-TXRXtoROADMA-DEG1-DEG1-CTP-TXRX',] -# dropLink=['ROADMA-DEG1-DEG1-CTP-TXRXtoROADMA-SRG1-SRG1-CP-TXRX', -# 'ROADMA-DEG2-DEG2-CTP-TXRXtoROADMA-SRG1-SRG1-CP-TXRX'] -# XPDR_IN=['ROADMA-SRG1-SRG1-PP1-TXRXtoXPDRA-XPDR1-XPDR1-NETWORK1'] -# XPDR_OUT=['XPDRA-XPDR1-XPDR1-NETWORK1toROADMA-SRG1-SRG1-PP1-TXRX'] -# for i in range(0,nbLink): -# nodeType=res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'] -# linkId=res['network'][0]['ietf-network-topology:link'][i]['link-id'] -# if(nodeType=='EXPRESS-LINK'): -# find= linkId in expressLink -# self.assertEqual(find, True) -# expressLink.remove(linkId) -# elif(nodeType=='ADD-LINK'): -# find= linkId in addLink -# self.assertEqual(find, True) -# addLink.remove(linkId) -# elif(nodeType=='DROP-LINK'): -# find= linkId in dropLink -# self.assertEqual(find, True) -# dropLink.remove(linkId) -# elif(nodeType=='XPONDER-INPUT'): -# find= linkId in XPDR_IN -# self.assertEqual(find, True) -# XPDR_IN.remove(linkId) -# elif(nodeType=='XPONDER-OUTPUT'): -# find= linkId in XPDR_OUT -# self.assertEqual(find, True) -# XPDR_OUT.remove(linkId) -# else: -# self.assertFalse(True) -# self.assertEqual(len(expressLink),0) -# self.assertEqual(len(addLink),0) -# self.assertEqual(len(dropLink),0) -# self.assertEqual(len(XPDR_IN),0) -# self.assertEqual(len(XPDR_OUT),0) -# -# for i in range(0,nbLink): -# self.assertNotEqual((res['network'][0]['ietf-network-topology:link'][i] -# ['org-openroadm-common-network:link-type']),'ROADM-TO-ROADM') -# self.assertNotEqual(res['network'][0]['ietf-network-topology:link'][i]['link-id'], -# 'ROADMC-SRG1-SRG1-CP-TXRXtoROADMC-DEG1-DEG1-CTP-TXRX') -# self.assertNotEqual(res['network'][0]['ietf-network-topology:link'][i]['link-id'], -# 'ROADMC-DEG1-DEG1-CTP-TXRXtoROADMC-SRG1-SRG1-CP-TXRX') -# self.assertNotEqual(res['network'][0]['ietf-network-topology:link'][i]['link-id'], -# 'ROADMC-SRG1-SRG1-CP-TXRXtoROADMC-DEG2-DEG1-CTP-TXRX') -# self.assertNotEqual(res['network'][0]['ietf-network-topology:link'][i]['link-id'], -# 'ROADMC-DEG1-DEG2-CTP-TXRXtoROADMC-SRG1-SRG1-CP-TXRX') -# self.assertNotEqual(res['network'][0]['ietf-network-topology:link'][i]['link-id'], -# 'ROADMC-DEG1-DEG1-CTP-TXRXtoROADMC-DEG2-DEG2-CTP-TXRX') -# self.assertNotEqual(res['network'][0]['ietf-network-topology:link'][i]['link-id'], -# 'ROADMC-DEG2-DEG2-CTP-TXRXtoROADMC-DEG1-DEG1-CTP-TXRX') - def test_32_getNodes_OpenRoadmTopology(self): # pylint: disable=redundant-unittest-assert response = test_utils.get_ordm_topo_request("") -- 2.36.6