X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=renderer%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Frenderer%2Fopenroadminterface%2FOpenRoadmInterfaceFactory.java;h=cc99c4386b97dac192395befd11c4b3737327f1b;hb=d9ffad0ed3e046a5ad890c65bb0e8c0a1e611002;hp=9e49ca1d13fa679dc32190604e8d9f7899528475;hpb=ed0789eb5b14e334c5750e73e456157d9076b1bc;p=transportpce.git 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 9e49ca1d1..cc99c4386 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 @@ -14,9 +14,13 @@ import org.opendaylight.transportpce.common.device.DeviceTransactionManager; import org.opendaylight.transportpce.common.fixedflex.GridConstant; import org.opendaylight.transportpce.common.fixedflex.SpectrumInformation; import org.opendaylight.transportpce.common.mapping.MappingUtils; +import org.opendaylight.transportpce.common.mapping.PortMapping; import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaceException; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210426.mapping.Mapping; -import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev200327.OpucnTribSlotDef; +import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaces; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.device.renderer.rev211004.az.api.info.AEndApiInfo; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.device.renderer.rev211004.az.api.info.ZEndApiInfo; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.mapping.Mapping; +import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev210924.OpucnTribSlotDef; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,15 +38,14 @@ public class OpenRoadmInterfaceFactory { private final OpenRoadmOtnInterface221 openRoadmOtnInterface221; private final OpenRoadmOtnInterface710 openRoadmOtnInterface710; - public OpenRoadmInterfaceFactory(MappingUtils mappingUtils, OpenRoadmInterface121 openRoadmInterface121, - OpenRoadmInterface221 openRoadmInterface221, OpenRoadmInterface710 openRoadmInterface710, - OpenRoadmOtnInterface221 openRoadmOTNInterface221, OpenRoadmOtnInterface710 openRoadmOtnInterface710) { + public OpenRoadmInterfaceFactory(MappingUtils mappingUtils, PortMapping portMapping, + OpenRoadmInterfaces openRoadmInterfaces) { this.mappingUtils = mappingUtils; - this.openRoadmInterface121 = openRoadmInterface121; - this.openRoadmInterface221 = openRoadmInterface221; - this.openRoadmInterface710 = openRoadmInterface710; - this.openRoadmOtnInterface221 = openRoadmOTNInterface221; - this.openRoadmOtnInterface710 = openRoadmOtnInterface710; + this.openRoadmInterface121 = new OpenRoadmInterface121(portMapping, openRoadmInterfaces); + this.openRoadmInterface221 = new OpenRoadmInterface221(portMapping, openRoadmInterfaces); + this.openRoadmInterface710 = new OpenRoadmInterface710(portMapping, openRoadmInterfaces); + this.openRoadmOtnInterface221 = new OpenRoadmOtnInterface221(portMapping, openRoadmInterfaces); + this.openRoadmOtnInterface710 = new OpenRoadmOtnInterface710(portMapping, openRoadmInterfaces); } public String createOpenRoadmEthInterface(String nodeId, String logicalConnPoint) @@ -54,6 +57,7 @@ public class OpenRoadmInterfaceFactory { case StringConstants.OPENROADM_DEVICE_VERSION_2_2_1: return openRoadmInterface221.createOpenRoadmEthInterface(nodeId, logicalConnPoint); case StringConstants.OPENROADM_DEVICE_VERSION_7_1: + // Below method differenciates 100G vs 400G based on supported-if-cap type return openRoadmInterface710.createOpenRoadmEthInterface(nodeId, logicalConnPoint); default: return null; @@ -94,12 +98,8 @@ public class OpenRoadmInterfaceFactory { return openRoadmInterface221.createOpenRoadmOchInterface(nodeId, logicalConnPoint, spectrumInformation); case StringConstants.OPENROADM_DEVICE_VERSION_7_1: - // In the case of 710 device, we logically combine the OTSi and OTSiGroup interface and represent - // as OCh - String interfaceOtsiName = openRoadmInterface710.createOpenRoadmOtsiInterface(nodeId, logicalConnPoint, + return openRoadmInterface710.createOpenRoadmOchOtsiOtsigroupInterface(nodeId, logicalConnPoint, spectrumInformation); - return openRoadmInterface710.createOpenRoadmOtsiGroupInterface(nodeId, logicalConnPoint, - interfaceOtsiName); default: return null; } @@ -110,59 +110,38 @@ public class OpenRoadmInterfaceFactory { * * @param nodeId node ID * @param logicalConnPoint logical connection point - * @param supportingOtuInterface supporting OTU interface + * @param isCTP to distinguish with a TTP odu interface + * @param apiInfoA sapi and dapi for A end of the service + * @param apiInfoZ sapi and dapi for Z end of the service + * @param payloadType payload type of the opu when terminated * @return Name of the interface if successful, otherwise return null. * @throws OpenRoadmInterfaceException OpenRoadm interface exception */ - public String createOpenRoadmOdu4Interface(String nodeId, String logicalConnPoint, String supportingOtuInterface) + public String createOpenRoadmOdu4HOInterface(String nodeId, String logicalConnPoint, boolean isCTP, + AEndApiInfo apiInfoA, ZEndApiInfo apiInfoZ, String payloadType) throws OpenRoadmInterfaceException { + switch (mappingUtils.getOpenRoadmVersion(nodeId)) { case StringConstants.OPENROADM_DEVICE_VERSION_1_2_1: - return openRoadmInterface121.createOpenRoadmOdu4Interface(nodeId, logicalConnPoint, - supportingOtuInterface); + return openRoadmInterface121.createOpenRoadmOdu4Interface(nodeId, logicalConnPoint); case StringConstants.OPENROADM_DEVICE_VERSION_2_2_1: - return openRoadmInterface221.createOpenRoadmOdu4Interface(nodeId, logicalConnPoint, - supportingOtuInterface); + return openRoadmInterface221.createOpenRoadmOdu4HOInterface(nodeId, logicalConnPoint, isCTP, + apiInfoA, apiInfoZ, payloadType); case StringConstants.OPENROADM_DEVICE_VERSION_7_1: - // Here ODUCn and ODUflex are combined - String interfaceNameOduc4 = openRoadmInterface710.createOpenRoadmOducnInterface(nodeId, - logicalConnPoint, supportingOtuInterface); - return openRoadmInterface710.createOpenRoadmOduflexInterface(nodeId, logicalConnPoint, - interfaceNameOduc4); + return openRoadmInterface710.createOpenRoadmOdu4OducnOduflex(nodeId, logicalConnPoint, + apiInfoA, apiInfoZ); default: return null; } } - /** - * This methods creates an ODU interface on the given termination point. - * - * @param anodeId node ID for A side - * @param alogicalConnPoint logical connection point for A side - * @param asupportingOtuInterface supporting OTU interface - * @param znodeId node ID for Z side - * @param zlogicalConnPoint logical connection point for Z side - * @return Name of the interface if successful, otherwise return null. - * @throws OpenRoadmInterfaceException OpenRoadm interface exception - */ - - public String createOpenRoadmOdu4Interface(String anodeId, String alogicalConnPoint, String asupportingOtuInterface, - String znodeId, String zlogicalConnPoint) + public String createOpenRoadmOducn(String nodeId, String logicalConnPoint) throws OpenRoadmInterfaceException { - switch (mappingUtils.getOpenRoadmVersion(anodeId)) { - case StringConstants.OPENROADM_DEVICE_VERSION_1_2_1: - return openRoadmInterface121.createOpenRoadmOdu4Interface(anodeId, alogicalConnPoint, - asupportingOtuInterface); - case StringConstants.OPENROADM_DEVICE_VERSION_2_2_1: - return openRoadmInterface221.createOpenRoadmOdu4Interface(anodeId, alogicalConnPoint, - asupportingOtuInterface, znodeId, zlogicalConnPoint); + + switch (mappingUtils.getOpenRoadmVersion(nodeId)) { case StringConstants.OPENROADM_DEVICE_VERSION_7_1: - // Here ODUCn and ODUflex are combined - String interfaceNameOduc4 = openRoadmInterface710.createOpenRoadmOducnInterface(anodeId, - alogicalConnPoint, asupportingOtuInterface, znodeId, zlogicalConnPoint); - return openRoadmInterface710.createOpenRoadmOduflexInterface(anodeId, alogicalConnPoint, - interfaceNameOduc4, znodeId, zlogicalConnPoint); + return openRoadmInterface710.createOpenRoadmOducnInterface(nodeId, logicalConnPoint); default: return null; } @@ -174,57 +153,31 @@ public class OpenRoadmInterfaceFactory { * @param nodeId node ID * @param logicalConnPoint logical connection point * @param supportOchInterface supporting OCH interface + * @param apiInfoA sapi and dapi for A end of the service + * @param apiInfoZ sapi and dapi for Z end of the service * @return Name of the interface if successful, otherwise return null. * @throws OpenRoadmInterfaceException OpenRoadm interface exception */ - public String createOpenRoadmOtu4Interface(String nodeId, String logicalConnPoint, String supportOchInterface) + public String createOpenRoadmOtu4Interface(String nodeId, String logicalConnPoint, String supportOchInterface, + AEndApiInfo apiInfoA, ZEndApiInfo apiInfoZ) throws OpenRoadmInterfaceException { + switch (mappingUtils.getOpenRoadmVersion(nodeId)) { case StringConstants.OPENROADM_DEVICE_VERSION_1_2_1: return openRoadmInterface121 .createOpenRoadmOtu4Interface(nodeId, logicalConnPoint, supportOchInterface); case StringConstants.OPENROADM_DEVICE_VERSION_2_2_1: - return openRoadmInterface221 - .createOpenRoadmOtu4Interface(nodeId, logicalConnPoint, supportOchInterface); + return openRoadmInterface221.createOpenRoadmOtu4Interface(nodeId, logicalConnPoint, supportOchInterface, + apiInfoA, apiInfoZ); case StringConstants.OPENROADM_DEVICE_VERSION_7_1: - return openRoadmInterface710.createOpenRoadmOtucnInterface(nodeId, logicalConnPoint, - supportOchInterface); + return openRoadmInterface710.createOpenRoadmOtu4OtucnInterface(nodeId, logicalConnPoint, + supportOchInterface, apiInfoA, apiInfoZ); default: return null; } } - /** - * This methods creates an OTU interface on the given termination point. - * - * @param anodeId node ID for A side - * @param alogicalConnPoint logical connection point for A side - * @param asupportOchInterface supporting OCH interface - * @param znodeId node ID for the Z side - * @param zlogicalConnPoint logical connection point for Z side - * @return Name of the interface if successful, otherwise return null. - * - * @throws OpenRoadmInterfaceException OpenRoadm interface exception - */ - - public String createOpenRoadmOtu4Interface(String anodeId, String alogicalConnPoint, String asupportOchInterface, - String znodeId, String zlogicalConnPoint) - throws OpenRoadmInterfaceException { - switch (mappingUtils.getOpenRoadmVersion(anodeId)) { - case StringConstants.OPENROADM_DEVICE_VERSION_1_2_1: - return openRoadmInterface121.createOpenRoadmOtu4Interface(anodeId, - alogicalConnPoint, asupportOchInterface); - case StringConstants.OPENROADM_DEVICE_VERSION_2_2_1: - return openRoadmInterface221.createOpenRoadmOtu4Interface(anodeId, alogicalConnPoint, - asupportOchInterface, znodeId, zlogicalConnPoint); - case StringConstants.OPENROADM_DEVICE_VERSION_7_1: - return openRoadmInterface710.createOpenRoadmOtucnInterface(anodeId, alogicalConnPoint, - asupportOchInterface, znodeId, zlogicalConnPoint); - default: - return null; - } - } public String createOpenRoadmOchInterfaceName(String logicalConnectionPoint, String spectralSlotNumber) { return String.join(GridConstant.NAME_PARAMETERS_SEPARATOR,logicalConnectionPoint, spectralSlotNumber); @@ -277,8 +230,9 @@ public class OpenRoadmInterfaceFactory { } } - public String createOpenRoadmEth1GInterface(String nodeId, - String logicalConnPoint) throws OpenRoadmInterfaceException { + public String createOpenRoadmEth1GInterface(String nodeId,String logicalConnPoint) + throws OpenRoadmInterfaceException { + switch (mappingUtils.getOpenRoadmVersion(nodeId)) { case StringConstants.OPENROADM_DEVICE_VERSION_1_2_1: LOG.error(OTN_FUNTIONS_ARE_NOT_SUPPORTED_BY_OPENROADM_MODELS_1_2_1_MSG); @@ -290,8 +244,9 @@ public class OpenRoadmInterfaceFactory { } } - public String createOpenRoadmEth10GInterface(String nodeId, - String logicalConnPoint) throws OpenRoadmInterfaceException { + public String createOpenRoadmEth10GInterface(String nodeId, String logicalConnPoint) + throws OpenRoadmInterfaceException { + switch (mappingUtils.getOpenRoadmVersion(nodeId)) { case StringConstants.OPENROADM_DEVICE_VERSION_1_2_1: LOG.error(OTN_FUNTIONS_ARE_NOT_SUPPORTED_BY_OPENROADM_MODELS_1_2_1_MSG); @@ -301,11 +256,10 @@ public class OpenRoadmInterfaceFactory { default: return null; } - } - public String createOpenRoadmEth100GInterface(String nodeId, - String logicalConnPoint) throws OpenRoadmInterfaceException { + public String createOpenRoadmEth100GInterface(String nodeId, String logicalConnPoint) + throws OpenRoadmInterfaceException { switch (mappingUtils.getOpenRoadmVersion(nodeId)) { case StringConstants.OPENROADM_DEVICE_VERSION_1_2_1: @@ -319,58 +273,61 @@ public class OpenRoadmInterfaceFactory { default: return null; } - } public String createOpenRoadmOdu0Interface(String nodeId, String logicalConnPoint, String servicename, - String payLoad, boolean isNetworkPort, int tribPortNumber, int tribSlot) + boolean isCTP, int tribPortNumber, int tribSlotIndex, AEndApiInfo apiInfoA, ZEndApiInfo apiInfoZ, + String payLoadType) throws OpenRoadmInterfaceException { + switch (mappingUtils.getOpenRoadmVersion(nodeId)) { case StringConstants.OPENROADM_DEVICE_VERSION_1_2_1: 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, payLoad, isNetworkPort, tribPortNumber, tribSlot); + return openRoadmOtnInterface221.createOpenRoadmOdu0Interface(nodeId, logicalConnPoint, servicename, + isCTP, tribPortNumber, tribSlotIndex, apiInfoA, apiInfoZ, payLoadType); default: return null; } } public String createOpenRoadmOdu2Interface(String nodeId, String logicalConnPoint, String servicename, - String payLoad, boolean isNetworkPort, int tribPortNumber, int tribSlotIndex) + boolean isCTP, int tribPortNumber, int tribSlotIndex, AEndApiInfo apiInfoA, ZEndApiInfo apiInfoZ, + String payLoadType) throws OpenRoadmInterfaceException { switch (mappingUtils.getOpenRoadmVersion(nodeId)) { case StringConstants.OPENROADM_DEVICE_VERSION_1_2_1: 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, payLoad, isNetworkPort, tribPortNumber, tribSlotIndex); + return openRoadmOtnInterface221.createOpenRoadmOdu2Interface(nodeId, logicalConnPoint, servicename, + isCTP, tribPortNumber, tribSlotIndex, apiInfoA, apiInfoZ, payLoadType); default: return null; } } public String createOpenRoadmOdu2eInterface(String nodeId, String logicalConnPoint, String servicename, - String payLoad, boolean isNetworkPort, int tribPortNumber, int tribSlotIndex) + boolean isCTP, int tribPortNumber, int tribSlotIndex, AEndApiInfo apiInfoA, ZEndApiInfo apiInfoZ, + String payLoadType) throws OpenRoadmInterfaceException { + switch (mappingUtils.getOpenRoadmVersion(nodeId)) { case StringConstants.OPENROADM_DEVICE_VERSION_1_2_1: 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, payLoad, isNetworkPort, tribPortNumber, tribSlotIndex); + return openRoadmOtnInterface221.createOpenRoadmOdu2eInterface(nodeId, logicalConnPoint, servicename, + isCTP, tribPortNumber, tribSlotIndex, apiInfoA, apiInfoZ, payLoadType); default: return null; } - } - public String createOpenRoadmOtnOdu4LoInterface(String nodeId, String logicalConnPoint, - String serviceName, String payLoad, boolean isNetworkPort, - OpucnTribSlotDef minTribSlotNumber, OpucnTribSlotDef maxTribSlotNumber) + public String createOpenRoadmOtnOdu4LoInterface(String nodeId, String logicalConnPoint, String serviceName, + String payLoad, boolean isNetworkPort, OpucnTribSlotDef minTribSlotNumber, + OpucnTribSlotDef maxTribSlotNumber) throws OpenRoadmInterfaceException { switch (mappingUtils.getOpenRoadmVersion(nodeId)) { @@ -388,16 +345,6 @@ public class OpenRoadmInterfaceFactory { } } - public String createOpenRoadmOtnOdu4Interface(String nodeId, String logicalConnPoint, String supportingOtuInterface) - throws OpenRoadmInterfaceException { - switch (mappingUtils.getOpenRoadmVersion(nodeId)) { - case StringConstants.OPENROADM_DEVICE_VERSION_2_2_1: - return openRoadmInterface221 - .createOpenRoadmOtnOdu4Interface(nodeId, logicalConnPoint, supportingOtuInterface); - default: - return null; - } - } public String createOpenRoadmOtnOdu4Interface(String anodeId, String alogicalConnPoint, String asupportingOtuInterface, String znodeId, String zlogicalConnPoint) @@ -424,7 +371,7 @@ public class OpenRoadmInterfaceFactory { } } - public String createOpenRoadmOtnOduc4Interface(String anodeId, String alogicalConnPoint, + public String createOpenRoadmOtnOducnInterface(String anodeId, String alogicalConnPoint, String asupportingOtuInterface, String znodeId, String zlogicalConnPoint) throws OpenRoadmInterfaceException { switch (mappingUtils.getOpenRoadmVersion(anodeId)) {