From 7f652b5817adc273f3a4cc6cb3ac2ef7bb952483 Mon Sep 17 00:00:00 2001 From: Balagangadhar Bathula Date: Tue, 16 Aug 2022 15:30:59 -0400 Subject: [PATCH] Re-open:Drop service-name from ODU connection name - Fix the bug w.r.t droping service-name from ODU connection - Service-name is still concatenated to the lower order OTN network interfaces and client interfaces. - Drop the service-name only from the ODU connection, so it will not be too long. - Refer to the patch https://git.opendaylight.org/gerrit/c/transportpce/+/100830 Commit hash: 397a481aa0674d4afea0bef72eb57276027bc343 JIRA: TRNSPRTPCE-628 Change-Id: Ic1df4fb69dd10977fb18ecb3574224589caec622 Signed-off-by: Balagangadhar Bathula --- .../crossconnect/CrossConnectImpl221.java | 8 +-- .../crossconnect/CrossConnectImpl710.java | 19 +++++-- .../OpenRoadmInterfaceFactory.java | 12 ++--- .../OpenRoadmOtnInterface221.java | 16 +++--- .../OpenRoadmOtnInterface710.java | 5 +- .../OtnDeviceRendererServiceImpl.java | 8 +-- .../2.2.1/test07_otn_renderer.py | 20 +++---- .../2.2.1/test08_otn_sh_renderer.py | 28 +++++----- .../2.2.1/test11_otn_end2end.py | 52 +++++++++---------- ...15_otn_end2end_with_intermediate_switch.py | 49 +++++++++-------- .../7.1/test02_otn_renderer.py | 22 ++++---- .../hybrid/test02_B100G_end2end.py | 28 +++++----- 12 files changed, 140 insertions(+), 127 deletions(-) diff --git a/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl221.java b/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl221.java index 529af506c..c912f3731 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl221.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl221.java @@ -297,8 +297,10 @@ public class CrossConnectImpl221 { sortedCreatedOduInterfaces.sort((s1,s2) -> s1.compareTo(s2)); String srcTp = sortedCreatedOduInterfaces.get(0); String dstTp = sortedCreatedOduInterfaces.get(1); + // Strip the service name from the src and dst + String oduXConnectionName = srcTp.split(":")[0] + "-x-" + dstTp.split(":")[0]; OduConnectionBuilder oduConnectionBuilder = new OduConnectionBuilder() - .setConnectionName(srcTp + "-x-" + dstTp) + .setConnectionName(oduXConnectionName) .setDestination(new org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.odu.connection .DestinationBuilder().setDstIf(dstTp).build()) .setSource(new org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.odu.connection @@ -331,8 +333,8 @@ public class CrossConnectImpl221 { deviceTx.commit(Timeouts.DEVICE_WRITE_TIMEOUT, Timeouts.DEVICE_WRITE_TIMEOUT_UNIT); try { commit.get(); - LOG.info("Otn-connection successfully created: {}-{}", srcTp, dstTp); - return Optional.of(srcTp + "-x-" + dstTp); + LOG.info("Otn-connection successfully created: {}", oduXConnectionName); + return Optional.of(oduXConnectionName); } catch (InterruptedException | ExecutionException e) { LOG.warn("Failed to post {}.", oduConnectionBuilder.build(), e); } diff --git a/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl710.java b/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl710.java index ef8fa13e0..c2063d908 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl710.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl710.java @@ -57,9 +57,20 @@ public class CrossConnectImpl710 { String deviceId = node.getNodeId(); String srcTp = createdOduInterfaces.get(0); String dstTp = createdOduInterfaces.get(1); - + LOG.debug("Client TP: {}, Network TP: {}, Network2TP: {} SrcTP: {}, DstTP: {}", + node.getClientTp(), node.getNetworkTp(), node.getNetwork2Tp(), srcTp, dstTp); + if (!srcTp.contains(node.getClientTp())) { + // If the src-tp does not contain client port, then we swap src-tp & dest-tp + String tmp; + tmp = dstTp; + dstTp = srcTp; + srcTp = tmp; + LOG.debug("After swap, SrcTP: {}, DstTP: {}", srcTp, dstTp); + } + // Strip the service name from the src and dst + String oduXConnectionName = srcTp.split(":")[0] + "-x-" + dstTp.split(":")[0]; OduConnectionBuilder oduConnectionBuilder = new OduConnectionBuilder() - .setConnectionName(srcTp + "-x-" + dstTp) + .setConnectionName(oduXConnectionName) .setDestination(new org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.odu.connection .DestinationBuilder().setDstIf(dstTp).build()) .setSource(new org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.odu.connection @@ -92,8 +103,8 @@ public class CrossConnectImpl710 { deviceTx.commit(Timeouts.DEVICE_WRITE_TIMEOUT, Timeouts.DEVICE_WRITE_TIMEOUT_UNIT); try { commit.get(); - LOG.info("Otn-connection successfully created: {}-{}", srcTp, dstTp); - return Optional.of(srcTp + "-x-" + dstTp); + LOG.info("Otn-connection successfully created: {}", oduXConnectionName); + return Optional.of(oduXConnectionName); } catch (InterruptedException | ExecutionException e) { LOG.warn("Failed to post {}.", oduConnectionBuilder.build(), e); } diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterfaceFactory.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterfaceFactory.java index b7b3b220a..1e61dc90d 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterfaceFactory.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterfaceFactory.java @@ -273,14 +273,14 @@ public class OpenRoadmInterfaceFactory { LOG.error(OTN_FUNTIONS_ARE_NOT_SUPPORTED_BY_OPENROADM_MODELS_1_2_1_MSG); return null; case StringConstants.OPENROADM_DEVICE_VERSION_2_2_1: - return openRoadmOtnInterface221.createOpenRoadmOdu0Interface(nodeId, logicalConnPoint, + return openRoadmOtnInterface221.createOpenRoadmOdu0Interface(nodeId, logicalConnPoint, servicename, isCTP, tribPortNumber, tribSlotIndex, apiInfoA, apiInfoZ, payLoadType); default: return null; } } - public String createOpenRoadmOdu2Interface(String nodeId, String logicalConnPoint, + public String createOpenRoadmOdu2Interface(String nodeId, String logicalConnPoint, String servicename, boolean isCTP, int tribPortNumber, int tribSlotIndex, AEndApiInfo apiInfoA, ZEndApiInfo apiInfoZ, String payLoadType) throws OpenRoadmInterfaceException { @@ -289,14 +289,14 @@ public class OpenRoadmInterfaceFactory { LOG.error(OTN_FUNTIONS_ARE_NOT_SUPPORTED_BY_OPENROADM_MODELS_1_2_1_MSG); return null; case StringConstants.OPENROADM_DEVICE_VERSION_2_2_1: - return openRoadmOtnInterface221.createOpenRoadmOdu2Interface(nodeId, logicalConnPoint, + return openRoadmOtnInterface221.createOpenRoadmOdu2Interface(nodeId, logicalConnPoint, servicename, isCTP, tribPortNumber, tribSlotIndex, apiInfoA, apiInfoZ, payLoadType); default: return null; } } - public String createOpenRoadmOdu2eInterface(String nodeId, String logicalConnPoint, + public String createOpenRoadmOdu2eInterface(String nodeId, String logicalConnPoint, String servicename, boolean isCTP, int tribPortNumber, int tribSlotIndex, AEndApiInfo apiInfoA, ZEndApiInfo apiInfoZ, String payLoadType) throws OpenRoadmInterfaceException { @@ -306,7 +306,7 @@ public class OpenRoadmInterfaceFactory { LOG.error(OTN_FUNTIONS_ARE_NOT_SUPPORTED_BY_OPENROADM_MODELS_1_2_1_MSG); return null; case StringConstants.OPENROADM_DEVICE_VERSION_2_2_1: - return openRoadmOtnInterface221.createOpenRoadmOdu2eInterface(nodeId, logicalConnPoint, + return openRoadmOtnInterface221.createOpenRoadmOdu2eInterface(nodeId, logicalConnPoint, servicename, isCTP, tribPortNumber, tribSlotIndex, apiInfoA, apiInfoZ, payLoadType); default: return null; @@ -326,7 +326,7 @@ public class OpenRoadmInterfaceFactory { LOG.error(OTN_FUNTIONS_ARE_NOT_SUPPORTED_BY_OPENROADM_MODELS_2_2_1_MSG); return null; case StringConstants.OPENROADM_DEVICE_VERSION_7_1: - return openRoadmOtnInterface710.createOpenRoadmOdu4Interface(nodeId, logicalConnPoint, + return openRoadmOtnInterface710.createOpenRoadmOdu4Interface(nodeId, logicalConnPoint, serviceName, payLoad, isNetworkPort, minTribSlotNumber, maxTribSlotNumber); default: return null; diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmOtnInterface221.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmOtnInterface221.java index 3ce172da3..907992286 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmOtnInterface221.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmOtnInterface221.java @@ -130,7 +130,7 @@ public class OpenRoadmOtnInterface221 { return ethernetInterfaceName; } - public String createOpenRoadmOdu2eInterface(String nodeId, String logicalConnPoint, + public String createOpenRoadmOdu2eInterface(String nodeId, String logicalConnPoint, String serviceName, boolean isCTP, int tribPortNumber, int tribSlotIndex, AEndApiInfo apiInfoA, ZEndApiInfo apiInfoZ, String payloadType) throws OpenRoadmInterfaceException { @@ -140,7 +140,7 @@ public class OpenRoadmOtnInterface221 { String.format(MAPPING_ERROR_EXCEPTION_MESSAGE, nodeId, logicalConnPoint)); } InterfaceBuilder oduInterfaceBldr = createGenericInterfaceBuilder(mapping, OtnOdu.VALUE, - logicalConnPoint + "-ODU2e"); + logicalConnPoint + "-ODU2e" + ":" + serviceName); if (mapping.getSupportingOdu4() != null) { oduInterfaceBldr.setSupportingInterface(mapping.getSupportingOdu4()); } @@ -206,8 +206,8 @@ public class OpenRoadmOtnInterface221 { return oduInterfaceBldr.getName(); } - public String createOpenRoadmOdu0Interface(String nodeId, String logicalConnPoint, - boolean isCTP, int tribPortNumber, int tribSlotIndex, AEndApiInfo apiInfoA, ZEndApiInfo apiInfoZ, + public String createOpenRoadmOdu0Interface(String nodeId, String logicalConnPoint, String servicename, + boolean isCTP, int tribPortNumber, int tribSlotIndex, AEndApiInfo apiInfoA, ZEndApiInfo apiInfoZ, String payloadType) throws OpenRoadmInterfaceException { Mapping mapping = this.portMapping.getMapping(nodeId, logicalConnPoint); @@ -216,7 +216,7 @@ public class OpenRoadmOtnInterface221 { String.format(MAPPING_ERROR_EXCEPTION_MESSAGE, nodeId, logicalConnPoint)); } InterfaceBuilder oduInterfaceBldr = createGenericInterfaceBuilder(mapping, OtnOdu.VALUE, - logicalConnPoint + "-ODU0"); + logicalConnPoint + "-ODU0" + ":" + servicename); if (mapping.getSupportingOdu4() != null) { oduInterfaceBldr.setSupportingInterface(mapping.getSupportingOdu4()); } @@ -283,8 +283,8 @@ public class OpenRoadmOtnInterface221 { } public String createOpenRoadmOdu2Interface(String nodeId, String logicalConnPoint, - boolean isCTP, int tribPortNumber, int tribSlotIndex, AEndApiInfo apiInfoA, ZEndApiInfo apiInfoZ, - String payloadType) throws OpenRoadmInterfaceException { + String servicename, boolean isCTP, int tribPortNumber, int tribSlotIndex, AEndApiInfo apiInfoA, + ZEndApiInfo apiInfoZ, String payloadType) throws OpenRoadmInterfaceException { Mapping mapping = this.portMapping.getMapping(nodeId, logicalConnPoint); if (mapping == null) { @@ -292,7 +292,7 @@ public class OpenRoadmOtnInterface221 { String.format(MAPPING_ERROR_EXCEPTION_MESSAGE, nodeId, logicalConnPoint)); } InterfaceBuilder oduInterfaceBldr = createGenericInterfaceBuilder(mapping, OtnOdu.VALUE, - logicalConnPoint + "-ODU2"); + logicalConnPoint + "-ODU2" + ":" + servicename); if (mapping.getSupportingOdu4() != null) { oduInterfaceBldr.setSupportingInterface(mapping.getSupportingOdu4()); } diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmOtnInterface710.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmOtnInterface710.java index 8764dba3f..4b86cf804 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmOtnInterface710.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmOtnInterface710.java @@ -86,7 +86,7 @@ public class OpenRoadmOtnInterface710 { nodeId, logicalConnPoint)); } - public String createOpenRoadmOdu4Interface(String nodeId, String logicalConnPoint, + public String createOpenRoadmOdu4Interface(String nodeId, String logicalConnPoint, String serviceName, String payLoad, boolean isNetworkPort, OpucnTribSlotDef minTribSlotNumber, OpucnTribSlotDef maxTribSlotNumber) throws OpenRoadmInterfaceException { Mapping portMap = this.portMapping.getMapping(nodeId, logicalConnPoint); @@ -111,7 +111,8 @@ public class OpenRoadmOtnInterface710 { // Supporting interface is a list for B100G (7.1) device models supportingInterfaceList.add(supportingInterface); - InterfaceBuilder oduIfBuilder = createGenericInterfaceBuilder(portMap, OtnOdu.VALUE, logicalConnPoint + "-ODU4") + InterfaceBuilder oduIfBuilder = createGenericInterfaceBuilder( + portMap, OtnOdu.VALUE, logicalConnPoint + "-ODU4" + ":" + serviceName) .setSupportingInterfaceList(supportingInterfaceList); // Agument ODU4 specific interface data OduBuilder oduBuilder = new OduBuilder().setRate(ODU4.VALUE) diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/OtnDeviceRendererServiceImpl.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/OtnDeviceRendererServiceImpl.java index 3c8f6fa51..d7b2c4500 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/OtnDeviceRendererServiceImpl.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/OtnDeviceRendererServiceImpl.java @@ -366,15 +366,15 @@ public class OtnDeviceRendererServiceImpl implements OtnDeviceRendererService { createdEthInterfaces.add(openRoadmInterfaceFactory.createOpenRoadmEth10GInterface( node.getNodeId(), node.getClientTp())); createdOduInterfaces.add( - // suppporting interface?, payload ? + // supporting interface?, payload ? openRoadmInterfaceFactory.createOpenRoadmOdu2eInterface(node.getNodeId(), - node.getClientTp(), false, input.getTribPortNumber(), + node.getClientTp(), input.getServiceName(), false, input.getTribPortNumber(), input.getTribSlot(), apiInfoA, apiInfoZ, PT_03)); } createdOduInterfaces.add( // supporting interface? payload ? openRoadmInterfaceFactory.createOpenRoadmOdu2eInterface(node.getNodeId(), node.getNetworkTp(), - true, input.getTribPortNumber(), input.getTribSlot(), null, + input.getServiceName(), true, input.getTribPortNumber(), input.getTribSlot(), null, null, null)); linkTpList.add( new LinkTpBuilder().setNodeId(node.getNodeId()).setTpId(node.getNetworkTp()).build()); @@ -382,7 +382,7 @@ public class OtnDeviceRendererServiceImpl implements OtnDeviceRendererService { createdOduInterfaces.add( // supporting interface? payload ? openRoadmInterfaceFactory.createOpenRoadmOdu2eInterface(node.getNodeId(), - node.getNetwork2Tp(), true, input.getTribPortNumber(), + node.getNetwork2Tp(), input.getServiceName(),true, input.getTribPortNumber(), input.getTribSlot(), null, null, null)); linkTpList.add( new LinkTpBuilder().setNodeId(node.getNodeId()).setTpId(node.getNetworkTp()).build()); diff --git a/tests/transportpce_tests/2.2.1/test07_otn_renderer.py b/tests/transportpce_tests/2.2.1/test07_otn_renderer.py index e9fca26d0..c27c5e8b7 100644 --- a/tests/transportpce_tests/2.2.1/test07_otn_renderer.py +++ b/tests/transportpce_tests/2.2.1/test07_otn_renderer.py @@ -224,8 +224,8 @@ class TransportPCEtesting(unittest.TestCase): self.assertIn('XPDR1-CLIENT4-ODU2e-x-XPDR1-NETWORK1-ODU2e', response['output']['node-interface'][0]['connection-id']) self.assertIn('XPDR1-CLIENT4-ETHERNET10G', response['output']['node-interface'][0]['eth-interface-id']) - self.assertIn('XPDR1-NETWORK1-ODU2e', response['output']['node-interface'][0]['odu-interface-id']) - self.assertIn('XPDR1-CLIENT4-ODU2e', response['output']['node-interface'][0]['odu-interface-id']) + self.assertIn('XPDR1-NETWORK1-ODU2e:service1', response['output']['node-interface'][0]['odu-interface-id']) + self.assertIn('XPDR1-CLIENT4-ODU2e:service1', response['output']['node-interface'][0]['odu-interface-id']) def test_12_check_interface_10GE_CLIENT(self): response = test_utils.check_node_attribute_request("SPDR-SA1", "interface", "XPDR1-CLIENT4-ETHERNET10G") @@ -242,10 +242,10 @@ class TransportPCEtesting(unittest.TestCase): def test_13_check_interface_ODU2E_CLIENT(self): response = test_utils.check_node_attribute_request( - "SPDR-SA1", "interface", "XPDR1-CLIENT4-ODU2e") + "SPDR-SA1", "interface", "XPDR1-CLIENT4-ODU2e:service1") self.assertEqual(response['status_code'], requests.codes.ok) - input_dict_1 = {'name': 'XPDR1-CLIENT4-ODU2e', + input_dict_1 = {'name': 'XPDR1-CLIENT4-ODU2e:service1', 'administrative-state': 'inService', 'supporting-circuit-pack-name': 'CP1-SFP4', 'supporting-interface': 'XPDR1-CLIENT4-ETHERNET10G', @@ -267,9 +267,9 @@ class TransportPCEtesting(unittest.TestCase): def test_14_check_interface_ODU2E_NETWORK(self): response = test_utils.check_node_attribute_request( - "SPDR-SA1", "interface", "XPDR1-NETWORK1-ODU2e") + "SPDR-SA1", "interface", "XPDR1-NETWORK1-ODU2e:service1") self.assertEqual(response['status_code'], requests.codes.ok) - input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU2e', 'administrative-state': 'inService', + input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU2e:service1', 'administrative-state': 'inService', 'supporting-circuit-pack-name': 'CP1-CFP0', 'supporting-interface': 'XPDR1-NETWORK1-ODU4', 'type': 'org-openroadm-interfaces:otnOdu', @@ -308,9 +308,9 @@ class TransportPCEtesting(unittest.TestCase): self.assertDictEqual(dict(response['odu-connection'][0], **input_dict_1), response['odu-connection'][0]) - self.assertDictEqual({'dst-if': 'XPDR1-NETWORK1-ODU2e'}, + self.assertDictEqual({'dst-if': 'XPDR1-NETWORK1-ODU2e:service1'}, response['odu-connection'][0]['destination']) - self.assertDictEqual({'src-if': 'XPDR1-CLIENT4-ODU2e'}, + self.assertDictEqual({'src-if': 'XPDR1-CLIENT4-ODU2e:service1'}, response['odu-connection'][0]['source']) def test_16_otn_service_path_delete_10GE(self): @@ -337,12 +337,12 @@ class TransportPCEtesting(unittest.TestCase): def test_18_check_no_interface_ODU2E_NETWORK(self): response = test_utils.check_node_attribute_request( - "SPDR-SA1", "interface", "XPDR1-NETWORK1-ODU2e") + "SPDR-SA1", "interface", "XPDR1-NETWORK1-ODU2e:service1") self.assertEqual(response['status_code'], requests.codes.conflict) def test_19_check_no_interface_ODU2E_CLIENT(self): response = test_utils.check_node_attribute_request( - "SPDR-SA1", "interface", "XPDR1-CLIENT4-ODU2e") + "SPDR-SA1", "interface", "XPDR1-CLIENT4-ODU2e:service1") self.assertEqual(response['status_code'], requests.codes.conflict) def test_20_check_no_interface_10GE_CLIENT(self): diff --git a/tests/transportpce_tests/2.2.1/test08_otn_sh_renderer.py b/tests/transportpce_tests/2.2.1/test08_otn_sh_renderer.py index a035f38e9..effe77bb0 100644 --- a/tests/transportpce_tests/2.2.1/test08_otn_sh_renderer.py +++ b/tests/transportpce_tests/2.2.1/test08_otn_sh_renderer.py @@ -516,9 +516,9 @@ class TransportPCEtesting(unittest.TestCase): def test_13_check_interface_ODU2E_CLIENT(self): response = test_utils.check_node_attribute_request( - "SPDR-SA1", "interface", "XPDR1-CLIENT1-ODU2e") + "SPDR-SA1", "interface", "XPDR1-CLIENT1-ODU2e:SPDRA-SPDRC-10G") self.assertEqual(response['status_code'], requests.codes.ok) - input_dict_1 = {'name': 'XPDR1-CLIENT1-ODU2e', + input_dict_1 = {'name': 'XPDR1-CLIENT1-ODU2e:SPDRA-SPDRC-10G', 'administrative-state': 'inService', 'supporting-circuit-pack-name': 'CP1-SFP4', 'supporting-interface': 'XPDR1-CLIENT1-ETHERNET10G', @@ -550,16 +550,16 @@ class TransportPCEtesting(unittest.TestCase): } self.assertDictEqual(dict(input_dict_1, **response['odu-connection'][0]), response['odu-connection'][0]) - self.assertDictEqual({'dst-if': 'XPDR1-NETWORK1-ODU2e'}, + self.assertDictEqual({'dst-if': 'XPDR1-NETWORK1-ODU2e:SPDRA-SPDRC-10G'}, response['odu-connection'][0]['destination']) - self.assertDictEqual({'src-if': 'XPDR1-CLIENT1-ODU2e'}, + self.assertDictEqual({'src-if': 'XPDR1-CLIENT1-ODU2e:SPDRA-SPDRC-10G'}, response['odu-connection'][0]['source']) def test_15_check_interface_ODU2E_NETWORK(self): response = test_utils.check_node_attribute_request( - "SPDR-SA1", "interface", "XPDR1-NETWORK1-ODU2e") + "SPDR-SA1", "interface", "XPDR1-NETWORK1-ODU2e:SPDRA-SPDRC-10G") self.assertEqual(response['status_code'], requests.codes.ok) - input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU2e', + input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU2e-SPDRA:SPDRC-10G', 'administrative-state': 'inService', 'supporting-circuit-pack-name': 'CP1-CFP0', 'supporting-interface': 'XPDR1-NETWORK1-ODU4', @@ -588,9 +588,9 @@ class TransportPCEtesting(unittest.TestCase): # Test the interfaces on SPDR-C1 def test_16_check_interface_ODU2E_NETWORK(self): response = test_utils.check_node_attribute_request( - "SPDR-SC1", "interface", "XPDR1-NETWORK1-ODU2e") + "SPDR-SC1", "interface", "XPDR1-NETWORK1-ODU2e:SPDRA-SPDRC-10G") self.assertEqual(response['status_code'], requests.codes.ok) - input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU2e', + input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU2e:SPDRA-SPDRC-10G', 'administrative-state': 'inService', 'supporting-circuit-pack-name': 'CP1-CFP0', 'supporting-interface': 'XPDR1-NETWORK1-ODU4', @@ -631,9 +631,9 @@ class TransportPCEtesting(unittest.TestCase): def test_18_check_interface_ODU2E_CLIENT(self): response = test_utils.check_node_attribute_request( - "SPDR-SC1", "interface", "XPDR1-CLIENT1-ODU2e") + "SPDR-SC1", "interface", "XPDR1-CLIENT1-ODU2e:SPDRA-SPDRC-10G") self.assertEqual(response['status_code'], requests.codes.ok) - input_dict_1 = {'name': 'XPDR1-CLIENT1-ODU2e', + input_dict_1 = {'name': 'XPDR1-CLIENT1-ODU2e-SPDRA-SPDRC-10G', 'administrative-state': 'inService', 'supporting-circuit-pack-name': 'CP1-SFP4', 'supporting-interface': 'XPDR1-CLIENT1-ETHERNET10G', @@ -664,16 +664,16 @@ class TransportPCEtesting(unittest.TestCase): } self.assertDictEqual(dict(input_dict_1, **response['odu-connection'][0]), response['odu-connection'][0]) - self.assertDictEqual({'dst-if': 'XPDR1-NETWORK1-ODU2e'}, + self.assertDictEqual({'dst-if': 'XPDR1-NETWORK1-ODU2e:SPDRA-SPDRC-10G'}, response['odu-connection'][0]['destination']) - self.assertDictEqual({'src-if': 'XPDR1-CLIENT1-ODU2e'}, + self.assertDictEqual({'src-if': 'XPDR1-CLIENT1-ODU2e:SPDRA-SPDRC-10G'}, response['odu-connection'][0]['source']) def test_20_check_interface_ODU2E_NETWORK(self): response = test_utils.check_node_attribute_request( - "SPDR-SC1", "interface", "XPDR1-NETWORK1-ODU2e") + "SPDR-SC1", "interface", "XPDR1-NETWORK1-ODU2e:SPDRA-SPDRC-10G") self.assertEqual(response['status_code'], requests.codes.ok) - input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU2e', + input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU2e:SPDRA-SPDRC-10G', 'administrative-state': 'inService', 'supporting-circuit-pack-name': 'CP1-CFP0', 'supporting-interface': 'XPDR1-NETWORK1-ODU4', diff --git a/tests/transportpce_tests/2.2.1/test11_otn_end2end.py b/tests/transportpce_tests/2.2.1/test11_otn_end2end.py index 02398aa83..b6181acf6 100644 --- a/tests/transportpce_tests/2.2.1/test11_otn_end2end.py +++ b/tests/transportpce_tests/2.2.1/test11_otn_end2end.py @@ -609,9 +609,9 @@ class TransportPCEtesting(unittest.TestCase): def test_32_check_interface_ODU2E_CLIENT_spdra(self): response = test_utils.check_node_attribute_request( - 'SPDR-SA1', 'interface', 'XPDR1-CLIENT1-ODU2e') + 'SPDR-SA1', 'interface', 'XPDR1-CLIENT1-ODU2e:service1-10GE') self.assertEqual(response['status_code'], requests.codes.ok) - input_dict_1 = {'name': 'XPDR1-CLIENT1-ODU2e', + input_dict_1 = {'name': 'XPDR1-CLIENT1-ODU2e:service1-10GE', 'administrative-state': 'inService', 'supporting-circuit-pack-name': 'CP1-SFP4', 'supporting-interface': 'XPDR1-CLIENT1-ETHERNET10G', @@ -633,9 +633,9 @@ class TransportPCEtesting(unittest.TestCase): def test_33_check_interface_ODU2E_NETWORK_spdra(self): response = test_utils.check_node_attribute_request( - 'SPDR-SA1', 'interface', 'XPDR1-NETWORK1-ODU2e') + 'SPDR-SA1', 'interface', 'XPDR1-NETWORK1-ODU2e:service1-10GE') self.assertEqual(response['status_code'], requests.codes.ok) - input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU2e', + input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU2e:service1-10GE', 'administrative-state': 'inService', 'supporting-circuit-pack-name': 'CP1-CFP0', 'supporting-interface': 'XPDR1-NETWORK1-ODU4', @@ -671,9 +671,9 @@ class TransportPCEtesting(unittest.TestCase): self.assertDictEqual(dict(input_dict_1, **response['odu-connection'][0]), response['odu-connection'][0]) - self.assertDictEqual({'dst-if': 'XPDR1-NETWORK1-ODU2e'}, + self.assertDictEqual({'dst-if': 'XPDR1-NETWORK1-ODU2e:service1-10GE'}, response['odu-connection'][0]['destination']) - self.assertDictEqual({'src-if': 'XPDR1-CLIENT1-ODU2e'}, + self.assertDictEqual({'src-if': 'XPDR1-CLIENT1-ODU2e:service1-10GE'}, response['odu-connection'][0]['source']) def test_35_check_interface_10GE_CLIENT_spdrc(self): @@ -694,9 +694,9 @@ class TransportPCEtesting(unittest.TestCase): def test_36_check_interface_ODU2E_CLIENT_spdrc(self): response = test_utils.check_node_attribute_request( - 'SPDR-SC1', 'interface', 'XPDR1-CLIENT1-ODU2e') + 'SPDR-SC1', 'interface', 'XPDR1-CLIENT1-ODU2e:service1-10GE') self.assertEqual(response['status_code'], requests.codes.ok) - input_dict_1 = {'name': 'XPDR1-CLIENT1-ODU2e', + input_dict_1 = {'name': 'XPDR1-CLIENT1-ODU2e:service1-10GE', 'administrative-state': 'inService', 'supporting-circuit-pack-name': 'CP1-SFP4', 'supporting-interface': 'XPDR1-CLIENT1-ETHERNET10G', @@ -718,9 +718,9 @@ class TransportPCEtesting(unittest.TestCase): def test_37_check_interface_ODU2E_NETWORK_spdrc(self): response = test_utils.check_node_attribute_request( - 'SPDR-SC1', 'interface', 'XPDR1-NETWORK1-ODU2e') + 'SPDR-SC1', 'interface', 'XPDR1-NETWORK1-ODU2e:service1-10GE') self.assertEqual(response['status_code'], requests.codes.ok) - input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU2e', + input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU2e:service1-10GE', 'administrative-state': 'inService', 'supporting-circuit-pack-name': 'CP1-CFP0', 'supporting-interface': 'XPDR1-NETWORK1-ODU4', @@ -760,9 +760,9 @@ class TransportPCEtesting(unittest.TestCase): self.assertDictEqual(dict(input_dict_1, **response['odu-connection'][0]), response['odu-connection'][0]) - self.assertDictEqual({'dst-if': 'XPDR1-NETWORK1-ODU2e'}, + self.assertDictEqual({'dst-if': 'XPDR1-NETWORK1-ODU2e:service1-10GE'}, response['odu-connection'][0]['destination']) - self.assertDictEqual({'src-if': 'XPDR1-CLIENT1-ODU2e'}, + self.assertDictEqual({'src-if': 'XPDR1-CLIENT1-ODU2e:service1-10GE'}, response['odu-connection'][0]['source']) def test_39_check_otn_topo_links(self): @@ -1117,9 +1117,9 @@ class TransportPCEtesting(unittest.TestCase): def test_73_check_interface_ODU0_CLIENT_spdra(self): response = test_utils.check_node_attribute_request( - 'SPDR-SA1', 'interface', 'XPDR3-CLIENT1-ODU0') + 'SPDR-SA1', 'interface', 'XPDR3-CLIENT1-ODU0:service1-1GE') self.assertEqual(response['status_code'], requests.codes.ok) - input_dict_1 = {'name': 'XPDR3-CLIENT1-ODU0', + input_dict_1 = {'name': 'XPDR3-CLIENT1-ODU0:service1-1GE', 'administrative-state': 'inService', 'supporting-circuit-pack-name': 'CP3-SFP1', 'supporting-interface': 'XPDR3-CLIENT1-ETHERNET1G', @@ -1140,9 +1140,9 @@ class TransportPCEtesting(unittest.TestCase): def test_74_check_interface_ODU0_NETWORK_spdra(self): response = test_utils.check_node_attribute_request( - 'SPDR-SA1', 'interface', 'XPDR3-NETWORK1-ODU0') + 'SPDR-SA1', 'interface', 'XPDR3-NETWORK1-ODU0:service1-1GE') self.assertEqual(response['status_code'], requests.codes.ok) - input_dict_1 = {'name': 'XPDR3-NETWORK1-ODU0', + input_dict_1 = {'name': 'XPDR3-NETWORK1-ODU0:service1-1GE', 'administrative-state': 'inService', 'supporting-circuit-pack-name': 'CP3-CFP0', 'supporting-interface': 'XPDR3-NETWORK1-ODU4', @@ -1176,9 +1176,9 @@ class TransportPCEtesting(unittest.TestCase): } self.assertDictEqual(dict(input_dict_1, **response['odu-connection'][0]), response['odu-connection'][0]) - self.assertDictEqual({'dst-if': 'XPDR3-NETWORK1-ODU0'}, + self.assertDictEqual({'dst-if': 'XPDR3-NETWORK1-ODU0:service1-1GE'}, response['odu-connection'][0]['destination']) - self.assertDictEqual({'src-if': 'XPDR3-CLIENT1-ODU0'}, + self.assertDictEqual({'src-if': 'XPDR3-CLIENT1-ODU0:service1-1GE'}, response['odu-connection'][0]['source']) def test_76_check_interface_1GE_CLIENT_spdrc(self): @@ -1199,9 +1199,9 @@ class TransportPCEtesting(unittest.TestCase): def test_77_check_interface_ODU0_CLIENT_spdrc(self): response = test_utils.check_node_attribute_request( - 'SPDR-SC1', 'interface', 'XPDR3-CLIENT1-ODU0') + 'SPDR-SC1', 'interface', 'XPDR3-CLIENT1-ODU0:service1-1GE') self.assertEqual(response['status_code'], requests.codes.ok) - input_dict_1 = {'name': 'XPDR3-CLIENT1-ODU0', + input_dict_1 = {'name': 'XPDR3-CLIENT1-ODU0:service1-1GE', 'administrative-state': 'inService', 'supporting-circuit-pack-name': 'CP3-SFP1', 'supporting-interface': 'XPDR3-CLIENT1-ETHERNET1G', @@ -1222,9 +1222,9 @@ class TransportPCEtesting(unittest.TestCase): def test_78_check_interface_ODU0_NETWORK_spdrc(self): response = test_utils.check_node_attribute_request( - 'SPDR-SC1', 'interface', 'XPDR3-NETWORK1-ODU0') + 'SPDR-SC1', 'interface', 'XPDR3-NETWORK1-ODU0:service1-1GE') self.assertEqual(response['status_code'], requests.codes.ok) - input_dict_1 = {'name': 'XPDR3-NETWORK1-ODU0', + input_dict_1 = {'name': 'XPDR3-NETWORK1-ODU0:service1-1GE', 'administrative-state': 'inService', 'supporting-circuit-pack-name': 'CP3-CFP0', 'supporting-interface': 'XPDR3-NETWORK1-ODU4', @@ -1261,9 +1261,9 @@ class TransportPCEtesting(unittest.TestCase): } self.assertDictEqual(dict(input_dict_1, **response['odu-connection'][0]), response['odu-connection'][0]) - self.assertDictEqual({'dst-if': 'XPDR3-NETWORK1-ODU0'}, + self.assertDictEqual({'dst-if': 'XPDR3-NETWORK1-ODU0:service1-1GE'}, response['odu-connection'][0]['destination']) - self.assertDictEqual({'src-if': 'XPDR3-CLIENT1-ODU0'}, + self.assertDictEqual({'src-if': 'XPDR3-CLIENT1-ODU0:service1-1GE'}, response['odu-connection'][0]['source']) def test_80_check_otn_topo_links(self): @@ -1317,12 +1317,12 @@ class TransportPCEtesting(unittest.TestCase): def test_85_check_no_interface_ODU0_NETWORK_spdra(self): response = test_utils.check_node_attribute_request( - 'SPDR-SA1', 'interface', 'XPDR3-NETWORK1-ODU0-service1') + 'SPDR-SA1', 'interface', 'XPDR3-NETWORK1-ODU0:service1-1GE') self.assertEqual(response['status_code'], requests.codes.conflict) def test_86_check_no_interface_ODU0_CLIENT_spdra(self): response = test_utils.check_node_attribute_request( - 'SPDR-SA1', 'interface', 'XPDR3-CLIENT1-ODU0-service1') + 'SPDR-SA1', 'interface', 'XPDR3-CLIENT1-ODU0:service1-1GE') self.assertEqual(response['status_code'], requests.codes.conflict) def test_87_check_no_interface_10GE_CLIENT_spdra(self): diff --git a/tests/transportpce_tests/2.2.1/test15_otn_end2end_with_intermediate_switch.py b/tests/transportpce_tests/2.2.1/test15_otn_end2end_with_intermediate_switch.py index 8a2f924fd..c0c650556 100644 --- a/tests/transportpce_tests/2.2.1/test15_otn_end2end_with_intermediate_switch.py +++ b/tests/transportpce_tests/2.2.1/test15_otn_end2end_with_intermediate_switch.py @@ -751,9 +751,9 @@ class TransportPCEtesting(unittest.TestCase): def test_043_check_interface_ODU2E_CLIENT_spdra(self): response = test_utils.check_node_attribute_request( - 'SPDR-SA1', 'interface', 'XPDR1-CLIENT1-ODU2e') + 'SPDR-SA1', 'interface', 'XPDR1-CLIENT1-ODU2e:service1-10GE') self.assertEqual(response['status_code'], requests.codes.ok) - input_dict_1 = {'name': 'XPDR1-CLIENT1-ODU2e', + input_dict_1 = {'name': 'XPDR1-CLIENT1-ODU2e:service1-10GE', 'administrative-state': 'inService', 'supporting-circuit-pack-name': 'CP1-SFP4', 'supporting-interface': 'XPDR1-CLIENT1-ETHERNET10G', @@ -779,7 +779,7 @@ class TransportPCEtesting(unittest.TestCase): response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu']) response2 = test_utils.check_node_attribute_request( - 'SPDR-SC1', 'interface', 'XPDR1-CLIENT1-ODU2e') + 'SPDR-SC1', 'interface', 'XPDR1-CLIENT1-ODU2e:service1-10GE') self.assertEqual(response['status_code'], requests.codes.ok) self.assertEqual(input_dict_2['tx-sapi'], response2['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['tx-dapi']) @@ -792,9 +792,9 @@ class TransportPCEtesting(unittest.TestCase): def test_044_check_interface_ODU2E_NETWORK_spdra(self): response = test_utils.check_node_attribute_request( - 'SPDR-SA1', 'interface', 'XPDR1-NETWORK1-ODU2e') + 'SPDR-SA1', 'interface', 'XPDR1-NETWORK1-ODU2e:service1-10GE') self.assertEqual(response['status_code'], requests.codes.ok) - input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU2e', + input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU2e:service1-10GE', 'administrative-state': 'inService', 'supporting-circuit-pack-name': 'CP1-CFP0', 'supporting-interface': 'XPDR1-NETWORK1-ODU4', @@ -830,9 +830,9 @@ class TransportPCEtesting(unittest.TestCase): } self.assertDictEqual(dict(input_dict_1, **response['odu-connection'][0]), response['odu-connection'][0]) - self.assertDictEqual({'dst-if': 'XPDR1-NETWORK1-ODU2e'}, + self.assertDictEqual({'dst-if': 'XPDR1-NETWORK1-ODU2e:service1-10GE'}, response['odu-connection'][0]['destination']) - self.assertDictEqual({'src-if': 'XPDR1-CLIENT1-ODU2e'}, + self.assertDictEqual({'src-if': 'XPDR1-CLIENT1-ODU2e:service1-10GE'}, response['odu-connection'][0]['source']) def test_046_check_interface_10GE_CLIENT_spdrc(self): @@ -851,9 +851,9 @@ class TransportPCEtesting(unittest.TestCase): def test_047_check_interface_ODU2E_CLIENT_spdrc(self): response = test_utils.check_node_attribute_request( - 'SPDR-SC1', 'interface', 'XPDR1-CLIENT1-ODU2e') + 'SPDR-SC1', 'interface', 'XPDR1-CLIENT1-ODU2e:service1-10GE') self.assertEqual(response['status_code'], requests.codes.ok) - input_dict_1 = {'name': 'XPDR1-CLIENT1-ODU2e', + input_dict_1 = {'name': 'XPDR1-CLIENT1-ODU2e:service1-10GE', 'administrative-state': 'inService', 'supporting-circuit-pack-name': 'CP1-SFP4', 'supporting-interface': 'XPDR1-CLIENT1-ETHERNET10G', @@ -879,7 +879,7 @@ class TransportPCEtesting(unittest.TestCase): response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu']) response2 = test_utils.check_node_attribute_request( - 'SPDR-SA1', 'interface', 'XPDR1-CLIENT1-ODU2e') + 'SPDR-SA1', 'interface', 'XPDR1-CLIENT1-ODU2e:service1-10GE') self.assertEqual(response['status_code'], requests.codes.ok) self.assertEqual(input_dict_2['tx-sapi'], response2['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['tx-dapi']) @@ -892,9 +892,9 @@ class TransportPCEtesting(unittest.TestCase): def test_048_check_interface_ODU2E_NETWORK_spdrc(self): response = test_utils.check_node_attribute_request( - 'SPDR-SC1', 'interface', 'XPDR1-NETWORK1-ODU2e') + 'SPDR-SC1', 'interface', 'XPDR1-NETWORK1-ODU2e:service1-10GE') self.assertEqual(response['status_code'], requests.codes.ok) - input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU2e', + input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU2e:service1-10GE', 'administrative-state': 'inService', 'supporting-circuit-pack-name': 'CP1-CFP0', 'supporting-interface': 'XPDR1-NETWORK1-ODU4', @@ -930,9 +930,9 @@ class TransportPCEtesting(unittest.TestCase): } self.assertDictEqual(dict(input_dict_1, **response['odu-connection'][0]), response['odu-connection'][0]) - self.assertDictEqual({'dst-if': 'XPDR1-NETWORK1-ODU2e'}, + self.assertDictEqual({'dst-if': 'XPDR1-NETWORK1-ODU2e:service1-10GE'}, response['odu-connection'][0]['destination']) - self.assertDictEqual({'src-if': 'XPDR1-CLIENT1-ODU2e'}, + self.assertDictEqual({'src-if': 'XPDR1-CLIENT1-ODU2e:service1-10GE'}, response['odu-connection'][0]['source']) def test_050_check_otn_topo_links(self): @@ -990,12 +990,12 @@ class TransportPCEtesting(unittest.TestCase): def test_055_check_no_interface_ODU2E_NETWORK_spdra(self): response = test_utils.check_node_attribute_request( - 'SPDR-SA1', 'interface', 'XPDR1-NETWORK1-ODU2e') + 'SPDR-SA1', 'interface', 'XPDR1-NETWORK1-ODU2e:service1-10GE') self.assertEqual(response['status_code'], requests.codes.conflict) def test_056_check_no_interface_ODU2E_CLIENT_spdra(self): response = test_utils.check_node_attribute_request( - 'SPDR-SA1', 'interface', 'XPDR1-CLIENT1-ODU2e') + 'SPDR-SA1', 'interface', 'XPDR1-CLIENT1-ODU2e:service1-10GE') self.assertEqual(response['status_code'], requests.codes.conflict) def test_057_check_no_interface_10GE_CLIENT_spdra(self): @@ -1355,9 +1355,9 @@ class TransportPCEtesting(unittest.TestCase): def test_078_check_interface_ODU2E_NETWORK1_spdrb(self): response = test_utils.check_node_attribute_request( - 'SPDR-SB1', 'interface', 'XPDR2-NETWORK1-ODU2e') + 'SPDR-SB1', 'interface', 'XPDR2-NETWORK1-ODU2e:service1-10GE') self.assertEqual(response['status_code'], requests.codes.ok) - input_dict_1 = {'name': 'XPDR2-NETWORK1-ODU2e', + input_dict_1 = {'name': 'XPDR2-NETWORK1-ODU2e:service1-10GE', 'administrative-state': 'inService', 'supporting-circuit-pack-name': 'CP1-CFP0', 'supporting-interface': 'XPDR2-NETWORK1-ODU4', @@ -1383,9 +1383,9 @@ class TransportPCEtesting(unittest.TestCase): def test_079_check_interface_ODU2E_NETWORK2_spdrb(self): response = test_utils.check_node_attribute_request( - 'SPDR-SB1', 'interface', 'XPDR2-NETWORK2-ODU2e') + 'SPDR-SB1', 'interface', 'XPDR2-NETWORK2-ODU2e:service1-10GE') self.assertEqual(response['status_code'], requests.codes.ok) - input_dict_1 = {'name': 'XPDR2-NETWORK2-ODU2e', + input_dict_1 = {'name': 'XPDR2-NETWORK2-ODU2e:service1-10GE', 'administrative-state': 'inService', 'supporting-circuit-pack-name': 'CP1-CFP0', 'supporting-interface': 'XPDR2-NETWORK2-ODU4', @@ -1418,12 +1418,11 @@ class TransportPCEtesting(unittest.TestCase): 'XPDR2-NETWORK1-ODU2e-x-XPDR2-NETWORK2-ODU2e', 'direction': 'bidirectional' } - self.assertDictEqual(dict(input_dict_1, **response['odu-connection'][0]), response['odu-connection'][0]) - self.assertDictEqual({'dst-if': 'XPDR2-NETWORK2-ODU2e'}, + self.assertDictEqual({'dst-if': 'XPDR2-NETWORK2-ODU2e:service1-10GE'}, response['odu-connection'][0]['destination']) - self.assertDictEqual({'src-if': 'XPDR2-NETWORK1-ODU2e'}, + self.assertDictEqual({'src-if': 'XPDR2-NETWORK1-ODU2e:service1-10GE'}, response['odu-connection'][0]['source']) def test_081_check_otn_topo_links(self): @@ -1474,12 +1473,12 @@ class TransportPCEtesting(unittest.TestCase): def test_087_check_no_interface_ODU2E_NETWORK1_spdrb(self): response = test_utils.check_node_attribute_request( - 'SPDR-SB1', 'interface', 'XPDR2-NETWORK1-ODU2e') + 'SPDR-SB1', 'interface', 'XPDR2-NETWORK1-ODU2e-service1-10GE') self.assertEqual(response['status_code'], requests.codes.conflict) def test_088_check_no_interface_ODU2E_NETWORK2_spdrb(self): response = test_utils.check_node_attribute_request( - 'SPDR-SB1', 'interface', 'XPDR2-NETWORK2-ODU2e') + 'SPDR-SB1', 'interface', 'XPDR2-NETWORK2-ODU2e-service1-10GE') self.assertEqual(response['status_code'], requests.codes.conflict) def test_089_check_otn_topo_links(self): diff --git a/tests/transportpce_tests/7.1/test02_otn_renderer.py b/tests/transportpce_tests/7.1/test02_otn_renderer.py index 65f9cdcf0..a0a4c1ed6 100644 --- a/tests/transportpce_tests/7.1/test02_otn_renderer.py +++ b/tests/transportpce_tests/7.1/test02_otn_renderer.py @@ -238,9 +238,9 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase): self.assertIn('XPDR2-CLIENT1-ODU4-x-XPDR2-NETWORK1-ODU4', response['output']['node-interface'][0]['connection-id']) self.assertIn('XPDR2-CLIENT1-ETHERNET-100G', response['output']['node-interface'][0]['eth-interface-id']) - self.assertIn('XPDR2-NETWORK1-ODU4', + self.assertIn('XPDR2-NETWORK1-ODU4:service_Ethernet', response['output']['node-interface'][0]['odu-interface-id']) - self.assertIn('XPDR2-CLIENT1-ODU4', + self.assertIn('XPDR2-CLIENT1-ODU4:service_Ethernet', response['output']['node-interface'][0]['odu-interface-id']) def test_11_check_interface_100ge_client(self): @@ -262,9 +262,9 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase): def test_12_check_interface_odu4_client(self): response = test_utils.check_node_attribute_request( - "XPDR-A2", "interface", "XPDR2-CLIENT1-ODU4") + "XPDR-A2", "interface", "XPDR2-CLIENT1-ODU4:service_Ethernet") self.assertEqual(response['status_code'], requests.codes.ok) - input_dict_1 = {'name': 'XPDR2-CLIENT1-ODU4', + input_dict_1 = {'name': 'XPDR2-CLIENT1-ODU4:service_Ethernet', 'administrative-state': 'inService', 'supporting-circuit-pack-name': '1/2/1/1-PLUG-CLIENT', 'supporting-interface-list': 'XPDR2-CLIENT1-ETHERNET-100G', @@ -286,9 +286,9 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase): def test_13_check_interface_odu4_network(self): response = test_utils.check_node_attribute_request( - "XPDR-A2", "interface", "XPDR2-NETWORK1-ODU4") + "XPDR-A2", "interface", "XPDR2-NETWORK1-ODU4:service_Ethernet") self.assertEqual(response['status_code'], requests.codes.ok) - input_dict_1 = {'name': 'XPDR2-NETWORK1-ODU4', + input_dict_1 = {'name': 'XPDR2-NETWORK1-ODU4:service_Ethernet', 'administrative-state': 'inService', 'supporting-circuit-pack-name': '1/2/2-PLUG-NET', 'supporting-interface-list': 'XPDR2-NETWORK1-ODUC2', @@ -321,15 +321,15 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase): self.assertEqual(response['status_code'], requests.codes.ok) input_dict_1 = { 'connection-name': - 'XPDR2-CLIENT1-ODU4-x-XPDR2-NETWORK1-ODU4', + 'XPDR2-NETWORK1-ODU4-x-XPDR2-CLIENT1-ODU4', 'direction': 'bidirectional' } self.assertDictEqual(dict(input_dict_1, **response['odu-connection'][0]), response['odu-connection'][0]) - self.assertDictEqual({'dst-if': 'XPDR2-NETWORK1-ODU4'}, + self.assertDictEqual({'dst-if': 'XPDR2-NETWORK1-ODU4:service_Ethernet'}, response['odu-connection'][0]['destination']) - self.assertDictEqual({'src-if': 'XPDR2-CLIENT1-ODU4'}, + self.assertDictEqual({'src-if': 'XPDR2-CLIENT1-ODU4:service_Ethernet'}, response['odu-connection'][0]['source']) # 1d) Delete Ethernet device interfaces @@ -357,12 +357,12 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase): def test_17_check_no_interface_odu_network(self): response = test_utils.check_node_attribute_request( - "XPDR-A2", "interface", "XPDR2-NETWORK1-ODU4") + "XPDR-A2", "interface", "XPDR2-NETWORK1-ODU4:service_Ethernet") self.assertEqual(response['status_code'], requests.codes.conflict) def test_18_check_no_interface_odu_client(self): response = test_utils.check_node_attribute_request( - "XPDR-A2", "interface", "XPDR2-CLIENT1-ODU4") + "XPDR-A2", "interface", "XPDR2-CLIENT1-ODU4:service_Ethernet") self.assertEqual(response['status_code'], requests.codes.conflict) def test_19_check_no_interface_100ge_client(self): diff --git a/tests/transportpce_tests/hybrid/test02_B100G_end2end.py b/tests/transportpce_tests/hybrid/test02_B100G_end2end.py index 6c9d74aaf..01fbd36bd 100644 --- a/tests/transportpce_tests/hybrid/test02_B100G_end2end.py +++ b/tests/transportpce_tests/hybrid/test02_B100G_end2end.py @@ -610,9 +610,9 @@ class TransportPCEtesting(unittest.TestCase): def test_32_check_interface_ODU4_CLIENT_xpdra2(self): response = test_utils.check_node_attribute_request( - 'XPDR-A2', 'interface', 'XPDR2-CLIENT1-ODU4') + 'XPDR-A2', 'interface', 'XPDR2-CLIENT1-ODU4:service-100GE') self.assertEqual(response['status_code'], requests.codes.ok) - input_dict_1 = {'name': 'XPDR2-CLIENT1-ODU4', + input_dict_1 = {'name': 'XPDR2-CLIENT1-ODU4:service-100GE', 'administrative-state': 'inService', 'supporting-circuit-pack-name': '1/2/1/1-PLUG-CLIENT', 'supporting-interface-list': 'XPDR2-CLIENT1-ETHERNET-100G', @@ -634,9 +634,9 @@ class TransportPCEtesting(unittest.TestCase): def test_33_check_interface_ODU4_NETWORK_xpdra2(self): response = test_utils.check_node_attribute_request( - 'XPDR-A2', 'interface', 'XPDR2-NETWORK1-ODU4') + 'XPDR-A2', 'interface', 'XPDR2-NETWORK1-ODU4:service-100GE') self.assertEqual(response['status_code'], requests.codes.ok) - input_dict_1 = {'name': 'XPDR2-NETWORK1-ODU4', + input_dict_1 = {'name': 'XPDR2-NETWORK1-ODU4:service-100GE', 'administrative-state': 'inService', 'supporting-circuit-pack-name': '1/2/2-PLUG-NET', 'supporting-interface-list': 'XPDR2-NETWORK1-ODUC4', @@ -674,9 +674,9 @@ class TransportPCEtesting(unittest.TestCase): self.assertDictEqual(dict(input_dict_1, **response['odu-connection'][0]), response['odu-connection'][0]) - self.assertDictEqual({'dst-if': 'XPDR2-NETWORK1-ODU4'}, + self.assertDictEqual({'dst-if': 'XPDR2-NETWORK1-ODU4:service-100GE'}, response['odu-connection'][0]['destination']) - self.assertDictEqual({'src-if': 'XPDR2-CLIENT1-ODU4'}, + self.assertDictEqual({'src-if': 'XPDR2-CLIENT1-ODU4:service-100GE'}, response['odu-connection'][0]['source']) def test_35_check_interface_100GE_CLIENT_xpdrc2(self): @@ -698,9 +698,9 @@ class TransportPCEtesting(unittest.TestCase): def test_36_check_interface_ODU4_CLIENT_xpdrc2(self): response = test_utils.check_node_attribute_request( - 'XPDR-C2', 'interface', 'XPDR2-CLIENT1-ODU4') + 'XPDR-C2', 'interface', 'XPDR2-CLIENT1-ODU4:service-100GE') self.assertEqual(response['status_code'], requests.codes.ok) - input_dict_1 = {'name': 'XPDR2-CLIENT1-ODU4', + input_dict_1 = {'name': 'XPDR2-CLIENT1-ODU4:service-100GE', 'administrative-state': 'inService', 'supporting-circuit-pack-name': '1/2/1/1-PLUG-CLIENT', 'supporting-interface-list': 'XPDR2-CLIENT1-ETHERNET-100G', @@ -722,9 +722,9 @@ class TransportPCEtesting(unittest.TestCase): def test_37_check_interface_ODU4_NETWORK_xpdrc2(self): response = test_utils.check_node_attribute_request( - 'XPDR-C2', 'interface', 'XPDR2-NETWORK1-ODU4') + 'XPDR-C2', 'interface', 'XPDR2-NETWORK1-ODU4:service-100GE') self.assertEqual(response['status_code'], requests.codes.ok) - input_dict_1 = {'name': 'XPDR2-NETWORK1-ODU4', + input_dict_1 = {'name': 'XPDR2-NETWORK1-ODU4:service-100GE', 'administrative-state': 'inService', 'supporting-circuit-pack-name': '1/2/2-PLUG-NET', 'supporting-interface-list': 'XPDR2-NETWORK1-ODUC4', @@ -768,9 +768,9 @@ class TransportPCEtesting(unittest.TestCase): self.assertDictEqual(dict(input_dict_1, **response['odu-connection'][0]), response['odu-connection'][0]) - self.assertDictEqual({'dst-if': 'XPDR2-NETWORK1-ODU4'}, + self.assertDictEqual({'dst-if': 'XPDR2-NETWORK1-ODU4:service-100GE'}, response['odu-connection'][0]['destination']) - self.assertDictEqual({'src-if': 'XPDR2-CLIENT1-ODU4'}, + self.assertDictEqual({'src-if': 'XPDR2-CLIENT1-ODU4:service-100GE'}, response['odu-connection'][0]['source']) def test_39_check_otn_topo_links(self): @@ -901,12 +901,12 @@ class TransportPCEtesting(unittest.TestCase): def test_50_check_no_interface_ODU4_NETWORK_xpdra2(self): response = test_utils.check_node_attribute_request( - 'XPDR-A2', 'interface', 'XPDR2-NETWORK1-ODU4') + 'XPDR-A2', 'interface', 'XPDR2-NETWORK1-ODU4:service-100GE') self.assertEqual(response['status_code'], requests.codes.conflict) def test_51_check_no_interface_ODU4_CLIENT_xpdra2(self): response = test_utils.check_node_attribute_request( - 'XPDR-A2', 'interface', 'XPDR2-CLIENT1-ODU4') + 'XPDR-A2', 'interface', 'XPDR2-CLIENT1-ODU4:service-100GE') self.assertEqual(response['status_code'], requests.codes.conflict) def test_52_check_no_interface_100GE_CLIENT_xpdra2(self): -- 2.36.6