From: Gilles Thouenon Date: Tue, 30 Nov 2021 17:45:29 +0000 (+0100) Subject: Set xponder-type in the mapping for Transponders X-Git-Tag: 5.0.0~162 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=transportpce.git;a=commitdiff_plain;h=c79474dfcc9b0ab8c38746daa08b692aadc3839b Set xponder-type in the mapping for Transponders - Set the xponder-type in the mappings corresponding to traffic ports of transponders, as it is done for otn-xponders - Adapt functional tests JIRA: TRNSPRTPCE-578 Signed-off-by: Gilles Thouenon Change-Id: Iea7e83225acc0d754dec003d4ea8ac19d7461972 --- diff --git a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion121.java b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion121.java index 6db57d08a..23e108cf1 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion121.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion121.java @@ -66,6 +66,7 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.org.open import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.org.openroadm.device.container.org.openroadm.device.connection.map.Destination; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.port.Interfaces; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.types.rev191129.NodeTypes; +import org.opendaylight.yang.gen.v1.http.org.openroadm.device.types.rev191129.XpdrNodeTypes; import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev161014.InterfaceType; import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev161014.OpenROADMOpticalMultiplex; import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev161014.OpticalTransport; @@ -635,6 +636,7 @@ public class PortMappingVersion121 { .setSupportingCircuitPackName(circuitPackName) .setSupportingPort(port.getPortName()) .setPortDirection(port.getPortDirection().getName()) + .setXponderType(XpdrNodeTypes.Tpdr) .setLcpHashVal(PortMappingUtils.fnv1size64(nodeId + "-" + logicalConnectionPoint)); if (port.getPortQual() != null) { mpBldr.setPortQual(port.getPortQual().getName()); diff --git a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion221.java b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion221.java index 1f1c0853d..c841610f7 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion221.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion221.java @@ -286,7 +286,7 @@ public class PortMappingVersion221 { portList.sort(Comparator.comparing(Ports::getPortName)); for (Ports port : portList) { int[] counters = fillXpdrLcpsMaps(line, client, nodeId, - 1, null, circuitPackName, port, + 1, XpdrNodeTypes.Tpdr, circuitPackName, port, circuitPackList, lcpMap, mappingMap); line = counters[0]; client = counters[1]; diff --git a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion710.java b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion710.java index 134840dda..0ec2b0915 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion710.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion710.java @@ -371,7 +371,7 @@ public class PortMappingVersion710 { portList.sort(Comparator.comparing(Ports::getPortName)); for (Ports port : portList) { int[] counters = fillXpdrLcpsMaps(line, client, nodeId, - 1, null, circuitPackName, port, + 1, XpdrNodeTypes.Tpdr, circuitPackName, port, circuitPackList, lcpMap, mappingMap); line = counters[0]; client = counters[1]; diff --git a/tests/transportpce_tests/1.2.1/test01_portmapping.py b/tests/transportpce_tests/1.2.1/test01_portmapping.py index 9d28b0c4d..f62b08b16 100644 --- a/tests/transportpce_tests/1.2.1/test01_portmapping.py +++ b/tests/transportpce_tests/1.2.1/test01_portmapping.py @@ -125,7 +125,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase): {'supporting-port': '1', 'supporting-circuit-pack-name': '1/0/1-PLUG-NET', 'logical-connection-point': 'XPDR1-NETWORK1', 'port-direction': 'bidirectional', 'connection-map-lcp': 'XPDR1-CLIENT1', 'port-qual': 'xpdr-network', - 'lcp-hash-val': 'OSvMgUyP+mE=', + 'lcp-hash-val': 'OSvMgUyP+mE=', 'xponder-type': 'tpdr', 'port-admin-state': 'InService', 'port-oper-state': 'InService'}, response['mapping']) @@ -136,7 +136,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase): {'supporting-port': '1', 'supporting-circuit-pack-name': '1/0/2-PLUG-NET', 'logical-connection-point': 'XPDR1-NETWORK2', 'port-direction': 'bidirectional', 'connection-map-lcp': 'XPDR1-CLIENT3', 'port-qual': 'xpdr-network', - 'lcp-hash-val': 'OSvMgUyP+mI=', + 'lcp-hash-val': 'OSvMgUyP+mI=', 'xponder-type': 'tpdr', 'port-admin-state': 'InService', 'port-oper-state': 'InService'}, response['mapping']) @@ -148,7 +148,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase): 'supporting-circuit-pack-name': '1/0/C1-PLUG-CLIENT', 'logical-connection-point': 'XPDR1-CLIENT1', 'port-direction': 'bidirectional', 'connection-map-lcp': 'XPDR1-NETWORK1', 'port-qual': 'xpdr-client', - 'lcp-hash-val': 'AO9UFkY/TLYw', + 'lcp-hash-val': 'AO9UFkY/TLYw', 'xponder-type': 'tpdr', 'port-admin-state': 'InService', 'port-oper-state': 'InService'}, response['mapping']) @@ -160,7 +160,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase): 'supporting-circuit-pack-name': '1/0/C2-PLUG-CLIENT', 'logical-connection-point': 'XPDR1-CLIENT2', 'port-direction': 'bidirectional', 'port-qual': 'xpdr-client', - 'lcp-hash-val': 'AO9UFkY/TLYz', + 'lcp-hash-val': 'AO9UFkY/TLYz', 'xponder-type': 'tpdr', 'port-admin-state': 'InService', 'port-oper-state': 'InService'}, response['mapping']) @@ -168,7 +168,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase): response = test_utils_rfc8040.portmapping_request("XPDRA01", "XPDR1-CLIENT3") self.assertEqual(response['status_code'], requests.codes.ok) self.assertIn( - {'supporting-port': 'C3', + {'supporting-port': 'C3', 'xponder-type': 'tpdr', 'supporting-circuit-pack-name': '1/0/C3-PLUG-CLIENT', 'logical-connection-point': 'XPDR1-CLIENT3', 'connection-map-lcp': 'XPDR1-NETWORK2', 'port-direction': 'bidirectional', @@ -180,7 +180,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase): response = test_utils_rfc8040.portmapping_request("XPDRA01", "XPDR1-CLIENT4") self.assertEqual(response['status_code'], requests.codes.ok) self.assertIn( - {'supporting-port': 'C4', + {'supporting-port': 'C4', 'xponder-type': 'tpdr', 'supporting-circuit-pack-name': '1/0/C4-PLUG-CLIENT', 'logical-connection-point': 'XPDR1-CLIENT4', 'port-direction': 'bidirectional', 'port-qual': 'xpdr-client', 'lcp-hash-val': 'AO9UFkY/TLY1', diff --git a/tests/transportpce_tests/1.2.1/test04_renderer_service_path_nominal.py b/tests/transportpce_tests/1.2.1/test04_renderer_service_path_nominal.py index 485ce4169..9f8c25f1d 100644 --- a/tests/transportpce_tests/1.2.1/test04_renderer_service_path_nominal.py +++ b/tests/transportpce_tests/1.2.1/test04_renderer_service_path_nominal.py @@ -76,7 +76,7 @@ class TransportPCERendererTesting(unittest.TestCase): {'supporting-port': '1', 'supporting-circuit-pack-name': '1/0/1-PLUG-NET', 'logical-connection-point': 'XPDR1-NETWORK1', 'port-direction': 'bidirectional', 'connection-map-lcp': 'XPDR1-CLIENT1', 'port-qual': 'xpdr-network', - 'lcp-hash-val': 'OSvMgUyP+mE=', + 'lcp-hash-val': 'OSvMgUyP+mE=', 'xponder-type': 'tpdr', 'port-admin-state': 'InService', 'port-oper-state': 'InService'}, res['nodes'][0]['mapping']) self.assertIn( @@ -84,7 +84,7 @@ class TransportPCERendererTesting(unittest.TestCase): 'supporting-circuit-pack-name': '1/0/C1-PLUG-CLIENT', 'logical-connection-point': 'XPDR1-CLIENT1', 'port-direction': 'bidirectional', 'connection-map-lcp': 'XPDR1-NETWORK1', 'port-qual': 'xpdr-client', - 'lcp-hash-val': 'AO9UFkY/TLYw', + 'lcp-hash-val': 'AO9UFkY/TLYw', 'xponder-type': 'tpdr', 'port-admin-state': 'InService', 'port-oper-state': 'InService'}, res['nodes'][0]['mapping']) diff --git a/tests/transportpce_tests/2.2.1/test01_portmapping.py b/tests/transportpce_tests/2.2.1/test01_portmapping.py index fa650b742..1a85bcd6e 100644 --- a/tests/transportpce_tests/2.2.1/test01_portmapping.py +++ b/tests/transportpce_tests/2.2.1/test01_portmapping.py @@ -137,7 +137,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase): 'supporting-port': '1', 'supporting-circuit-pack-name': '1/0/1-PLUG-NET', 'logical-connection-point': 'XPDR1-NETWORK1', 'port-qual': 'xpdr-network', 'port-direction': 'bidirectional', 'connection-map-lcp': 'XPDR1-CLIENT1', - 'lcp-hash-val': 'AMkDwQ7xTmRI', + 'lcp-hash-val': 'AMkDwQ7xTmRI', 'xponder-type': 'tpdr', 'port-admin-state': 'InService', 'port-oper-state': 'InService'}, response['mapping']) @@ -149,7 +149,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase): 'supporting-port': '1', 'supporting-circuit-pack-name': '1/0/2-PLUG-NET', 'logical-connection-point': 'XPDR1-NETWORK2', 'port-direction': 'bidirectional', 'connection-map-lcp': 'XPDR1-CLIENT2', 'port-qual': 'xpdr-network', - 'lcp-hash-val': 'AMkDwQ7xTmRL', + 'lcp-hash-val': 'AMkDwQ7xTmRL', 'xponder-type': 'tpdr', 'port-admin-state': 'InService', 'port-oper-state': 'InService'}, response['mapping']) @@ -162,7 +162,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase): 'supporting-circuit-pack-name': '1/0/1-PLUG-CLIENT', 'logical-connection-point': 'XPDR1-CLIENT1', 'port-direction': 'bidirectional', 'connection-map-lcp': 'XPDR1-NETWORK1', 'port-qual': 'xpdr-client', - 'lcp-hash-val': 'AJUUr6I5fALj', + 'lcp-hash-val': 'AJUUr6I5fALj', 'xponder-type': 'tpdr', 'port-admin-state': 'InService', 'port-oper-state': 'InService'}, response['mapping']) @@ -175,7 +175,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase): 'supporting-circuit-pack-name': '1/0/2-PLUG-CLIENT', 'logical-connection-point': 'XPDR1-CLIENT2', 'port-direction': 'bidirectional', 'connection-map-lcp': 'XPDR1-NETWORK2', 'port-qual': 'xpdr-client', - 'lcp-hash-val': 'AJUUr6I5fALg', + 'lcp-hash-val': 'AJUUr6I5fALg', 'xponder-type': 'tpdr', 'port-admin-state': 'InService', 'port-oper-state': 'InService'}, response['mapping']) diff --git a/tests/transportpce_tests/2.2.1/test06_renderer_service_path_nominal.py b/tests/transportpce_tests/2.2.1/test06_renderer_service_path_nominal.py index 1abc1e31d..74c5e00fe 100644 --- a/tests/transportpce_tests/2.2.1/test06_renderer_service_path_nominal.py +++ b/tests/transportpce_tests/2.2.1/test06_renderer_service_path_nominal.py @@ -72,7 +72,7 @@ class TransportPCERendererTesting(unittest.TestCase): 'supporting-port': '1', 'supporting-circuit-pack-name': '1/0/1-PLUG-NET', 'logical-connection-point': 'XPDR1-NETWORK1', 'port-qual': 'xpdr-network', 'port-direction': 'bidirectional', 'connection-map-lcp': 'XPDR1-CLIENT1', - 'lcp-hash-val': 'AMkDwQ7xTmRI', + 'lcp-hash-val': 'AMkDwQ7xTmRI', 'xponder-type': 'tpdr', 'port-admin-state': 'InService', 'port-oper-state': 'InService'}, res['nodes'][0]['mapping']) self.assertIn( @@ -81,7 +81,7 @@ class TransportPCERendererTesting(unittest.TestCase): 'supporting-circuit-pack-name': '1/0/1-PLUG-CLIENT', 'logical-connection-point': 'XPDR1-CLIENT1', 'port-direction': 'bidirectional', 'connection-map-lcp': 'XPDR1-NETWORK1', 'port-qual': 'xpdr-client', - 'lcp-hash-val': 'AJUUr6I5fALj', + 'lcp-hash-val': 'AJUUr6I5fALj', 'xponder-type': 'tpdr', 'port-admin-state': 'InService', 'port-oper-state': 'InService'}, res['nodes'][0]['mapping'])