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=b62ee33fddc9e0e0d366bc2e4d8c4d19c802f005;hb=b5ee86a522ce3cf5c6216f10647edb08b31c72e9;hp=35c031975270a64990c053719c670badc604340f;hpb=006211075f14e4e04edd71f2dd10d01aaa645f38;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 35c031975..b62ee33fd 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 @@ -15,7 +15,9 @@ 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.openroadminterfaces.OpenRoadmInterfaceException; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210426.mapping.Mapping; +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.rev210927.mapping.Mapping; import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev200327.OpucnTribSlotDef; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -119,8 +121,7 @@ public class OpenRoadmInterfaceFactory { 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); @@ -152,8 +153,7 @@ public class OpenRoadmInterfaceFactory { throws OpenRoadmInterfaceException { switch (mappingUtils.getOpenRoadmVersion(anodeId)) { case StringConstants.OPENROADM_DEVICE_VERSION_1_2_1: - return openRoadmInterface121.createOpenRoadmOdu4Interface(anodeId, alogicalConnPoint, - asupportingOtuInterface); + return openRoadmInterface121.createOpenRoadmOdu4Interface(anodeId, alogicalConnPoint); case StringConstants.OPENROADM_DEVICE_VERSION_2_2_1: return openRoadmInterface221.createOpenRoadmOdu4Interface(anodeId, alogicalConnPoint, asupportingOtuInterface, znodeId, zlogicalConnPoint); @@ -173,21 +173,22 @@ public class OpenRoadmInterfaceFactory { * * @param nodeId node ID * @param logicalConnPoint logical connection point - * @param isNetworkPort to distinguish a CTP from a TTP - * @param supportingInterface supporting OTU4 or 100GE 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 payload payload type of the OPU container * @return Name of the interface if successful, otherwise return null. * @throws OpenRoadmInterfaceException OpenRoadm interface exception */ - public String createOpenRoadmOdu4HOInterface(String nodeId, String logicalConnPoint, boolean isNetworkPort, - String supportingInterface) throws OpenRoadmInterfaceException { + public String createOpenRoadmOdu4HOInterface(String nodeId, String logicalConnPoint, boolean isCTP, + AEndApiInfo apiInfoA, ZEndApiInfo apiInfoZ, String payload) 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; + return openRoadmInterface121.createOpenRoadmOdu4Interface(nodeId, logicalConnPoint); case StringConstants.OPENROADM_DEVICE_VERSION_2_2_1: - return openRoadmInterface221.createOpenRoadmOdu4HOInterface(nodeId, logicalConnPoint, isNetworkPort, - supportingInterface); + return openRoadmInterface221.createOpenRoadmOdu4HOInterface(nodeId, logicalConnPoint, isCTP, + apiInfoA, apiInfoZ, payload); default: return null; } @@ -199,19 +200,20 @@ public class OpenRoadmInterfaceFactory { * @param nodeId node ID * @param logicalConnPoint logical connection point * @param supportOchInterface supporting OCH interface - * @return Name of the interface if successful, otherwise return null. + * @param apiInfoA sapi and dapi for A end of the service + * @param apiInfoZ sapi and dapi for Z end of the service * @throws OpenRoadmInterfaceException OpenRoadm interface exception */ - public String createOpenRoadmOtu4Interface(String nodeId, String logicalConnPoint, String supportOchInterface) - throws OpenRoadmInterfaceException { + 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); @@ -220,36 +222,6 @@ public class OpenRoadmInterfaceFactory { } } - /** - * 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); @@ -378,15 +350,15 @@ public class OpenRoadmInterfaceFactory { } 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) 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); default: return null; }