From 499175ffee7afcfcbd16a51e897b81420dc023a4 Mon Sep 17 00:00:00 2001 From: "guillaume.lambert" Date: Fri, 4 Sep 2020 15:13:33 +0200 Subject: [PATCH] fix functional tests linelength pylint issues JIRA: TRNSPRTPCE-320 Signed-off-by: guillaume.lambert Change-Id: I4850052ec973fc799e956e1e4c5e817e8def4360 (cherry picked from commit 82ae34c05bd194c26ef4e30b2bdf1cf19093e19b) --- tests/transportpce_tests/1.2.1/test_gnpy.py | 9 +- tests/transportpce_tests/1.2.1/test_pce.py | 39 ++++-- .../test_renderer_service_path_nominal.py | 30 ++-- .../transportpce_tests/1.2.1/test_topology.py | 111 ++++++++++----- .../2.2.1/test_otn_renderer.py | 6 +- .../2.2.1/test_otn_topology.py | 90 +++++++----- .../test_renderer_service_path_nominal.py | 12 +- .../transportpce_tests/2.2.1/test_topology.py | 130 ++++++++++++------ tests/transportpce_tests/common/test_utils.py | 3 +- 9 files changed, 280 insertions(+), 150 deletions(-) diff --git a/tests/transportpce_tests/1.2.1/test_gnpy.py b/tests/transportpce_tests/1.2.1/test_gnpy.py index da5040523..0a77c0ff9 100644 --- a/tests/transportpce_tests/1.2.1/test_gnpy.py +++ b/tests/transportpce_tests/1.2.1/test_gnpy.py @@ -119,7 +119,8 @@ class TransportGNPYtesting(unittest.TestCase): {"include_": {"ordered-hops": [ {"hop-number": "0", "hop-type": {"node-id": "OpenROADM-2"}}, {"hop-number": "1", "hop-type": {"node-id": "OpenROADM-3"}}, - {"hop-number": "2", "hop-type": {"node-id": "OpenROADM-4"}}]}}) + {"hop-number": "2", "hop-type": {"node-id": "OpenROADM-4"}}]} + }) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual(res['output']['configuration-response-common'][ @@ -146,7 +147,8 @@ class TransportGNPYtesting(unittest.TestCase): "service-format": "Ethernet", "clli": "Node5"}, {"include_": {"ordered-hops": [ {"hop-number": "0", "hop-type": {"node-id": "OpenROADM-2"}}, - {"hop-number": "1", "hop-type": {"node-id": "OpenROADM-3"}}]}}) + {"hop-number": "1", "hop-type": {"node-id": "OpenROADM-3"}}]} + }) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual(res['output']['configuration-response-common'][ @@ -173,7 +175,8 @@ class TransportGNPYtesting(unittest.TestCase): {"hop-number": "0", "hop-type": {"node-id": "OpenROADM-2"}}, {"hop-number": "1", "hop-type": {"node-id": "OpenROADM-3"}}, {"hop-number": "2", "hop-type": {"node-id": "OpenROADM-4"}}, - {"hop-number": "3", "hop-type": {"node-id": "OpenROADM-3"}}]}}) + {"hop-number": "3", "hop-type": {"node-id": "OpenROADM-3"}}]} + }) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual(res['output']['configuration-response-common'][ diff --git a/tests/transportpce_tests/1.2.1/test_pce.py b/tests/transportpce_tests/1.2.1/test_pce.py index 58d4a6cc8..4b8d6b2ca 100644 --- a/tests/transportpce_tests/1.2.1/test_pce.py +++ b/tests/transportpce_tests/1.2.1/test_pce.py @@ -100,7 +100,8 @@ class TransportPCEtesting(unittest.TestCase): response = test_utils.path_computation_request("request-1", "service-1", {"node-id": "XPDRA01", "service-rate": "100", "service-format": "Ethernet", "clli": "nodeA"}, - {"node-id": "XPDRC01", "service-rate": "100", "service-format": "Ethernet", "clli": "nodeC"}) + {"node-id": "XPDRC01", "service-rate": "100", + "service-format": "Ethernet", "clli": "nodeC"}) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Path is calculated', @@ -112,7 +113,8 @@ class TransportPCEtesting(unittest.TestCase): response = test_utils.path_computation_request("request-1", "service-1", {"node-id": "ROADMA01", "service-rate": "100", "service-format": "Ethernet", "clli": "NodeA"}, - {"node-id": "ROADMC01", "service-rate": "100", "service-format": "Ethernet", "clli": "NodeC"}) + {"node-id": "ROADMC01", "service-rate": "100", + "service-format": "Ethernet", "clli": "NodeC"}) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Path is calculated', @@ -162,7 +164,8 @@ class TransportPCEtesting(unittest.TestCase): response = test_utils.path_computation_request("request-1", "service-1", {"node-id": "XPONDER-1-2", "service-rate": "100", "service-format": "Ethernet", "clli": "ORANGE1"}, - {"node-id": "XPONDER-3-2", "service-rate": "100", "service-format": "Ethernet", "clli": "ORANGE3"}) + {"node-id": "XPONDER-3-2", "service-rate": "100", + "service-format": "Ethernet", "clli": "ORANGE3"}) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Path is calculated', @@ -174,7 +177,8 @@ class TransportPCEtesting(unittest.TestCase): response = test_utils.path_computation_request("request1", "service1", {"service-rate": "100", "service-format": "Ethernet", "clli": "cll21", "node-id": "OpenROADM-2-1"}, - {"service-rate": "100", "service-format": "Ethernet", "clli": "ncli22", "node-id": "OpenROADM-2-2"}) + {"service-rate": "100", "service-format": "Ethernet", + "clli": "ncli22", "node-id": "OpenROADM-2-2"}) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Path is calculated', @@ -234,7 +238,8 @@ class TransportPCEtesting(unittest.TestCase): # Test1 success path computation def test_18_success1_path_computation(self): response = test_utils.path_computation_request("request1", "service1", - {"service-format": "Ethernet", "service-rate": "100", "clli": "ORANGE2", "node-id": "XPONDER-2-2", + {"service-format": "Ethernet", "service-rate": "100", + "clli": "ORANGE2", "node-id": "XPONDER-2-2", "tx-direction": {"port": { "port-device-name": "Some port-device-name", "port-type": "Some port-type", @@ -253,7 +258,8 @@ class TransportPCEtesting(unittest.TestCase): "port-slot": "Some port-slot", "port-sub-slot": "Some port-sub-slot" }}}, - {"service-format": "Ethernet", "service-rate": "100", "clli": "ORANGE1", "node-id": "XPONDER-1-2", + {"service-format": "Ethernet", "service-rate": "100", + "clli": "ORANGE1", "node-id": "XPONDER-1-2", "tx-direction": {"port": { "port-device-name": "Some port-device-name", "port-type": "Some port-type", @@ -273,9 +279,11 @@ class TransportPCEtesting(unittest.TestCase): "port-sub-slot": "Some port-sub-slot" }}}, {"customer-code": ["Some customer-code"], - "co-routing": {"existing-service": ["Some existing-service"]}}, + "co-routing": {"existing-service": ["Some existing-service"]} + }, {"customer-code": ["Some customer-code"], - "co-routing": {"existing-service": ["Some existing-service"]}}, + "co-routing": {"existing-service": ["Some existing-service"]} + }, "hop-count", {"locally-protected-links": "true"}) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() @@ -288,7 +296,8 @@ class TransportPCEtesting(unittest.TestCase): response = test_utils.path_computation_request("request 1", "service 1", {"service-rate": "100", "service-format": "Ethernet", "node-id": "XPONDER-1-2", "clli": "ORANGE1"}, - {"service-rate": "100", "service-format": "Ethernet", "node-id": "XPONDER-3-2", "clli": "ORANGE3"}) + {"service-rate": "100", "service-format": "Ethernet", + "node-id": "XPONDER-3-2", "clli": "ORANGE3"}) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Path is calculated', @@ -322,7 +331,8 @@ class TransportPCEtesting(unittest.TestCase): response = test_utils.path_computation_request("request 1", "service 1", {"service-rate": "100", "service-format": "Ethernet", "node-id": "XPONDER-2-2", "clli": "ORANGE2"}, - {"service-rate": "100", "service-format": "Ethernet", "node-id": "XPONDER-1-2", "clli": "ORANGE1"}) + {"service-rate": "100", "service-format": "Ethernet", + "node-id": "XPONDER-1-2", "clli": "ORANGE1"}) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Path is calculated', @@ -333,7 +343,8 @@ class TransportPCEtesting(unittest.TestCase): link = {"link-id": "OpenROADM-1-3-DEG2-to-OpenROADM-1-2-DEG2"} find = False for i in range(0, nbElmPath): - resource_i = res['output']['response-parameters']['path-description']['aToZ-direction']['aToZ'][i]['resource'] + resource_i = (res['output']['response-parameters']['path-description']['aToZ-direction']['aToZ'][i] + ['resource']) if(resource_i == link): find = True self.assertEqual(find, True) @@ -350,7 +361,8 @@ class TransportPCEtesting(unittest.TestCase): response = test_utils.path_computation_request("request 1", "service 1", {"service-rate": "100", "service-format": "Ethernet", "node-id": "XPONDER-2-2", "clli": "ORANGE2"}, - {"service-rate": "100", "service-format": "Ethernet", "node-id": "XPONDER-1-2", "clli": "ORANGE1"}) + {"service-rate": "100", "service-format": "Ethernet", + "node-id": "XPONDER-1-2", "clli": "ORANGE1"}) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Path is calculated', @@ -361,7 +373,8 @@ class TransportPCEtesting(unittest.TestCase): link = {"link-id": "OpenROADM-1-3-DEG2-to-OpenROADM-1-2-DEG2"} find = False for i in range(0, nbElmPath): - resource_i = res['output']['response-parameters']['path-description']['aToZ-direction']['aToZ'][i]['resource'] + resource_i = (res['output']['response-parameters']['path-description']['aToZ-direction']['aToZ'][i] + ['resource']) if (resource_i == link): find = True self.assertNotEqual(find, True) 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 fd420db7a..3f7ff41e0 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 @@ -79,9 +79,11 @@ class TransportPCERendererTesting(unittest.TestCase): def test_05_service_path_create(self): response = test_utils.service_path_request("create", "service_test", "7", [{"renderer:node-id": "ROADMA01", - "renderer:src-tp": "SRG1-PP7-TXRX", "renderer:dest-tp": "DEG1-TTP-TXRX"}, + "renderer:src-tp": "SRG1-PP7-TXRX", + "renderer:dest-tp": "DEG1-TTP-TXRX"}, {"renderer:node-id": "XPDRA01", - "renderer:src-tp": "XPDR1-CLIENT1", "renderer:dest-tp": "XPDR1-NETWORK1"}]) + "renderer:src-tp": "XPDR1-CLIENT1", + "renderer:dest-tp": "XPDR1-NETWORK1"}]) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Roadm-connection successfully created for nodes: ROADMA01', res["output"]["result"]) @@ -245,9 +247,11 @@ class TransportPCERendererTesting(unittest.TestCase): def test_14_service_path_delete(self): response = test_utils.service_path_request("delete", "service_test", "7", [{"renderer:node-id": "ROADMA01", - "renderer:src-tp": "SRG1-PP7-TXRX", "renderer:dest-tp": "DEG1-TTP-TXRX"}, + "renderer:src-tp": "SRG1-PP7-TXRX", + "renderer:dest-tp": "DEG1-TTP-TXRX"}, {"renderer:node-id": "XPDRA01", - "renderer:src-tp": "XPDR1-CLIENT1", "renderer:dest-tp": "XPDR1-NETWORK1"}]) + "renderer:src-tp": "XPDR1-CLIENT1", + "renderer:dest-tp": "XPDR1-NETWORK1"}]) self.assertEqual(response.status_code, requests.codes.ok) self.assertEqual(response.json(), { 'output': {'result': 'Request processed', 'success': True}}) @@ -267,7 +271,8 @@ class TransportPCERendererTesting(unittest.TestCase): res = response.json() self.assertIn( {"error-type": "application", "error-tag": "data-missing", - "error-message": "Request could not be completed because the relevant data model content does not exist"}, + "error-message": + "Request could not be completed because the relevant data model content does not exist"}, res['errors']['error']) def test_17_service_path_delete_rdm_check(self): @@ -276,7 +281,8 @@ class TransportPCERendererTesting(unittest.TestCase): res = response.json() self.assertIn( {"error-type": "application", "error-tag": "data-missing", - "error-message": "Request could not be completed because the relevant data model content does not exist"}, + "error-message": + "Request could not be completed because the relevant data model content does not exist"}, res['errors']['error']) def test_18_service_path_delete_xpdr_check(self): @@ -285,7 +291,8 @@ class TransportPCERendererTesting(unittest.TestCase): res = response.json() self.assertIn( {"error-type": "application", "error-tag": "data-missing", - "error-message": "Request could not be completed because the relevant data model content does not exist"}, + "error-message": + "Request could not be completed because the relevant data model content does not exist"}, res['errors']['error']) def test_19_service_path_delete_xpdr_check(self): @@ -294,7 +301,8 @@ class TransportPCERendererTesting(unittest.TestCase): res = response.json() self.assertIn( {"error-type": "application", "error-tag": "data-missing", - "error-message": "Request could not be completed because the relevant data model content does not exist"}, + "error-message": + "Request could not be completed because the relevant data model content does not exist"}, res['errors']['error']) def test_20_service_path_delete_xpdr_check(self): @@ -303,7 +311,8 @@ class TransportPCERendererTesting(unittest.TestCase): res = response.json() self.assertIn( {"error-type": "application", "error-tag": "data-missing", - "error-message": "Request could not be completed because the relevant data model content does not exist"}, + "error-message": + "Request could not be completed because the relevant data model content does not exist"}, res['errors']['error']) def test_21_service_path_delete_xpdr_check(self): @@ -312,7 +321,8 @@ class TransportPCERendererTesting(unittest.TestCase): res = response.json() self.assertIn( {"error-type": "application", "error-tag": "data-missing", - "error-message": "Request could not be completed because the relevant data model content does not exist"}, + "error-message": + "Request could not be completed because the relevant data model content does not exist"}, res['errors']['error']) def test_22_service_path_delete_xpdr_check(self): diff --git a/tests/transportpce_tests/1.2.1/test_topology.py b/tests/transportpce_tests/1.2.1/test_topology.py index c30bb7992..f35753872 100644 --- a/tests/transportpce_tests/1.2.1/test_topology.py +++ b/tests/transportpce_tests/1.2.1/test_topology.py @@ -66,21 +66,28 @@ class TransportPCETopologyTesting(unittest.TestCase): self.assertEqual(nbLink, 10) expressLink = ['ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX', 'ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX'] - addLink = ['ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX', 'ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX', - 'ROADMA01-SRG3-SRG3-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX', 'ROADMA01-SRG3-SRG3-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX'] - dropLink = ['ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX', 'ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX', - 'ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG3-SRG3-CP-TXRX', 'ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG3-SRG3-CP-TXRX'] + addLink = ['ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX', + 'ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX', + 'ROADMA01-SRG3-SRG3-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX', + 'ROADMA01-SRG3-SRG3-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX'] + dropLink = ['ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX', + 'ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX', + 'ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG3-SRG3-CP-TXRX', + 'ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG3-SRG3-CP-TXRX'] for i in range(0, nbLink): linkId = res['network'][0]['ietf-network-topology:link'][i]['link-id'] - if res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'] == 'EXPRESS-LINK': + if (res['network'][0]['ietf-network-topology:link'][i] + ['org-openroadm-common-network:link-type'] == 'EXPRESS-LINK'): find = linkId in expressLink self.assertEqual(find, True) expressLink.remove(linkId) - elif res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'] == 'ADD-LINK': + elif (res['network'][0]['ietf-network-topology:link'][i] + ['org-openroadm-common-network:link-type'] == 'ADD-LINK'): find = linkId in addLink self.assertEqual(find, True) addLink.remove(linkId) - elif res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'] == 'DROP-LINK': + elif (res['network'][0]['ietf-network-topology:link'][i] + ['org-openroadm-common-network:link-type'] == 'DROP-LINK'): find = linkId in dropLink self.assertEqual(find, True) dropLink.remove(linkId) @@ -209,7 +216,8 @@ class TransportPCETopologyTesting(unittest.TestCase): client = 0 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'] + 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 @@ -292,10 +300,14 @@ class TransportPCETopologyTesting(unittest.TestCase): self.assertEqual(nbLink, 12) expressLink = ['ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX', 'ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX'] - addLink = ['ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX', 'ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX', - 'ROADMA01-SRG3-SRG3-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX', 'ROADMA01-SRG3-SRG3-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX'] - dropLink = ['ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX', 'ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX', - 'ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG3-SRG3-CP-TXRX', 'ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG3-SRG3-CP-TXRX'] + addLink = ['ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX', + 'ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX', + 'ROADMA01-SRG3-SRG3-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX', + 'ROADMA01-SRG3-SRG3-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX'] + dropLink = ['ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX', + 'ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX', + 'ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG3-SRG3-CP-TXRX', + 'ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG3-SRG3-CP-TXRX'] XPDR_IN = ['ROADMA01-SRG1-SRG1-PP1-TXRXtoXPDRA01-XPDR1-XPDR1-NETWORK1'] XPDR_OUT = ['XPDRA01-XPDR1-XPDR1-NETWORK1toROADMA01-SRG1-SRG1-PP1-TXRX'] for i in range(0, nbLink): @@ -413,14 +425,22 @@ class TransportPCETopologyTesting(unittest.TestCase): # Tests related to links nbLink = len(res['network'][0]['ietf-network-topology:link']) self.assertEqual(nbLink, 20) - expressLink = ['ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX', 'ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX', - 'ROADMC01-DEG2-DEG2-CTP-TXRXtoROADMC01-DEG1-DEG1-CTP-TXRX', 'ROADMC01-DEG1-DEG1-CTP-TXRXtoROADMC01-DEG2-DEG2-CTP-TXRX'] - addLink = ['ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX', 'ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX', - 'ROADMA01-SRG3-SRG3-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX', 'ROADMA01-SRG3-SRG3-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX', - 'ROADMC01-SRG1-SRG1-CP-TXRXtoROADMC01-DEG2-DEG2-CTP-TXRX', 'ROADMC01-SRG1-SRG1-CP-TXRXtoROADMC01-DEG1-DEG1-CTP-TXRX'] - dropLink = ['ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX', 'ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX', - 'ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG3-SRG3-CP-TXRX', 'ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG3-SRG3-CP-TXRX', - 'ROADMC01-DEG1-DEG1-CTP-TXRXtoROADMC01-SRG1-SRG1-CP-TXRX', 'ROADMC01-DEG2-DEG2-CTP-TXRXtoROADMC01-SRG1-SRG1-CP-TXRX'] + expressLink = ['ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX', + 'ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX', + 'ROADMC01-DEG2-DEG2-CTP-TXRXtoROADMC01-DEG1-DEG1-CTP-TXRX', + 'ROADMC01-DEG1-DEG1-CTP-TXRXtoROADMC01-DEG2-DEG2-CTP-TXRX'] + addLink = ['ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX', + 'ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX', + 'ROADMA01-SRG3-SRG3-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX', + 'ROADMA01-SRG3-SRG3-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX', + 'ROADMC01-SRG1-SRG1-CP-TXRXtoROADMC01-DEG2-DEG2-CTP-TXRX', + 'ROADMC01-SRG1-SRG1-CP-TXRXtoROADMC01-DEG1-DEG1-CTP-TXRX'] + dropLink = ['ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX', + 'ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX', + 'ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG3-SRG3-CP-TXRX', + 'ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG3-SRG3-CP-TXRX', + 'ROADMC01-DEG1-DEG1-CTP-TXRXtoROADMC01-SRG1-SRG1-CP-TXRX', + 'ROADMC01-DEG2-DEG2-CTP-TXRXtoROADMC01-SRG1-SRG1-CP-TXRX'] R2RLink = ['ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX', 'ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX'] XPDR_IN = ['ROADMA01-SRG1-SRG1-PP1-TXRXtoXPDRA01-XPDR1-XPDR1-NETWORK1'] @@ -474,10 +494,11 @@ class TransportPCETopologyTesting(unittest.TestCase): link_id = res['network'][0]['ietf-network-topology:link'][i]['link-id'] if(link_id in R2RLink): find = False - spanLoss = res['network'][0]['ietf-network-topology:link'][i][ - 'org-openroadm-network-topology:OMS-attributes']['span']["engineered-spanloss"] - length = res['network'][0]['ietf-network-topology:link'][i][ - 'org-openroadm-network-topology:OMS-attributes']['span']['link-concatenation'][0]['SRLG-length'] + spanLoss = (res['network'][0]['ietf-network-topology:link'][i] + ['org-openroadm-network-topology:OMS-attributes']['span']["engineered-spanloss"]) + length = (res['network'][0]['ietf-network-topology:link'][i] + ['org-openroadm-network-topology:OMS-attributes']['span']['link-concatenation'][0] + ['SRLG-length']) if((spanLoss != None) & (length != None)): find = True self.assertTrue(find) @@ -507,7 +528,8 @@ class TransportPCETopologyTesting(unittest.TestCase): client = 0 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'] + tpType = res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j][ + 'org-openroadm-common-network:tp-type'] if (tpType == 'XPONDER-CLIENT'): client += 1 elif (tpType == 'XPONDER-NETWORK'): @@ -673,11 +695,15 @@ class TransportPCETopologyTesting(unittest.TestCase): res = response.json() # Tests related to links nbLink = len(res['network'][0]['ietf-network-topology:link']) - listR2RLink = ['ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX', 'ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX', - 'ROADMA01-DEG2-DEG2-TTP-TXRXtoROADMB01-DEG1-DEG1-TTP-TXRX', 'ROADMC01-DEG1-DEG1-TTP-TXRXtoROADMB01-DEG2-DEG2-TTP-TXRX', - 'ROADMB01-DEG1-DEG1-TTP-TXRXtoROADMA01-DEG2-DEG2-TTP-TXRX', 'ROADMB01-DEG2-DEG2-TTP-TXRXtoROADMC01-DEG1-DEG1-TTP-TXRX'] + listR2RLink = ['ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX', + 'ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX', + 'ROADMA01-DEG2-DEG2-TTP-TXRXtoROADMB01-DEG1-DEG1-TTP-TXRX', + 'ROADMC01-DEG1-DEG1-TTP-TXRXtoROADMB01-DEG2-DEG2-TTP-TXRX', + 'ROADMB01-DEG1-DEG1-TTP-TXRXtoROADMA01-DEG2-DEG2-TTP-TXRX', + 'ROADMB01-DEG2-DEG2-TTP-TXRXtoROADMC01-DEG1-DEG1-TTP-TXRX'] for i in range(0, nbLink): - if res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'] == 'ROADM-TO-ROADM': + if (res['network'][0]['ietf-network-topology:link'][i] + ['org-openroadm-common-network:link-type'] == 'ROADM-TO-ROADM'): link_id = res['network'][0]['ietf-network-topology:link'][i]['link-id'] find = link_id in listR2RLink self.assertEqual(find, True) @@ -696,7 +722,8 @@ class TransportPCETopologyTesting(unittest.TestCase): link_type = res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'] link_src = res['network'][0]['ietf-network-topology:link'][i]['source']['source-node'] link_dest = res['network'][0]['ietf-network-topology:link'][i]['destination']['dest-node'] - oppLink_id = res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:opposite-link'] + oppLink_id = (res['network'][0]['ietf-network-topology:link'][i] + ['org-openroadm-common-network:opposite-link']) # Find the opposite link response_oppLink = test_utils.get_ordm_topo_request("ietf-network-topology:link/"+oppLink_id) self.assertEqual(response_oppLink.status_code, requests.codes.ok) @@ -782,7 +809,8 @@ class TransportPCETopologyTesting(unittest.TestCase): self.assertEqual(res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j] ['org-openroadm-common-network:tp-type'], 'XPONDER-NETWORK') self.assertEqual(res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j] - ['org-openroadm-network-topology:xpdr-network-attributes']['tail-equipment-id'], + ['org-openroadm-network-topology:xpdr-network-attributes'] + ['tail-equipment-id'], 'ROADMA01-SRG1--SRG1-PP1-TXRX') self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'XPDRA01'}, res['network'][0]['node'][i]['supporting-node']) @@ -945,23 +973,30 @@ class TransportPCETopologyTesting(unittest.TestCase): self.assertEqual(nbLink, 16) expressLink = ['ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX', 'ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX'] - addLink = ['ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX', 'ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX', - 'ROADMA01-SRG3-SRG3-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX', 'ROADMA01-SRG3-SRG3-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX'] - dropLink = ['ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX', 'ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX', - 'ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG3-SRG3-CP-TXRX', 'ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG3-SRG3-CP-TXRX'] + addLink = ['ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX', + 'ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX', + 'ROADMA01-SRG3-SRG3-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX', + 'ROADMA01-SRG3-SRG3-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX'] + dropLink = ['ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX', + 'ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX', + 'ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG3-SRG3-CP-TXRX', + 'ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG3-SRG3-CP-TXRX'] roadmtoroadmLink = 0 for i in range(0, nbLink): - if (res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'] == 'EXPRESS-LINK'): + if (res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'] + == 'EXPRESS-LINK'): link_id = res['network'][0]['ietf-network-topology:link'][i]['link-id'] find = link_id in expressLink self.assertEqual(find, True) expressLink.remove(link_id) - elif (res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'] == 'ADD-LINK'): + elif (res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'] + == 'ADD-LINK'): link_id = res['network'][0]['ietf-network-topology:link'][i]['link-id'] find = link_id in addLink self.assertEqual(find, True) addLink.remove(link_id) - elif (res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'] == 'DROP-LINK'): + elif (res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'] + == 'DROP-LINK'): link_id = res['network'][0]['ietf-network-topology:link'][i]['link-id'] find = link_id in dropLink self.assertEqual(find, True) 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 4646fb1fd..ee670fd14 100644 --- a/tests/transportpce_tests/2.2.1/test_otn_renderer.py +++ b/tests/transportpce_tests/2.2.1/test_otn_renderer.py @@ -214,7 +214,8 @@ class TransportPCEtesting(unittest.TestCase): response = test_utils.otn_service_path_request("create", "service1", "10G", "Ethernet", [{"node-id": "SPDR-SA1", "client-tp": "XPDR1-CLIENT4", "network-tp": "XPDR1-NETWORK1"}], - {"ethernet-encoding": "eth encode", "trib-slot": ["1"], "trib-port-number": "1"}) + {"ethernet-encoding": "eth encode", + "trib-slot": ["1"], "trib-port-number": "1"}) time.sleep(3) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() @@ -322,7 +323,8 @@ class TransportPCEtesting(unittest.TestCase): response = test_utils.otn_service_path_request("delete", "service1", "10G", "Ethernet", [{"node-id": "SPDR-SA1", "client-tp": "XPDR1-CLIENT4", "network-tp": "XPDR1-NETWORK1"}], - {"ethernet-encoding": "eth encode", "trib-slot": ["1"], "trib-port-number": "1"}) + {"ethernet-encoding": "eth encode", + "trib-slot": ["1"], "trib-port-number": "1"}) time.sleep(3) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() 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 4dd6ab7b2..c420efa02 100644 --- a/tests/transportpce_tests/2.2.1/test_otn_topology.py +++ b/tests/transportpce_tests/2.2.1/test_otn_topology.py @@ -99,7 +99,8 @@ class TransportPCEtesting(unittest.TestCase): client = 0 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'] + tpType = (res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j] + ['org-openroadm-common-network:tp-type']) if (tpType == 'XPONDER-CLIENT'): client += 1 elif (tpType == 'XPONDER-NETWORK'): @@ -117,7 +118,8 @@ class TransportPCEtesting(unittest.TestCase): client = 0 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'] + tpType = (res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j] + ['org-openroadm-common-network:tp-type']) if (tpType == 'XPONDER-CLIENT'): client += 1 elif (tpType == 'XPONDER-NETWORK'): @@ -159,26 +161,35 @@ class TransportPCEtesting(unittest.TestCase): client = 0 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'] + 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 - self.assertEqual(res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j]['org-openroadm-otn-network-topology:tp-supported-interfaces'] - ['supported-interface-capability'][0]['if-cap-type'], 'org-openroadm-port-types:if-10GE-ODU2e') - self.assertEqual(res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j] - ['org-openroadm-otn-network-topology:xpdr-tp-port-connection-attributes']['rate'], 'org-openroadm-otn-common-types:ODU2e') + self.assertEqual((res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j] + ['org-openroadm-otn-network-topology:tp-supported-interfaces'] + ['supported-interface-capability'][0]['if-cap-type']), + 'org-openroadm-port-types:if-10GE-ODU2e') + self.assertEqual((res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j] + ['org-openroadm-otn-network-topology:xpdr-tp-port-connection-attributes'] + ['rate']), + 'org-openroadm-otn-common-types:ODU2e') elif (tpType == 'XPONDER-NETWORK'): network += 1 - self.assertEqual(res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j]['org-openroadm-otn-network-topology:tp-supported-interfaces'] - ['supported-interface-capability'][0]['if-cap-type'], 'org-openroadm-port-types:if-OCH-OTU4-ODU4') - self.assertEqual(res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j] - ['org-openroadm-otn-network-topology:xpdr-tp-port-connection-attributes']['rate'], 'org-openroadm-otn-common-types:ODU4') - self.assertEqual(res['network'][0]['node'][i]['ietf-network-topology:termination-point'] - [j]['supporting-termination-point'][0]['network-ref'], 'openroadm-topology') - self.assertEqual(res['network'][0]['node'][i]['ietf-network-topology:termination-point'] - [j]['supporting-termination-point'][0]['node-ref'], 'SPDR-SA1-XPDR1') - self.assertEqual(res['network'][0]['node'][i]['ietf-network-topology:termination-point'] - [j]['supporting-termination-point'][0]['tp-ref'], 'XPDR1-NETWORK1') + self.assertEqual((res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j] + ['org-openroadm-otn-network-topology:tp-supported-interfaces'] + ['supported-interface-capability'][0]['if-cap-type']), + 'org-openroadm-port-types:if-OCH-OTU4-ODU4') + self.assertEqual((res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j] + ['org-openroadm-otn-network-topology:xpdr-tp-port-connection-attributes'] + ['rate']), + 'org-openroadm-otn-common-types:ODU4') + self.assertEqual((res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j] + ['supporting-termination-point'][0]['network-ref']), 'openroadm-topology') + self.assertEqual((res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j] + ['supporting-termination-point'][0]['node-ref']), 'SPDR-SA1-XPDR1') + self.assertEqual((res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j] + ['supporting-termination-point'][0]['tp-ref']), 'XPDR1-NETWORK1') self.assertTrue(client == 4) self.assertTrue(network == 1) listNode.remove(nodeId) @@ -186,7 +197,8 @@ class TransportPCEtesting(unittest.TestCase): ['odu-switching-pools'][0]['non-blocking-list']) self.assertEqual(nbNbl, 4) for k in range(0, nbNbl): - nbl = res['network'][0]['node'][i]['org-openroadm-otn-network-topology:switching-pools']['odu-switching-pools'][0]['non-blocking-list'][k] + nbl = (res['network'][0]['node'][i]['org-openroadm-otn-network-topology:switching-pools'] + ['odu-switching-pools'][0]['non-blocking-list'][k]) if (nbl['nbl-number'] == 1): self.assertEqual(nbl['available-interconnect-bandwidth'], 10) self.assertEqual(nbl['interconnect-bandwidth-unit'], 1000000000) @@ -208,33 +220,43 @@ class TransportPCEtesting(unittest.TestCase): client = 0 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'] + 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 - self.assertEqual(res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j]['org-openroadm-otn-network-topology:tp-supported-interfaces'] - ['supported-interface-capability'][0]['if-cap-type'], 'org-openroadm-port-types:if-100GE-ODU4') - self.assertEqual(res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j] - ['org-openroadm-otn-network-topology:xpdr-tp-port-connection-attributes']['rate'], 'org-openroadm-otn-common-types:ODU4') + self.assertEqual((res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j] + ['org-openroadm-otn-network-topology:tp-supported-interfaces'] + ['supported-interface-capability'][0]['if-cap-type']), + 'org-openroadm-port-types:if-100GE-ODU4') + self.assertEqual((res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j] + ['org-openroadm-otn-network-topology:xpdr-tp-port-connection-attributes'] + ['rate']), + 'org-openroadm-otn-common-types:ODU4') elif (tpType == 'XPONDER-NETWORK'): network += 1 - self.assertEqual(res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j]['org-openroadm-otn-network-topology:tp-supported-interfaces'] - ['supported-interface-capability'][0]['if-cap-type'], 'org-openroadm-port-types:if-OCH-OTU4-ODU4') - self.assertEqual(res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j] - ['org-openroadm-otn-network-topology:xpdr-tp-port-connection-attributes']['rate'], 'org-openroadm-otn-common-types:ODU4') - self.assertEqual(res['network'][0]['node'][i]['ietf-network-topology:termination-point'] - [j]['supporting-termination-point'][0]['network-ref'], 'openroadm-topology') - self.assertEqual(res['network'][0]['node'][i]['ietf-network-topology:termination-point'] - [j]['supporting-termination-point'][0]['node-ref'], 'SPDR-SA1-XPDR2') - self.assertEqual(res['network'][0]['node'][i]['ietf-network-topology:termination-point'] - [j]['supporting-termination-point'][0]['tp-ref'], tpId) + self.assertEqual((res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j] + ['org-openroadm-otn-network-topology:tp-supported-interfaces'] + ['supported-interface-capability'][0]['if-cap-type']), + 'org-openroadm-port-types:if-OCH-OTU4-ODU4') + self.assertEqual((res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j] + ['org-openroadm-otn-network-topology:xpdr-tp-port-connection-attributes'] + ['rate']), + 'org-openroadm-otn-common-types:ODU4') + self.assertEqual((res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j] + ['supporting-termination-point'][0]['network-ref']), 'openroadm-topology') + self.assertEqual((res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j] + ['supporting-termination-point'][0]['node-ref']), 'SPDR-SA1-XPDR2') + self.assertEqual((res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j] + ['supporting-termination-point'][0]['tp-ref']), tpId) self.assertTrue(client == 4) self.assertTrue(network == 4) listNode.remove(nodeId) nbNbl = len(res['network'][0]['node'][i]['org-openroadm-otn-network-topology:switching-pools'] ['odu-switching-pools'][0]['non-blocking-list']) self.assertEqual(nbNbl, 1) - nbl = res['network'][0]['node'][i]['org-openroadm-otn-network-topology:switching-pools']['odu-switching-pools'][0]['non-blocking-list'][0] + nbl = (res['network'][0]['node'][i]['org-openroadm-otn-network-topology:switching-pools'] + ['odu-switching-pools'][0]['non-blocking-list'][0]) self.assertIn('XPDR2-NETWORK1', nbl['tp-list']) self.assertIn('XPDR2-CLIENT1', nbl['tp-list']) self.assertIn('XPDR2-NETWORK2', nbl['tp-list']) 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 f3c47d0a1..adb7a89a1 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 @@ -77,9 +77,11 @@ class TransportPCERendererTesting(unittest.TestCase): def test_05_service_path_create(self): response = test_utils.service_path_request("create", "service_test", "7", [{"renderer:node-id": "ROADM-A1", - "renderer:src-tp": "SRG1-PP3-TXRX", "renderer:dest-tp": "DEG1-TTP-TXRX"}, + "renderer:src-tp": "SRG1-PP3-TXRX", + "renderer:dest-tp": "DEG1-TTP-TXRX"}, {"renderer:node-id": "XPDR-A1", - "renderer:src-tp": "XPDR1-CLIENT1", "renderer:dest-tp": "XPDR1-NETWORK1"}]) + "renderer:src-tp": "XPDR1-CLIENT1", + "renderer:dest-tp": "XPDR1-NETWORK1"}]) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Roadm-connection successfully created for nodes: ROADM-A1', res["output"]["result"]) @@ -275,9 +277,11 @@ class TransportPCERendererTesting(unittest.TestCase): def test_17_service_path_delete(self): response = test_utils.service_path_request("delete", "service_test", "7", [{"renderer:node-id": "ROADM-A1", - "renderer:src-tp": "SRG1-PP3-TXRX", "renderer:dest-tp": "DEG1-TTP-TXRX"}, + "renderer:src-tp": "SRG1-PP3-TXRX", + "renderer:dest-tp": "DEG1-TTP-TXRX"}, {"renderer:node-id": "XPDR-A1", - "renderer:src-tp": "XPDR1-CLIENT1", "renderer:dest-tp": "XPDR1-NETWORK1"}]) + "renderer:src-tp": "XPDR1-CLIENT1", + "renderer:dest-tp": "XPDR1-NETWORK1"}]) self.assertEqual(response.status_code, requests.codes.ok) self.assertEqual(response.json(), { 'output': {'result': 'Request processed', 'success': True}}) diff --git a/tests/transportpce_tests/2.2.1/test_topology.py b/tests/transportpce_tests/2.2.1/test_topology.py index 8fa74bfc6..c30f91515 100644 --- a/tests/transportpce_tests/2.2.1/test_topology.py +++ b/tests/transportpce_tests/2.2.1/test_topology.py @@ -78,15 +78,18 @@ class TransportPCEtesting(unittest.TestCase): 'ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-SRG3-SRG3-CP-TXRX'] for i in range(0, nbLink): linkId = res['network'][0]['ietf-network-topology:link'][i]['link-id'] - if (res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'] == 'EXPRESS-LINK'): + if (res['network'][0]['ietf-network-topology:link'][i] + ['org-openroadm-common-network:link-type'] == 'EXPRESS-LINK'): find = linkId in expressLink self.assertEqual(find, True) expressLink.remove(linkId) - elif (res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'] == 'ADD-LINK'): + elif (res['network'][0]['ietf-network-topology:link'][i] + ['org-openroadm-common-network:link-type'] == 'ADD-LINK'): find = linkId in addLink self.assertEqual(find, True) addLink.remove(linkId) - elif (res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'] == 'DROP-LINK'): + elif (res['network'][0]['ietf-network-topology:link'][i] + ['org-openroadm-common-network:link-type'] == 'DROP-LINK'): find = linkId in dropLink self.assertEqual(find, True) dropLink.remove(linkId) @@ -215,7 +218,8 @@ class TransportPCEtesting(unittest.TestCase): client = 0 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'] + 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 @@ -298,10 +302,14 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual(nbLink, 12) expressLink = ['ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX', 'ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX'] - addLink = ['ROADM-A1-SRG1-SRG1-CP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX', 'ROADM-A1-SRG1-SRG1-CP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX', - 'ROADM-A1-SRG3-SRG3-CP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX', 'ROADM-A1-SRG3-SRG3-CP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX'] - dropLink = ['ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-SRG1-SRG1-CP-TXRX', 'ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-SRG1-SRG1-CP-TXRX', - 'ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-SRG3-SRG3-CP-TXRX', 'ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-SRG3-SRG3-CP-TXRX'] + addLink = ['ROADM-A1-SRG1-SRG1-CP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX', + 'ROADM-A1-SRG1-SRG1-CP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX', + 'ROADM-A1-SRG3-SRG3-CP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX', + 'ROADM-A1-SRG3-SRG3-CP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX'] + dropLink = ['ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-SRG1-SRG1-CP-TXRX', + 'ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-SRG1-SRG1-CP-TXRX', + 'ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-SRG3-SRG3-CP-TXRX', + 'ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-SRG3-SRG3-CP-TXRX'] XPDR_IN = ['ROADM-A1-SRG1-SRG1-PP1-TXRXtoXPDR-A1-XPDR1-XPDR1-NETWORK1'] XPDR_OUT = ['XPDR-A1-XPDR1-XPDR1-NETWORK1toROADM-A1-SRG1-SRG1-PP1-TXRX'] for i in range(0, nbLink): @@ -419,14 +427,22 @@ class TransportPCEtesting(unittest.TestCase): # Tests related to links nbLink = len(res['network'][0]['ietf-network-topology:link']) self.assertEqual(nbLink, 20) - expressLink = ['ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX', 'ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX', - 'ROADM-C1-DEG2-DEG2-CTP-TXRXtoROADM-C1-DEG1-DEG1-CTP-TXRX', 'ROADM-C1-DEG1-DEG1-CTP-TXRXtoROADM-C1-DEG2-DEG2-CTP-TXRX'] - addLink = ['ROADM-A1-SRG1-SRG1-CP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX', 'ROADM-A1-SRG1-SRG1-CP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX', - 'ROADM-A1-SRG3-SRG3-CP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX', 'ROADM-A1-SRG3-SRG3-CP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX', - 'ROADM-C1-SRG1-SRG1-CP-TXRXtoROADM-C1-DEG2-DEG2-CTP-TXRX', 'ROADM-C1-SRG1-SRG1-CP-TXRXtoROADM-C1-DEG1-DEG1-CTP-TXRX'] - dropLink = ['ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-SRG1-SRG1-CP-TXRX', 'ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-SRG1-SRG1-CP-TXRX', - 'ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-SRG3-SRG3-CP-TXRX', 'ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-SRG3-SRG3-CP-TXRX', - 'ROADM-C1-DEG1-DEG1-CTP-TXRXtoROADM-C1-SRG1-SRG1-CP-TXRX', 'ROADM-C1-DEG2-DEG2-CTP-TXRXtoROADM-C1-SRG1-SRG1-CP-TXRX'] + expressLink = ['ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX', + 'ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX', + 'ROADM-C1-DEG2-DEG2-CTP-TXRXtoROADM-C1-DEG1-DEG1-CTP-TXRX', + 'ROADM-C1-DEG1-DEG1-CTP-TXRXtoROADM-C1-DEG2-DEG2-CTP-TXRX'] + addLink = ['ROADM-A1-SRG1-SRG1-CP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX', + 'ROADM-A1-SRG1-SRG1-CP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX', + 'ROADM-A1-SRG3-SRG3-CP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX', + 'ROADM-A1-SRG3-SRG3-CP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX', + 'ROADM-C1-SRG1-SRG1-CP-TXRXtoROADM-C1-DEG2-DEG2-CTP-TXRX', + 'ROADM-C1-SRG1-SRG1-CP-TXRXtoROADM-C1-DEG1-DEG1-CTP-TXRX'] + dropLink = ['ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-SRG1-SRG1-CP-TXRX', + 'ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-SRG1-SRG1-CP-TXRX', + 'ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-SRG3-SRG3-CP-TXRX', + 'ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-SRG3-SRG3-CP-TXRX', + 'ROADM-C1-DEG1-DEG1-CTP-TXRXtoROADM-C1-SRG1-SRG1-CP-TXRX', + 'ROADM-C1-DEG2-DEG2-CTP-TXRXtoROADM-C1-SRG1-SRG1-CP-TXRX'] R2RLink = ['ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX', 'ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX'] XPDR_IN = ['ROADM-A1-SRG1-SRG1-PP1-TXRXtoXPDR-A1-XPDR1-XPDR1-NETWORK1'] @@ -513,7 +529,8 @@ class TransportPCEtesting(unittest.TestCase): client = 0 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'] + tpType = (res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j] + ['org-openroadm-common-network:tp-type']) if (tpType == 'XPONDER-CLIENT'): client += 1 elif (tpType == 'XPONDER-NETWORK'): @@ -685,11 +702,15 @@ class TransportPCEtesting(unittest.TestCase): res = response.json() # Tests related to links nbLink = len(res['network'][0]['ietf-network-topology:link']) - listR2RLink = ['ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX', 'ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX', - 'ROADM-A1-DEG1-DEG1-TTP-TXRXtoROADM-B1-DEG1-DEG1-TTP-TXRX', 'ROADM-C1-DEG2-DEG2-TTP-TXRXtoROADM-B1-DEG2-DEG2-TTP-TXRX', - 'ROADM-B1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG1-DEG1-TTP-TXRX', 'ROADM-B1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG2-DEG2-TTP-TXRX'] + listR2RLink = ['ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX', + 'ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX', + 'ROADM-A1-DEG1-DEG1-TTP-TXRXtoROADM-B1-DEG1-DEG1-TTP-TXRX', + 'ROADM-C1-DEG2-DEG2-TTP-TXRXtoROADM-B1-DEG2-DEG2-TTP-TXRX', + '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): - if res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'] == 'ROADM-TO-ROADM': + if (res['network'][0]['ietf-network-topology:link'][i] + ['org-openroadm-common-network:link-type'] == 'ROADM-TO-ROADM'): link_id = res['network'][0]['ietf-network-topology:link'][i]['link-id'] find = link_id in listR2RLink self.assertEqual(find, True) @@ -708,7 +729,8 @@ class TransportPCEtesting(unittest.TestCase): link_type = res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'] link_src = res['network'][0]['ietf-network-topology:link'][i]['source']['source-node'] link_dest = res['network'][0]['ietf-network-topology:link'][i]['destination']['dest-node'] - oppLink_id = res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:opposite-link'] + oppLink_id = (res['network'][0]['ietf-network-topology:link'][i] + ['org-openroadm-common-network:opposite-link']) # Find the opposite link response_oppLink = test_utils.get_ordm_topo_request("ietf-network-topology:link/"+oppLink_id) self.assertEqual(response_oppLink.status_code, requests.codes.ok) @@ -781,9 +803,12 @@ class TransportPCEtesting(unittest.TestCase): # #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'] +# 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): @@ -818,13 +843,20 @@ class TransportPCEtesting(unittest.TestCase): # 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') +# 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): response = test_utils.get_ordm_topo_request("") @@ -843,13 +875,14 @@ class TransportPCEtesting(unittest.TestCase): for j in range(0, nbTp): tpid = res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j]['tp-id'] if (tpid == 'XPDR1-CLIENT1'): - self.assertEqual(res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j] - ['org-openroadm-common-network:tp-type'], 'XPONDER-CLIENT') + self.assertEqual((res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j] + ['org-openroadm-common-network:tp-type']), 'XPONDER-CLIENT') if (tpid == 'XPDR1-NETWORK1'): - self.assertEqual(res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j] - ['org-openroadm-common-network:tp-type'], 'XPONDER-NETWORK') - self.assertEqual(res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j] - ['org-openroadm-network-topology:xpdr-network-attributes']['tail-equipment-id'], + self.assertEqual((res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j] + ['org-openroadm-common-network:tp-type']), 'XPONDER-NETWORK') + self.assertEqual((res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j] + ['org-openroadm-network-topology:xpdr-network-attributes'] + ['tail-equipment-id']), 'ROADM-A1-SRG1--SRG1-PP1-TXRX') self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'XPDR-A1'}, res['network'][0]['node'][i]['supporting-node']) @@ -1012,23 +1045,30 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual(nbLink, 16) expressLink = ['ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX', 'ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX'] - addLink = ['ROADM-A1-SRG1-SRG1-CP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX', 'ROADM-A1-SRG1-SRG1-CP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX', - 'ROADM-A1-SRG3-SRG3-CP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX', 'ROADM-A1-SRG3-SRG3-CP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX'] - dropLink = ['ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-SRG1-SRG1-CP-TXRX', 'ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-SRG1-SRG1-CP-TXRX', - 'ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-SRG3-SRG3-CP-TXRX', 'ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-SRG3-SRG3-CP-TXRX'] + addLink = ['ROADM-A1-SRG1-SRG1-CP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX', + 'ROADM-A1-SRG1-SRG1-CP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX', + 'ROADM-A1-SRG3-SRG3-CP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX', + 'ROADM-A1-SRG3-SRG3-CP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX'] + dropLink = ['ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-SRG1-SRG1-CP-TXRX', + 'ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-SRG1-SRG1-CP-TXRX', + 'ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-SRG3-SRG3-CP-TXRX', + 'ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-SRG3-SRG3-CP-TXRX'] roadmtoroadmLink = 0 for i in range(0, nbLink): - if (res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'] == 'EXPRESS-LINK'): + if (res['network'][0]['ietf-network-topology:link'][i] + ['org-openroadm-common-network:link-type'] == 'EXPRESS-LINK'): link_id = res['network'][0]['ietf-network-topology:link'][i]['link-id'] find = link_id in expressLink self.assertEqual(find, True) expressLink.remove(link_id) - elif (res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'] == 'ADD-LINK'): + elif (res['network'][0]['ietf-network-topology:link'][i] + ['org-openroadm-common-network:link-type'] == 'ADD-LINK'): link_id = res['network'][0]['ietf-network-topology:link'][i]['link-id'] find = link_id in addLink self.assertEqual(find, True) addLink.remove(link_id) - elif (res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'] == 'DROP-LINK'): + elif (res['network'][0]['ietf-network-topology:link'][i] + ['org-openroadm-common-network:link-type'] == 'DROP-LINK'): link_id = res['network'][0]['ietf-network-topology:link'][i]['link-id'] find = link_id in dropLink self.assertEqual(find, True) diff --git a/tests/transportpce_tests/common/test_utils.py b/tests/transportpce_tests/common/test_utils.py index 822aab06f..19121f53c 100644 --- a/tests/transportpce_tests/common/test_utils.py +++ b/tests/transportpce_tests/common/test_utils.py @@ -359,7 +359,8 @@ def service_path_request(operation: str, servicename: str, wavenumber: str, node return post_request(URL_SERVICE_PATH, attr) -def otn_service_path_request(operation: str, servicename: str, servicerate: str, servicetype: str, nodes, eth_attr=None): +def otn_service_path_request(operation: str, servicename: str, servicerate: str, servicetype: str, nodes, + eth_attr=None): attr = {"service-name": servicename, "operation": operation, "service-rate": servicerate, -- 2.36.6