import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaceException;
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.opendaylight.transportpce.portmapping.rev220316.mapping.Mapping;
import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev200327.OpucnTribSlotDef;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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;
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;
}
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);
- return openRoadmInterface710.createOpenRoadmOduflexInterface(nodeId, logicalConnPoint,
- interfaceNameOduc4);
+ return openRoadmInterface710.createOpenRoadmOdu4OducnOduflex(nodeId, logicalConnPoint,
+ apiInfoA, apiInfoZ);
default:
return null;
}
return openRoadmInterface221.createOpenRoadmOtu4Interface(nodeId, logicalConnPoint, supportOchInterface,
apiInfoA, apiInfoZ);
case StringConstants.OPENROADM_DEVICE_VERSION_7_1:
- return openRoadmInterface710.createOpenRoadmOtucnInterface(nodeId, logicalConnPoint,
+ return openRoadmInterface710.createOpenRoadmOtu4OtucnInterface(nodeId, logicalConnPoint,
supportOchInterface, apiInfoA, apiInfoZ);
default:
return null;
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 {
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 {
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;
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;
}
}
- 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)) {