From: Balagangadhar Bathula Date: Tue, 26 Apr 2022 21:26:10 +0000 (-0400) Subject: Drop the service name from ODU connection name X-Git-Tag: 5.0.0~40^2 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=transportpce.git;a=commitdiff_plain;h=refs%2Fchanges%2F30%2F100830%2F1 Drop the service name from ODU connection name - With service name appended to the network and client side interfaces, the ODU connection names are longer - Though there is not restriction in the string length from OpenROADM MSA, it is better to keep total bytes 256. JIRA: TRNSPRTPCE-628 Signed-off-by: Balagangadhar Bathula Change-Id: I6149a9c8db18e1de9b939db64f5c12a964a98be0 --- 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 a56ceab22..6707d032a 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, servicename, + return openRoadmOtnInterface221.createOpenRoadmOdu0Interface(nodeId, logicalConnPoint, isCTP, tribPortNumber, tribSlotIndex, apiInfoA, apiInfoZ, payLoadType); default: return null; } } - public String createOpenRoadmOdu2Interface(String nodeId, String logicalConnPoint, String servicename, + public String createOpenRoadmOdu2Interface(String nodeId, String logicalConnPoint, 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, servicename, + return openRoadmOtnInterface221.createOpenRoadmOdu2Interface(nodeId, logicalConnPoint, isCTP, tribPortNumber, tribSlotIndex, apiInfoA, apiInfoZ, payLoadType); default: return null; } } - public String createOpenRoadmOdu2eInterface(String nodeId, String logicalConnPoint, String servicename, + public String createOpenRoadmOdu2eInterface(String nodeId, String logicalConnPoint, 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, servicename, + return openRoadmOtnInterface221.createOpenRoadmOdu2eInterface(nodeId, logicalConnPoint, 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, serviceName, + return openRoadmOtnInterface710.createOpenRoadmOdu4Interface(nodeId, logicalConnPoint, 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 46a163a94..6f91279c3 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 @@ -132,7 +132,7 @@ public class OpenRoadmOtnInterface221 { return ethernetInterfaceName; } - public String createOpenRoadmOdu2eInterface(String nodeId, String logicalConnPoint, String serviceName, + public String createOpenRoadmOdu2eInterface(String nodeId, String logicalConnPoint, boolean isCTP, int tribPortNumber, int tribSlotIndex, AEndApiInfo apiInfoA, ZEndApiInfo apiInfoZ, String payloadType) throws OpenRoadmInterfaceException { @@ -142,7 +142,7 @@ public class OpenRoadmOtnInterface221 { String.format(MAPPING_ERROR_EXCEPTION_MESSAGE, nodeId, logicalConnPoint)); } InterfaceBuilder oduInterfaceBldr = createGenericInterfaceBuilder(mapping, OtnOdu.class, - logicalConnPoint + "-ODU2e-" + serviceName); + logicalConnPoint + "-ODU2e"); if (mapping.getSupportingOdu4() != null) { oduInterfaceBldr.setSupportingInterface(mapping.getSupportingOdu4()); } @@ -208,7 +208,7 @@ public class OpenRoadmOtnInterface221 { return oduInterfaceBldr.getName(); } - public String createOpenRoadmOdu0Interface(String nodeId, String logicalConnPoint, String serviceName, + public String createOpenRoadmOdu0Interface(String nodeId, String logicalConnPoint, boolean isCTP, int tribPortNumber, int tribSlotIndex, AEndApiInfo apiInfoA, ZEndApiInfo apiInfoZ, String payloadType) throws OpenRoadmInterfaceException { @@ -218,7 +218,7 @@ public class OpenRoadmOtnInterface221 { String.format(MAPPING_ERROR_EXCEPTION_MESSAGE, nodeId, logicalConnPoint)); } InterfaceBuilder oduInterfaceBldr = createGenericInterfaceBuilder(mapping, OtnOdu.class, - logicalConnPoint + "-ODU0-" + serviceName); + logicalConnPoint + "-ODU0"); if (mapping.getSupportingOdu4() != null) { oduInterfaceBldr.setSupportingInterface(mapping.getSupportingOdu4()); } @@ -284,7 +284,7 @@ public class OpenRoadmOtnInterface221 { return oduInterfaceBldr.getName(); } - public String createOpenRoadmOdu2Interface(String nodeId, String logicalConnPoint, String serviceName, + public String createOpenRoadmOdu2Interface(String nodeId, String logicalConnPoint, boolean isCTP, int tribPortNumber, int tribSlotIndex, AEndApiInfo apiInfoA, ZEndApiInfo apiInfoZ, String payloadType) throws OpenRoadmInterfaceException { @@ -294,7 +294,7 @@ public class OpenRoadmOtnInterface221 { String.format(MAPPING_ERROR_EXCEPTION_MESSAGE, nodeId, logicalConnPoint)); } InterfaceBuilder oduInterfaceBldr = createGenericInterfaceBuilder(mapping, OtnOdu.class, - logicalConnPoint + "-ODU2-" + serviceName); + logicalConnPoint + "-ODU2"); 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 183a862f2..5cabe461b 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 @@ -88,8 +88,7 @@ public class OpenRoadmOtnInterface710 { } public String createOpenRoadmOdu4Interface(String nodeId, String logicalConnPoint, - String serviceName, String payLoad, - boolean isNetworkPort, OpucnTribSlotDef minTribSlotNumber, OpucnTribSlotDef maxTribSlotNumber) + String payLoad, boolean isNetworkPort, OpucnTribSlotDef minTribSlotNumber, OpucnTribSlotDef maxTribSlotNumber) throws OpenRoadmInterfaceException { Mapping portMap = this.portMapping.getMapping(nodeId, logicalConnPoint); if (portMap == null) { @@ -114,7 +113,7 @@ public class OpenRoadmOtnInterface710 { supportingInterfaceList.add(supportingInterface); InterfaceBuilder oduIfBuilder = createGenericInterfaceBuilder( - portMap, OtnOdu.class, logicalConnPoint + "-ODU4-" + serviceName) + portMap, OtnOdu.class, logicalConnPoint + "-ODU4") .setSupportingInterfaceList(supportingInterfaceList); // Agument ODU4 specific interface data OduBuilder oduBuilder = new OduBuilder().setRate(ODU4.class) 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 e0930138f..7e7bbd955 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 @@ -187,10 +187,10 @@ public class OtnDeviceRendererServiceImpl implements OtnDeviceRendererService { String connectionNumber = ""; switch (serviceType) { case StringConstants.SERVICE_TYPE_100GE_S: - connectionNumber = getConnectionNumber(null, node, networkTp, "ODU4"); + connectionNumber = getConnectionNumber(node, networkTp, "ODU4"); break; case StringConstants.SERVICE_TYPE_100GE_M: - connectionNumber = getConnectionNumber(input.getServiceName(), node, networkTp, "ODU4"); + connectionNumber = getConnectionNumber(node, networkTp, "ODU4"); otnLinkTps.add(new LinkTpBuilder() .setNodeId(nodeId) .setTpId(networkTp) @@ -207,7 +207,7 @@ public class OtnDeviceRendererServiceImpl implements OtnDeviceRendererService { if (node.getClientTp() == null && node.getNetwork2Tp() != null) { interfacesToDelete.add(networkTp + "-ODU4"); interfacesToDelete.add(node.getNetwork2Tp() + "-ODU4"); - connectionNumber = getConnectionNumber(null, node, networkTp, "ODU4"); + connectionNumber = getConnectionNumber(node, networkTp, "ODU4"); } break; case StringConstants.SERVICE_TYPE_ODUC2: @@ -224,18 +224,18 @@ public class OtnDeviceRendererServiceImpl implements OtnDeviceRendererService { if (node.getClientTp() == null && node.getNetwork2Tp() != null) { interfacesToDelete.add(networkTp + "-" + serviceType); interfacesToDelete.add(node.getNetwork2Tp() + "-" + serviceType); - connectionNumber = getConnectionNumber(null, node, networkTp, serviceType); + connectionNumber = getConnectionNumber(node, networkTp, serviceType); } break; case StringConstants.SERVICE_TYPE_10GE: - connectionNumber = getConnectionNumber(input.getServiceName(), node, networkTp, "ODU2e"); + connectionNumber = getConnectionNumber(node, networkTp, "ODU2e"); otnLinkTps.add(new LinkTpBuilder() .setNodeId(nodeId) .setTpId(networkTp) .build()); break; case StringConstants.SERVICE_TYPE_1GE: - connectionNumber = getConnectionNumber(input.getServiceName(), node, networkTp, "ODU0"); + connectionNumber = getConnectionNumber(node, networkTp, "ODU0"); otnLinkTps.add(new LinkTpBuilder() .setNodeId(nodeId) .setTpId(networkTp) @@ -296,7 +296,7 @@ public class OtnDeviceRendererServiceImpl implements OtnDeviceRendererService { .build(); } - private String getConnectionNumber(String serviceName, Nodes node, String networkTp, String oduType) { + private String getConnectionNumber(Nodes node, String networkTp, String oduType) { List list1 = new ArrayList<>(); List list2 = new ArrayList<>(Arrays.asList("x")); if (node.getClientTp() != null) { @@ -308,10 +308,6 @@ public class OtnDeviceRendererServiceImpl implements OtnDeviceRendererService { } else { return ""; } - if (serviceName != null) { - list1.add(serviceName); - list2.add(serviceName); - } list1.addAll(list2); return String.join("-", list1); } @@ -372,13 +368,13 @@ public class OtnDeviceRendererServiceImpl implements OtnDeviceRendererService { createdOduInterfaces.add( // suppporting interface?, payload ? openRoadmInterfaceFactory.createOpenRoadmOdu2eInterface(node.getNodeId(), - node.getClientTp(), input.getServiceName(), false, input.getTribPortNumber(), + node.getClientTp(), false, input.getTribPortNumber(), input.getTribSlot(), apiInfoA, apiInfoZ, PT_03)); } createdOduInterfaces.add( // supporting interface? payload ? openRoadmInterfaceFactory.createOpenRoadmOdu2eInterface(node.getNodeId(), node.getNetworkTp(), - input.getServiceName(), true, input.getTribPortNumber(), input.getTribSlot(), null, + true, input.getTribPortNumber(), input.getTribSlot(), null, null, null)); linkTpList.add( new LinkTpBuilder().setNodeId(node.getNodeId()).setTpId(node.getNetworkTp()).build()); @@ -386,7 +382,7 @@ public class OtnDeviceRendererServiceImpl implements OtnDeviceRendererService { createdOduInterfaces.add( // supporting interface? payload ? openRoadmInterfaceFactory.createOpenRoadmOdu2eInterface(node.getNodeId(), - node.getNetwork2Tp(), input.getServiceName(), true, input.getTribPortNumber(), + node.getNetwork2Tp(), 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 20f1d0414..096fddb8e 100644 --- a/tests/transportpce_tests/2.2.1/test07_otn_renderer.py +++ b/tests/transportpce_tests/2.2.1/test07_otn_renderer.py @@ -223,11 +223,11 @@ class TransportPCEtesting(unittest.TestCase): self.assertIn('Otn Service path was set up successfully for node :SPDR-SA1', response['output']['result']) self.assertTrue(response['output']['success']) self.assertEqual('SPDR-SA1', response['output']['node-interface'][0]['node-id']) - self.assertIn('XPDR1-CLIENT4-ODU2e-service1-x-XPDR1-NETWORK1-ODU2e-service1', + 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-service1', response['output']['node-interface'][0]['odu-interface-id']) - self.assertIn('XPDR1-CLIENT4-ODU2e-service1', response['output']['node-interface'][0]['odu-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']) def test_12_check_interface_10GE_CLIENT(self): response = test_utils_rfc8040.check_node_attribute_request("SPDR-SA1", "interface", "XPDR1-CLIENT4-ETHERNET10G") @@ -244,10 +244,10 @@ class TransportPCEtesting(unittest.TestCase): def test_13_check_interface_ODU2E_CLIENT(self): response = test_utils_rfc8040.check_node_attribute_request( - "SPDR-SA1", "interface", "XPDR1-CLIENT4-ODU2e-service1") + "SPDR-SA1", "interface", "XPDR1-CLIENT4-ODU2e") self.assertEqual(response['status_code'], requests.codes.ok) - input_dict_1 = {'name': 'XPDR1-CLIENT4-ODU2e-service1', + input_dict_1 = {'name': 'XPDR1-CLIENT4-ODU2e', 'administrative-state': 'inService', 'supporting-circuit-pack-name': 'CP1-SFP4', 'supporting-interface': 'XPDR1-CLIENT4-ETHERNET10G', @@ -269,9 +269,9 @@ class TransportPCEtesting(unittest.TestCase): def test_14_check_interface_ODU2E_NETWORK(self): response = test_utils_rfc8040.check_node_attribute_request( - "SPDR-SA1", "interface", "XPDR1-NETWORK1-ODU2e-service1") + "SPDR-SA1", "interface", "XPDR1-NETWORK1-ODU2e") self.assertEqual(response['status_code'], requests.codes.ok) - input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU2e-service1', 'administrative-state': 'inService', + input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU2e', 'administrative-state': 'inService', 'supporting-circuit-pack-name': 'CP1-CFP0', 'supporting-interface': 'XPDR1-NETWORK1-ODU4', 'type': 'org-openroadm-interfaces:otnOdu', @@ -300,19 +300,19 @@ class TransportPCEtesting(unittest.TestCase): def test_15_check_ODU2E_connection(self): response = test_utils_rfc8040.check_node_attribute_request( - "SPDR-SA1", "odu-connection", "XPDR1-CLIENT4-ODU2e-service1-x-XPDR1-NETWORK1-ODU2e-service1") + "SPDR-SA1", "odu-connection", "XPDR1-CLIENT4-ODU2e-x-XPDR1-NETWORK1-ODU2e") self.assertEqual(response['status_code'], requests.codes.ok) input_dict_1 = { 'connection-name': - 'XPDR1-CLIENT4-ODU2e-service1-x-XPDR1-NETWORK1-ODU2e-service1', + 'XPDR1-CLIENT4-ODU2e-x-XPDR1-NETWORK1-ODU2e', 'direction': 'bidirectional' } self.assertDictEqual(dict(response['odu-connection'][0], **input_dict_1), response['odu-connection'][0]) - self.assertDictEqual({'dst-if': 'XPDR1-NETWORK1-ODU2e-service1'}, + self.assertDictEqual({'dst-if': 'XPDR1-NETWORK1-ODU2e'}, response['odu-connection'][0]['destination']) - self.assertDictEqual({'src-if': 'XPDR1-CLIENT4-ODU2e-service1'}, + self.assertDictEqual({'src-if': 'XPDR1-CLIENT4-ODU2e'}, response['odu-connection'][0]['source']) def test_16_otn_service_path_delete_10GE(self): @@ -334,17 +334,17 @@ class TransportPCEtesting(unittest.TestCase): def test_17_check_no_ODU2E_connection(self): response = test_utils_rfc8040.check_node_attribute_request( - "SPDR-SA1", "odu-connection", "XPDR1-CLIENT4-ODU2e-service1-x-XPDR1-NETWORK1-ODU2e-service1") + "SPDR-SA1", "odu-connection", "XPDR1-CLIENT4-ODU2e-x-XPDR1-NETWORK1-ODU2e") self.assertEqual(response['status_code'], requests.codes.conflict) def test_18_check_no_interface_ODU2E_NETWORK(self): response = test_utils_rfc8040.check_node_attribute_request( - "SPDR-SA1", "interface", "XPDR1-NETWORK1-ODU2e-service1") + "SPDR-SA1", "interface", "XPDR1-NETWORK1-ODU2e") self.assertEqual(response['status_code'], requests.codes.conflict) def test_19_check_no_interface_ODU2E_CLIENT(self): response = test_utils_rfc8040.check_node_attribute_request( - "SPDR-SA1", "interface", "XPDR1-CLIENT4-ODU2e-service1") + "SPDR-SA1", "interface", "XPDR1-CLIENT4-ODU2e") 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 74796810a..ecb7a9d3b 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 @@ -518,9 +518,9 @@ class TransportPCEtesting(unittest.TestCase): def test_13_check_interface_ODU2E_CLIENT(self): response = test_utils_rfc8040.check_node_attribute_request( - "SPDR-SA1", "interface", "XPDR1-CLIENT1-ODU2e-SPDRA-SPDRC-10G") + "SPDR-SA1", "interface", "XPDR1-CLIENT1-ODU2e") self.assertEqual(response['status_code'], requests.codes.ok) - input_dict_1 = {'name': 'XPDR1-CLIENT1-ODU2e-SPDRA-SPDRC-10G', + input_dict_1 = {'name': 'XPDR1-CLIENT1-ODU2e', 'administrative-state': 'inService', 'supporting-circuit-pack-name': 'CP1-SFP4', 'supporting-interface': 'XPDR1-CLIENT1-ETHERNET10G', @@ -543,25 +543,25 @@ class TransportPCEtesting(unittest.TestCase): def test_14_check_ODU2E_connection(self): response = test_utils_rfc8040.check_node_attribute_request( "SPDR-SA1", - "odu-connection", "XPDR1-CLIENT1-ODU2e-SPDRA-SPDRC-10G-x-XPDR1-NETWORK1-ODU2e-SPDRA-SPDRC-10G") + "odu-connection", "XPDR1-CLIENT1-ODU2e-x-XPDR1-NETWORK1-ODU2e") self.assertEqual(response['status_code'], requests.codes.ok) input_dict_1 = { 'connection-name': - 'XPDR1-CLIENT1-ODU2e-SPDRA-SPDRC-10G-x-XPDR1-NETWORK1-ODU2e-SPDRA-SPDRC-10G', + 'XPDR1-CLIENT1-ODU2e-x-XPDR1-NETWORK1-ODU2e', 'direction': 'bidirectional' } self.assertDictEqual(dict(input_dict_1, **response['odu-connection'][0]), response['odu-connection'][0]) - self.assertDictEqual({'dst-if': 'XPDR1-NETWORK1-ODU2e-SPDRA-SPDRC-10G'}, + self.assertDictEqual({'dst-if': 'XPDR1-NETWORK1-ODU2e'}, response['odu-connection'][0]['destination']) - self.assertDictEqual({'src-if': 'XPDR1-CLIENT1-ODU2e-SPDRA-SPDRC-10G'}, + self.assertDictEqual({'src-if': 'XPDR1-CLIENT1-ODU2e'}, response['odu-connection'][0]['source']) def test_15_check_interface_ODU2E_NETWORK(self): response = test_utils_rfc8040.check_node_attribute_request( - "SPDR-SA1", "interface", "XPDR1-NETWORK1-ODU2e-SPDRA-SPDRC-10G") + "SPDR-SA1", "interface", "XPDR1-NETWORK1-ODU2e") self.assertEqual(response['status_code'], requests.codes.ok) - input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU2e-SPDRA-SPDRC-10G', + input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU2e', 'administrative-state': 'inService', 'supporting-circuit-pack-name': 'CP1-CFP0', 'supporting-interface': 'XPDR1-NETWORK1-ODU4', @@ -590,9 +590,9 @@ class TransportPCEtesting(unittest.TestCase): # Test the interfaces on SPDR-C1 def test_16_check_interface_ODU2E_NETWORK(self): response = test_utils_rfc8040.check_node_attribute_request( - "SPDR-SC1", "interface", "XPDR1-NETWORK1-ODU2e-SPDRA-SPDRC-10G") + "SPDR-SC1", "interface", "XPDR1-NETWORK1-ODU2e") self.assertEqual(response['status_code'], requests.codes.ok) - input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU2e-SPDRA-SPDRC-10G', + input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU2e', 'administrative-state': 'inService', 'supporting-circuit-pack-name': 'CP1-CFP0', 'supporting-interface': 'XPDR1-NETWORK1-ODU4', @@ -633,9 +633,9 @@ class TransportPCEtesting(unittest.TestCase): def test_18_check_interface_ODU2E_CLIENT(self): response = test_utils_rfc8040.check_node_attribute_request( - "SPDR-SC1", "interface", "XPDR1-CLIENT1-ODU2e-SPDRA-SPDRC-10G") + "SPDR-SC1", "interface", "XPDR1-CLIENT1-ODU2e") self.assertEqual(response['status_code'], requests.codes.ok) - input_dict_1 = {'name': 'XPDR1-CLIENT1-ODU2e-SPDRA-SPDRC-10G', + input_dict_1 = {'name': 'XPDR1-CLIENT1-ODU2e', 'administrative-state': 'inService', 'supporting-circuit-pack-name': 'CP1-SFP4', 'supporting-interface': 'XPDR1-CLIENT1-ETHERNET10G', @@ -657,25 +657,25 @@ class TransportPCEtesting(unittest.TestCase): def test_19_check_ODU2E_connection(self): response = test_utils_rfc8040.check_node_attribute_request( "SPDR-SC1", - "odu-connection", "XPDR1-CLIENT1-ODU2e-SPDRA-SPDRC-10G-x-XPDR1-NETWORK1-ODU2e-SPDRA-SPDRC-10G") + "odu-connection", "XPDR1-CLIENT1-ODU2e-x-XPDR1-NETWORK1-ODU2e") self.assertEqual(response['status_code'], requests.codes.ok) input_dict_1 = { 'connection-name': - 'XPDR1-CLIENT1-ODU2e-SPDRA-SPDRC-10G-x-XPDR1-NETWORK1-ODU2e-SPDRA-SPDRC-10G', + 'XPDR1-CLIENT1-ODU2e-x-XPDR1-NETWORK1-ODU2e', 'direction': 'bidirectional' } self.assertDictEqual(dict(input_dict_1, **response['odu-connection'][0]), response['odu-connection'][0]) - self.assertDictEqual({'dst-if': 'XPDR1-NETWORK1-ODU2e-SPDRA-SPDRC-10G'}, + self.assertDictEqual({'dst-if': 'XPDR1-NETWORK1-ODU2e'}, response['odu-connection'][0]['destination']) - self.assertDictEqual({'src-if': 'XPDR1-CLIENT1-ODU2e-SPDRA-SPDRC-10G'}, + self.assertDictEqual({'src-if': 'XPDR1-CLIENT1-ODU2e'}, response['odu-connection'][0]['source']) def test_20_check_interface_ODU2E_NETWORK(self): response = test_utils_rfc8040.check_node_attribute_request( - "SPDR-SC1", "interface", "XPDR1-NETWORK1-ODU2e-SPDRA-SPDRC-10G") + "SPDR-SC1", "interface", "XPDR1-NETWORK1-ODU2e") self.assertEqual(response['status_code'], requests.codes.ok) - input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU2e-SPDRA-SPDRC-10G', + input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU2e', '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 a0a6c1d3c..fab752179 100644 --- a/tests/transportpce_tests/2.2.1/test11_otn_end2end.py +++ b/tests/transportpce_tests/2.2.1/test11_otn_end2end.py @@ -634,10 +634,10 @@ class TransportPCEtesting(unittest.TestCase): def test_32_check_interface_ODU2E_CLIENT_spdra(self): response = test_utils.check_netconf_node_request( - "SPDR-SA1", "interface/XPDR1-CLIENT1-ODU2e-service1-10GE") + "SPDR-SA1", "interface/XPDR1-CLIENT1-ODU2e") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - input_dict_1 = {'name': 'XPDR1-CLIENT1-ODU2e-service1-10GE', + input_dict_1 = {'name': 'XPDR1-CLIENT1-ODU2e', 'administrative-state': 'inService', 'supporting-circuit-pack-name': 'CP1-SFP4', 'supporting-interface': 'XPDR1-CLIENT1-ETHERNET10G', @@ -659,10 +659,10 @@ class TransportPCEtesting(unittest.TestCase): def test_33_check_interface_ODU2E_NETWORK_spdra(self): response = test_utils.check_netconf_node_request( - "SPDR-SA1", "interface/XPDR1-NETWORK1-ODU2e-service1-10GE") + "SPDR-SA1", "interface/XPDR1-NETWORK1-ODU2e") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU2e-service1-10GE', + input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU2e', 'administrative-state': 'inService', 'supporting-circuit-pack-name': 'CP1-CFP0', 'supporting-interface': 'XPDR1-NETWORK1-ODU4', @@ -689,20 +689,20 @@ class TransportPCEtesting(unittest.TestCase): def test_34_check_ODU2E_connection_spdra(self): response = test_utils.check_netconf_node_request( "SPDR-SA1", - "odu-connection/XPDR1-CLIENT1-ODU2e-service1-10GE-x-XPDR1-NETWORK1-ODU2e-service1-10GE") + "odu-connection/XPDR1-CLIENT1-ODU2e-x-XPDR1-NETWORK1-ODU2e") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() input_dict_1 = { 'connection-name': - 'XPDR1-CLIENT1-ODU2e-service1-10GE-x-XPDR1-NETWORK1-ODU2e-service1-10GE', + 'XPDR1-CLIENT1-ODU2e-x-XPDR1-NETWORK1-ODU2e', 'direction': 'bidirectional' } self.assertDictEqual(dict(input_dict_1, **res['odu-connection'][0]), res['odu-connection'][0]) - self.assertDictEqual({'dst-if': 'XPDR1-NETWORK1-ODU2e-service1-10GE'}, + self.assertDictEqual({'dst-if': 'XPDR1-NETWORK1-ODU2e'}, res['odu-connection'][0]['destination']) - self.assertDictEqual({'src-if': 'XPDR1-CLIENT1-ODU2e-service1-10GE'}, + self.assertDictEqual({'src-if': 'XPDR1-CLIENT1-ODU2e'}, res['odu-connection'][0]['source']) def test_35_check_interface_10GE_CLIENT_spdrc(self): @@ -724,10 +724,10 @@ class TransportPCEtesting(unittest.TestCase): def test_36_check_interface_ODU2E_CLIENT_spdrc(self): response = test_utils.check_netconf_node_request( - "SPDR-SC1", "interface/XPDR1-CLIENT1-ODU2e-service1-10GE") + "SPDR-SC1", "interface/XPDR1-CLIENT1-ODU2e") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - input_dict_1 = {'name': 'XPDR1-CLIENT1-ODU2e-service1-10GE', + input_dict_1 = {'name': 'XPDR1-CLIENT1-ODU2e', 'administrative-state': 'inService', 'supporting-circuit-pack-name': 'CP1-SFP4', 'supporting-interface': 'XPDR1-CLIENT1-ETHERNET10G', @@ -749,10 +749,10 @@ class TransportPCEtesting(unittest.TestCase): def test_37_check_interface_ODU2E_NETWORK_spdrc(self): response = test_utils.check_netconf_node_request( - "SPDR-SC1", "interface/XPDR1-NETWORK1-ODU2e-service1-10GE") + "SPDR-SC1", "interface/XPDR1-NETWORK1-ODU2e") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU2e-service1-10GE', + input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU2e', 'administrative-state': 'inService', 'supporting-circuit-pack-name': 'CP1-CFP0', 'supporting-interface': 'XPDR1-NETWORK1-ODU4', @@ -783,20 +783,20 @@ class TransportPCEtesting(unittest.TestCase): def test_38_check_ODU2E_connection_spdrc(self): response = test_utils.check_netconf_node_request( "SPDR-SC1", - "odu-connection/XPDR1-CLIENT1-ODU2e-service1-10GE-x-XPDR1-NETWORK1-ODU2e-service1-10GE") + "odu-connection/XPDR1-CLIENT1-ODU2e-x-XPDR1-NETWORK1-ODU2e") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() input_dict_1 = { 'connection-name': - 'XPDR1-CLIENT1-ODU2e-service1-10GE-x-XPDR1-NETWORK1-ODU2e-service1-10GE', + 'XPDR1-CLIENT1-ODU2e-x-XPDR1-NETWORK1-ODU2e', 'direction': 'bidirectional' } self.assertDictEqual(dict(input_dict_1, **res['odu-connection'][0]), res['odu-connection'][0]) - self.assertDictEqual({'dst-if': 'XPDR1-NETWORK1-ODU2e-service1-10GE'}, + self.assertDictEqual({'dst-if': 'XPDR1-NETWORK1-ODU2e'}, res['odu-connection'][0]['destination']) - self.assertDictEqual({'src-if': 'XPDR1-CLIENT1-ODU2e-service1-10GE'}, + self.assertDictEqual({'src-if': 'XPDR1-CLIENT1-ODU2e'}, res['odu-connection'][0]['source']) def test_39_check_otn_topo_links(self): @@ -1190,10 +1190,10 @@ class TransportPCEtesting(unittest.TestCase): def test_73_check_interface_ODU0_CLIENT_spdra(self): response = test_utils.check_netconf_node_request( - "SPDR-SA1", "interface/XPDR3-CLIENT1-ODU0-service1-1GE") + "SPDR-SA1", "interface/XPDR3-CLIENT1-ODU0") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - input_dict_1 = {'name': 'XPDR3-CLIENT1-ODU0-service1-1GE', + input_dict_1 = {'name': 'XPDR3-CLIENT1-ODU0', 'administrative-state': 'inService', 'supporting-circuit-pack-name': 'CP3-SFP1', 'supporting-interface': 'XPDR3-CLIENT1-ETHERNET1G', @@ -1215,10 +1215,10 @@ class TransportPCEtesting(unittest.TestCase): def test_74_check_interface_ODU0_NETWORK_spdra(self): response = test_utils.check_netconf_node_request( - "SPDR-SA1", "interface/XPDR3-NETWORK1-ODU0-service1-1GE") + "SPDR-SA1", "interface/XPDR3-NETWORK1-ODU0") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - input_dict_1 = {'name': 'XPDR3-NETWORK1-ODU0-service1-1GE', + input_dict_1 = {'name': 'XPDR3-NETWORK1-ODU0', 'administrative-state': 'inService', 'supporting-circuit-pack-name': 'CP3-CFP0', 'supporting-interface': 'XPDR3-NETWORK1-ODU4', @@ -1245,20 +1245,20 @@ class TransportPCEtesting(unittest.TestCase): def test_75_check_ODU0_connection_spdra(self): response = test_utils.check_netconf_node_request( "SPDR-SA1", - "odu-connection/XPDR3-CLIENT1-ODU0-service1-1GE-x-XPDR3-NETWORK1-ODU0-service1-1GE") + "odu-connection/XPDR3-CLIENT1-ODU0-x-XPDR3-NETWORK1-ODU0") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() input_dict_1 = { 'connection-name': - 'XPDR3-CLIENT1-ODU0-service1-1GE-x-XPDR3-NETWORK1-ODU0-service1-1GE', + 'XPDR3-CLIENT1-ODU0-x-XPDR3-NETWORK1-ODU0', 'direction': 'bidirectional' } self.assertDictEqual(dict(input_dict_1, **res['odu-connection'][0]), res['odu-connection'][0]) - self.assertDictEqual({'dst-if': 'XPDR3-NETWORK1-ODU0-service1-1GE'}, + self.assertDictEqual({'dst-if': 'XPDR3-NETWORK1-ODU0'}, res['odu-connection'][0]['destination']) - self.assertDictEqual({'src-if': 'XPDR3-CLIENT1-ODU0-service1-1GE'}, + self.assertDictEqual({'src-if': 'XPDR3-CLIENT1-ODU0'}, res['odu-connection'][0]['source']) def test_76_check_interface_1GE_CLIENT_spdrc(self): @@ -1280,10 +1280,10 @@ class TransportPCEtesting(unittest.TestCase): def test_77_check_interface_ODU0_CLIENT_spdrc(self): response = test_utils.check_netconf_node_request( - "SPDR-SC1", "interface/XPDR3-CLIENT1-ODU0-service1-1GE") + "SPDR-SC1", "interface/XPDR3-CLIENT1-ODU0") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - input_dict_1 = {'name': 'XPDR3-CLIENT1-ODU0-service1-1GE', + input_dict_1 = {'name': 'XPDR3-CLIENT1-ODU0', 'administrative-state': 'inService', 'supporting-circuit-pack-name': 'CP3-SFP1', 'supporting-interface': 'XPDR3-CLIENT1-ETHERNET1G', @@ -1305,10 +1305,10 @@ class TransportPCEtesting(unittest.TestCase): def test_78_check_interface_ODU0_NETWORK_spdrc(self): response = test_utils.check_netconf_node_request( - "SPDR-SC1", "interface/XPDR3-NETWORK1-ODU0-service1-1GE") + "SPDR-SC1", "interface/XPDR3-NETWORK1-ODU0") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - input_dict_1 = {'name': 'XPDR3-NETWORK1-ODU0-service1-1GE', + input_dict_1 = {'name': 'XPDR3-NETWORK1-ODU0', 'administrative-state': 'inService', 'supporting-circuit-pack-name': 'CP3-CFP0', 'supporting-interface': 'XPDR3-NETWORK1-ODU4', @@ -1339,20 +1339,20 @@ class TransportPCEtesting(unittest.TestCase): def test_79_check_ODU0_connection_spdrc(self): response = test_utils.check_netconf_node_request( "SPDR-SC1", - "odu-connection/XPDR3-CLIENT1-ODU0-service1-1GE-x-XPDR3-NETWORK1-ODU0-service1-1GE") + "odu-connection/XPDR3-CLIENT1-ODU0-x-XPDR3-NETWORK1-ODU0") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() input_dict_1 = { 'connection-name': - 'XPDR3-CLIENT1-ODU0-service1-1GE-x-XPDR3-NETWORK1-ODU0-service1-1GE', + 'XPDR3-CLIENT1-ODU0-x-XPDR3-NETWORK1-ODU0', 'direction': 'bidirectional' } self.assertDictEqual(dict(input_dict_1, **res['odu-connection'][0]), res['odu-connection'][0]) - self.assertDictEqual({'dst-if': 'XPDR3-NETWORK1-ODU0-service1-1GE'}, + self.assertDictEqual({'dst-if': 'XPDR3-NETWORK1-ODU0'}, res['odu-connection'][0]['destination']) - self.assertDictEqual({'src-if': 'XPDR3-CLIENT1-ODU0-service1-1GE'}, + self.assertDictEqual({'src-if': 'XPDR3-CLIENT1-ODU0'}, res['odu-connection'][0]['source']) def test_80_check_otn_topo_links(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 494170212..388c4fa25 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 @@ -774,10 +774,10 @@ class TransportPCEtesting(unittest.TestCase): def test_043_check_interface_ODU2E_CLIENT_spdra(self): response = test_utils.check_netconf_node_request( - "SPDR-SA1", "interface/XPDR1-CLIENT1-ODU2e-service1-10GE") + "SPDR-SA1", "interface/XPDR1-CLIENT1-ODU2e") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - input_dict_1 = {'name': 'XPDR1-CLIENT1-ODU2e-service1-10GE', + input_dict_1 = {'name': 'XPDR1-CLIENT1-ODU2e', 'administrative-state': 'inService', 'supporting-circuit-pack-name': 'CP1-SFP4', 'supporting-interface': 'XPDR1-CLIENT1-ETHERNET10G', @@ -801,7 +801,7 @@ class TransportPCEtesting(unittest.TestCase): {'payload-type': '03', 'exp-payload-type': '03'}, res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu']) response2 = test_utils.check_netconf_node_request( - "SPDR-SC1", "interface/XPDR1-CLIENT1-ODU2e-service1-10GE") + "SPDR-SC1", "interface/XPDR1-CLIENT1-ODU2e") self.assertEqual(response.status_code, requests.codes.ok) res2 = response2.json()['interface'][0]['org-openroadm-otn-odu-interfaces:odu'] self.assertEqual(input_dict_2['tx-sapi'], res2['tx-dapi']) @@ -811,10 +811,10 @@ class TransportPCEtesting(unittest.TestCase): def test_044_check_interface_ODU2E_NETWORK_spdra(self): response = test_utils.check_netconf_node_request( - "SPDR-SA1", "interface/XPDR1-NETWORK1-ODU2e-service1-10GE") + "SPDR-SA1", "interface/XPDR1-NETWORK1-ODU2e") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU2e-service1-10GE', + input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU2e', 'administrative-state': 'inService', 'supporting-circuit-pack-name': 'CP1-CFP0', 'supporting-interface': 'XPDR1-NETWORK1-ODU4', @@ -841,20 +841,20 @@ class TransportPCEtesting(unittest.TestCase): def test_045_check_ODU2E_connection_spdra(self): response = test_utils.check_netconf_node_request( "SPDR-SA1", - "odu-connection/XPDR1-CLIENT1-ODU2e-service1-10GE-x-XPDR1-NETWORK1-ODU2e-service1-10GE") + "odu-connection/XPDR1-CLIENT1-ODU2e-x-XPDR1-NETWORK1-ODU2e") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() input_dict_1 = { 'connection-name': - 'XPDR1-CLIENT1-ODU2e-service1-10GE-x-XPDR1-NETWORK1-ODU2e-service1-10GE', + 'XPDR1-CLIENT1-ODU2e-x-XPDR1-NETWORK1-ODU2e', 'direction': 'bidirectional' } self.assertDictEqual(dict(input_dict_1, **res['odu-connection'][0]), res['odu-connection'][0]) - self.assertDictEqual({'dst-if': 'XPDR1-NETWORK1-ODU2e-service1-10GE'}, + self.assertDictEqual({'dst-if': 'XPDR1-NETWORK1-ODU2e'}, res['odu-connection'][0]['destination']) - self.assertDictEqual({'src-if': 'XPDR1-CLIENT1-ODU2e-service1-10GE'}, + self.assertDictEqual({'src-if': 'XPDR1-CLIENT1-ODU2e'}, res['odu-connection'][0]['source']) def test_046_check_interface_10GE_CLIENT_spdrc(self): @@ -876,10 +876,10 @@ class TransportPCEtesting(unittest.TestCase): def test_047_check_interface_ODU2E_CLIENT_spdrc(self): response = test_utils.check_netconf_node_request( - "SPDR-SC1", "interface/XPDR1-CLIENT1-ODU2e-service1-10GE") + "SPDR-SC1", "interface/XPDR1-CLIENT1-ODU2e") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - input_dict_1 = {'name': 'XPDR1-CLIENT1-ODU2e-service1-10GE', + input_dict_1 = {'name': 'XPDR1-CLIENT1-ODU2e', 'administrative-state': 'inService', 'supporting-circuit-pack-name': 'CP1-SFP4', 'supporting-interface': 'XPDR1-CLIENT1-ETHERNET10G', @@ -903,7 +903,7 @@ class TransportPCEtesting(unittest.TestCase): {'payload-type': '03', 'exp-payload-type': '03'}, res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu']) response2 = test_utils.check_netconf_node_request( - "SPDR-SA1", "interface/XPDR1-CLIENT1-ODU2e-service1-10GE") + "SPDR-SA1", "interface/XPDR1-CLIENT1-ODU2e") self.assertEqual(response.status_code, requests.codes.ok) res2 = response2.json()['interface'][0]['org-openroadm-otn-odu-interfaces:odu'] self.assertEqual(input_dict_2['tx-sapi'], res2['tx-dapi']) @@ -913,10 +913,10 @@ class TransportPCEtesting(unittest.TestCase): def test_048_check_interface_ODU2E_NETWORK_spdrc(self): response = test_utils.check_netconf_node_request( - "SPDR-SC1", "interface/XPDR1-NETWORK1-ODU2e-service1-10GE") + "SPDR-SC1", "interface/XPDR1-NETWORK1-ODU2e") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU2e-service1-10GE', + input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU2e', 'administrative-state': 'inService', 'supporting-circuit-pack-name': 'CP1-CFP0', 'supporting-interface': 'XPDR1-NETWORK1-ODU4', @@ -946,20 +946,20 @@ class TransportPCEtesting(unittest.TestCase): def test_049_check_ODU2E_connection_spdrc(self): response = test_utils.check_netconf_node_request( "SPDR-SC1", - "odu-connection/XPDR1-CLIENT1-ODU2e-service1-10GE-x-XPDR1-NETWORK1-ODU2e-service1-10GE") + "odu-connection/XPDR1-CLIENT1-ODU2e-x-XPDR1-NETWORK1-ODU2e") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() input_dict_1 = { 'connection-name': - 'XPDR1-CLIENT1-ODU2e-service1-10GE-x-XPDR1-NETWORK1-ODU2e-service1-10GE', + 'XPDR1-CLIENT1-ODU2e-x-XPDR1-NETWORK1-ODU2e', 'direction': 'bidirectional' } self.assertDictEqual(dict(input_dict_1, **res['odu-connection'][0]), res['odu-connection'][0]) - self.assertDictEqual({'dst-if': 'XPDR1-NETWORK1-ODU2e-service1-10GE'}, + self.assertDictEqual({'dst-if': 'XPDR1-NETWORK1-ODU2e'}, res['odu-connection'][0]['destination']) - self.assertDictEqual({'src-if': 'XPDR1-CLIENT1-ODU2e-service1-10GE'}, + self.assertDictEqual({'src-if': 'XPDR1-CLIENT1-ODU2e'}, res['odu-connection'][0]['source']) def test_050_check_otn_topo_links(self): @@ -1019,12 +1019,12 @@ class TransportPCEtesting(unittest.TestCase): def test_055_check_no_interface_ODU2E_NETWORK_spdra(self): response = test_utils.check_netconf_node_request( - "SPDR-SA1", "interface/XPDR1-NETWORK1-ODU2e-service1") + "SPDR-SA1", "interface/XPDR1-NETWORK1-ODU2e") self.assertEqual(response.status_code, requests.codes.conflict) def test_056_check_no_interface_ODU2E_CLIENT_spdra(self): response = test_utils.check_netconf_node_request( - "SPDR-SA1", "interface/XPDR1-CLIENT1-ODU2e-service1") + "SPDR-SA1", "interface/XPDR1-CLIENT1-ODU2e") self.assertEqual(response.status_code, requests.codes.conflict) def test_057_check_no_interface_10GE_CLIENT_spdra(self): @@ -1378,10 +1378,10 @@ class TransportPCEtesting(unittest.TestCase): def test_078_check_interface_ODU2E_NETWORK1_spdrb(self): response = test_utils.check_netconf_node_request( - "SPDR-SB1", "interface/XPDR2-NETWORK1-ODU2e-service1-10GE") + "SPDR-SB1", "interface/XPDR2-NETWORK1-ODU2e") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - input_dict_1 = {'name': 'XPDR2-NETWORK1-ODU2e-service1-10GE', + input_dict_1 = {'name': 'XPDR2-NETWORK1-ODU2e', 'administrative-state': 'inService', 'supporting-circuit-pack-name': 'CP1-CFP0', 'supporting-interface': 'XPDR2-NETWORK1-ODU4', @@ -1407,10 +1407,10 @@ class TransportPCEtesting(unittest.TestCase): def test_079_check_interface_ODU2E_NETWORK2_spdrb(self): response = test_utils.check_netconf_node_request( - "SPDR-SB1", "interface/XPDR2-NETWORK2-ODU2e-service1-10GE") + "SPDR-SB1", "interface/XPDR2-NETWORK2-ODU2e") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - input_dict_1 = {'name': 'XPDR2-NETWORK2-ODU2e-service1-10GE', + input_dict_1 = {'name': 'XPDR2-NETWORK2-ODU2e', 'administrative-state': 'inService', 'supporting-circuit-pack-name': 'CP1-CFP0', 'supporting-interface': 'XPDR2-NETWORK2-ODU4', @@ -1437,20 +1437,20 @@ class TransportPCEtesting(unittest.TestCase): def test_080_check_ODU2E_connection_spdrb(self): response = test_utils.check_netconf_node_request( "SPDR-SB1", - "odu-connection/XPDR2-NETWORK1-ODU2e-service1-10GE-x-XPDR2-NETWORK2-ODU2e-service1-10GE") + "odu-connection/XPDR2-NETWORK1-ODU2e-x-XPDR2-NETWORK2-ODU2e") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() input_dict_1 = { 'connection-name': - 'XPDR2-NETWORK1-ODU2e-service1-10GE-x-XPDR2-NETWORK2-ODU2e-service1-10GE', + 'XPDR2-NETWORK1-ODU2e-x-XPDR2-NETWORK2-ODU2e', 'direction': 'bidirectional' } self.assertDictEqual(dict(input_dict_1, **res['odu-connection'][0]), res['odu-connection'][0]) - self.assertDictEqual({'dst-if': 'XPDR2-NETWORK2-ODU2e-service1-10GE'}, + self.assertDictEqual({'dst-if': 'XPDR2-NETWORK2-ODU2e'}, res['odu-connection'][0]['destination']) - self.assertDictEqual({'src-if': 'XPDR2-NETWORK1-ODU2e-service1-10GE'}, + self.assertDictEqual({'src-if': 'XPDR2-NETWORK1-ODU2e'}, res['odu-connection'][0]['source']) def test_081_check_otn_topo_links(self): @@ -1503,12 +1503,12 @@ class TransportPCEtesting(unittest.TestCase): def test_087_check_no_interface_ODU2E_NETWORK1_spdrb(self): response = test_utils.check_netconf_node_request( - "SPDR-SB1", "interface/XPDR2-NETWORK1-ODU2e-service1") + "SPDR-SB1", "interface/XPDR2-NETWORK1-ODU2e") self.assertEqual(response.status_code, requests.codes.conflict) def test_088_check_no_interface_ODU2E_NETWORK2_spdrb(self): response = test_utils.check_netconf_node_request( - "SPDR-SB1", "interface/XPDR2-NETWORK2-ODU2e-service1") + "SPDR-SB1", "interface/XPDR2-NETWORK2-ODU2e") 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 4337f7e69..7f3f042c8 100644 --- a/tests/transportpce_tests/7.1/test02_otn_renderer.py +++ b/tests/transportpce_tests/7.1/test02_otn_renderer.py @@ -233,12 +233,12 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase): self.assertEqual(response['status_code'], requests.codes.ok) self.assertIn('Otn Service path was set up successfully for node :XPDR-A2', response['output']['result']) self.assertEqual('XPDR-A2', response['output']['node-interface'][0]['node-id']) - self.assertIn('XPDR2-CLIENT1-ODU4-service_Ethernet-x-XPDR2-NETWORK1-ODU4-service_Ethernet', + 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-service_Ethernet', + self.assertIn('XPDR2-NETWORK1-ODU4', response['output']['node-interface'][0]['odu-interface-id']) - self.assertIn('XPDR2-CLIENT1-ODU4-service_Ethernet', + self.assertIn('XPDR2-CLIENT1-ODU4', response['output']['node-interface'][0]['odu-interface-id']) def test_11_check_interface_100ge_client(self): @@ -260,9 +260,9 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase): def test_12_check_interface_odu4_client(self): response = test_utils_rfc8040.check_node_attribute_request( - "XPDR-A2", "interface", "XPDR2-CLIENT1-ODU4-service_Ethernet") + "XPDR-A2", "interface", "XPDR2-CLIENT1-ODU4") self.assertEqual(response['status_code'], requests.codes.ok) - input_dict_1 = {'name': 'XPDR2-CLIENT1-ODU4-service_Ethernet', + input_dict_1 = {'name': 'XPDR2-CLIENT1-ODU4', 'administrative-state': 'inService', 'supporting-circuit-pack-name': '1/2/1/1-PLUG-CLIENT', 'supporting-interface-list': 'XPDR2-CLIENT1-ETHERNET-100G', @@ -284,9 +284,9 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase): def test_13_check_interface_odu4_network(self): response = test_utils_rfc8040.check_node_attribute_request( - "XPDR-A2", "interface", "XPDR2-NETWORK1-ODU4-service_Ethernet") + "XPDR-A2", "interface", "XPDR2-NETWORK1-ODU4") self.assertEqual(response['status_code'], requests.codes.ok) - input_dict_1 = {'name': 'XPDR2-NETWORK1-ODU4-service_Ethernet', + input_dict_1 = {'name': 'XPDR2-NETWORK1-ODU4', 'administrative-state': 'inService', 'supporting-circuit-pack-name': '1/2/2-PLUG-NET', 'supporting-interface-list': 'XPDR2-NETWORK1-ODUC2', @@ -315,19 +315,19 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase): def test_14_check_odu_connection_xpdra2(self): response = test_utils_rfc8040.check_node_attribute_request( "XPDR-A2", - "odu-connection", "XPDR2-CLIENT1-ODU4-service_Ethernet-x-XPDR2-NETWORK1-ODU4-service_Ethernet") + "odu-connection", "XPDR2-CLIENT1-ODU4-x-XPDR2-NETWORK1-ODU4") self.assertEqual(response['status_code'], requests.codes.ok) input_dict_1 = { 'connection-name': - 'XPDR2-CLIENT1-ODU4-service_Ethernet-x-XPDR2-NETWORK1-ODU4-service_Ethernet', + 'XPDR2-CLIENT1-ODU4-x-XPDR2-NETWORK1-ODU4', 'direction': 'bidirectional' } self.assertDictEqual(dict(input_dict_1, **response['odu-connection'][0]), response['odu-connection'][0]) - self.assertDictEqual({'dst-if': 'XPDR2-NETWORK1-ODU4-service_Ethernet'}, + self.assertDictEqual({'dst-if': 'XPDR2-NETWORK1-ODU4'}, response['odu-connection'][0]['destination']) - self.assertDictEqual({'src-if': 'XPDR2-CLIENT1-ODU4-service_Ethernet'}, + self.assertDictEqual({'src-if': 'XPDR2-CLIENT1-ODU4'}, response['odu-connection'][0]['source']) # 1d) Delete Ethernet device interfaces @@ -350,17 +350,17 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase): def test_16_check_no_odu_connection(self): response = test_utils_rfc8040.check_node_attribute_request( "XPDR-A2", - "odu-connection", "XPDR2-CLIENT1-ODU4-service_Ethernet-x-XPDR2-NETWORK1-ODU4-service_Ethernet") + "odu-connection", "XPDR2-CLIENT1-ODU4-x-XPDR2-NETWORK1-ODU4") self.assertEqual(response['status_code'], requests.codes.conflict) def test_17_check_no_interface_odu_network(self): response = test_utils_rfc8040.check_node_attribute_request( - "XPDR-A2", "interface", "XPDR2-NETWORK1-ODU4-service_Ethernet") + "XPDR-A2", "interface", "XPDR2-NETWORK1-ODU4") self.assertEqual(response['status_code'], requests.codes.conflict) def test_18_check_no_interface_odu_client(self): response = test_utils_rfc8040.check_node_attribute_request( - "XPDR-A2", "interface", "XPDR2-CLIENT1-ODU4-service_Ethernet") + "XPDR-A2", "interface", "XPDR2-CLIENT1-ODU4") 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 ba4f8cae6..51dc2e60b 100644 --- a/tests/transportpce_tests/hybrid/test02_B100G_end2end.py +++ b/tests/transportpce_tests/hybrid/test02_B100G_end2end.py @@ -649,10 +649,10 @@ class TransportPCEtesting(unittest.TestCase): def test_32_check_interface_ODU4_CLIENT_xpdra2(self): response = test_utils.check_netconf_node_request( - "XPDR-A2", "interface/XPDR2-CLIENT1-ODU4-service-100GE") + "XPDR-A2", "interface/XPDR2-CLIENT1-ODU4") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - input_dict_1 = {'name': 'XPDR2-CLIENT1-ODU4-service-100GE', + input_dict_1 = {'name': 'XPDR2-CLIENT1-ODU4', 'administrative-state': 'inService', 'supporting-circuit-pack-name': '1/2/1/1-PLUG-CLIENT', 'supporting-interface-list': 'XPDR2-CLIENT1-ETHERNET-100G', @@ -674,10 +674,10 @@ class TransportPCEtesting(unittest.TestCase): def test_33_check_interface_ODU4_NETWORK_xpdra2(self): response = test_utils.check_netconf_node_request( - "XPDR-A2", "interface/XPDR2-NETWORK1-ODU4-service-100GE") + "XPDR-A2", "interface/XPDR2-NETWORK1-ODU4") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - input_dict_1 = {'name': 'XPDR2-NETWORK1-ODU4-service-100GE', + input_dict_1 = {'name': 'XPDR2-NETWORK1-ODU4', 'administrative-state': 'inService', 'supporting-circuit-pack-name': '1/2/2-PLUG-NET', 'supporting-interface-list': 'XPDR2-NETWORK1-ODUC4', @@ -706,20 +706,20 @@ class TransportPCEtesting(unittest.TestCase): def test_34_check_ODU4_connection_xpdra2(self): response = test_utils.check_netconf_node_request( "XPDR-A2", - "odu-connection/XPDR2-CLIENT1-ODU4-service-100GE-x-XPDR2-NETWORK1-ODU4-service-100GE") + "odu-connection/XPDR2-CLIENT1-ODU4-x-XPDR2-NETWORK1-ODU4") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() input_dict_1 = { 'connection-name': - 'XPDR2-CLIENT1-ODU4-service-100GE-x-XPDR2-NETWORK1-ODU4-service-100GE', + 'XPDR2-CLIENT1-ODU4-x-XPDR2-NETWORK1-ODU4', 'direction': 'bidirectional' } self.assertDictEqual(dict(input_dict_1, **res['odu-connection'][0]), res['odu-connection'][0]) - self.assertDictEqual({'dst-if': 'XPDR2-NETWORK1-ODU4-service-100GE'}, + self.assertDictEqual({'dst-if': 'XPDR2-NETWORK1-ODU4'}, res['odu-connection'][0]['destination']) - self.assertDictEqual({'src-if': 'XPDR2-CLIENT1-ODU4-service-100GE'}, + self.assertDictEqual({'src-if': 'XPDR2-CLIENT1-ODU4'}, res['odu-connection'][0]['source']) def test_35_check_interface_100GE_CLIENT_xpdrc2(self): @@ -741,10 +741,10 @@ class TransportPCEtesting(unittest.TestCase): def test_36_check_interface_ODU4_CLIENT_xpdrc2(self): response = test_utils.check_netconf_node_request( - "XPDR-C2", "interface/XPDR2-CLIENT1-ODU4-service-100GE") + "XPDR-C2", "interface/XPDR2-CLIENT1-ODU4") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - input_dict_1 = {'name': 'XPDR2-CLIENT1-ODU4-service-100GE', + input_dict_1 = {'name': 'XPDR2-CLIENT1-ODU4', 'administrative-state': 'inService', 'supporting-circuit-pack-name': '1/2/1/1-PLUG-CLIENT', 'supporting-interface-list': 'XPDR2-CLIENT1-ETHERNET-100G', @@ -766,10 +766,10 @@ class TransportPCEtesting(unittest.TestCase): def test_37_check_interface_ODU4_NETWORK_xpdrc2(self): response = test_utils.check_netconf_node_request( - "XPDR-C2", "interface/XPDR2-NETWORK1-ODU4-service-100GE") + "XPDR-C2", "interface/XPDR2-NETWORK1-ODU4") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - input_dict_1 = {'name': 'XPDR2-NETWORK1-ODU4-service-100GE', + input_dict_1 = {'name': 'XPDR2-NETWORK1-ODU4', 'administrative-state': 'inService', 'supporting-circuit-pack-name': '1/2/2-PLUG-NET', 'supporting-interface-list': 'XPDR2-NETWORK1-ODUC4', @@ -804,20 +804,20 @@ class TransportPCEtesting(unittest.TestCase): def test_38_check_ODU4_connection_xpdrc2(self): response = test_utils.check_netconf_node_request( "XPDR-C2", - "odu-connection/XPDR2-CLIENT1-ODU4-service-100GE-x-XPDR2-NETWORK1-ODU4-service-100GE") + "odu-connection/XPDR2-CLIENT1-ODU4-x-XPDR2-NETWORK1-ODU4") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() input_dict_1 = { 'connection-name': - 'XPDR2-CLIENT1-ODU4-service-100GE-x-XPDR2-NETWORK1-ODU4-service-100GE', + 'XPDR2-CLIENT1-ODU4-x-XPDR2-NETWORK1-ODU4', 'direction': 'bidirectional' } self.assertDictEqual(dict(input_dict_1, **res['odu-connection'][0]), res['odu-connection'][0]) - self.assertDictEqual({'dst-if': 'XPDR2-NETWORK1-ODU4-service-100GE'}, + self.assertDictEqual({'dst-if': 'XPDR2-NETWORK1-ODU4'}, res['odu-connection'][0]['destination']) - self.assertDictEqual({'src-if': 'XPDR2-CLIENT1-ODU4-service-100GE'}, + self.assertDictEqual({'src-if': 'XPDR2-CLIENT1-ODU4'}, res['odu-connection'][0]['source']) def test_39_check_otn_topo_links(self): @@ -959,12 +959,12 @@ class TransportPCEtesting(unittest.TestCase): def test_50_check_no_interface_ODU4_NETWORK_xpdra2(self): response = test_utils.check_netconf_node_request( - "XPDR-A2", "interface/XPDR2-NETWORK1-ODU4-service-100GE") + "XPDR-A2", "interface/XPDR2-NETWORK1-ODU4") self.assertEqual(response.status_code, requests.codes.conflict) def test_51_check_no_interface_ODU4_CLIENT_xpdra2(self): response = test_utils.check_netconf_node_request( - "XPDR-A2", "interface/XPDR2-CLIENT1-ODU4-service-100GE") + "XPDR-A2", "interface/XPDR2-CLIENT1-ODU4") self.assertEqual(response.status_code, requests.codes.conflict) def test_52_check_no_interface_100GE_CLIENT_xpdra2(self):