X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=renderer%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Frenderer%2Fopenroadminterface%2FOpenRoadmOtnInterface221.java;h=46a163a94cc9eacc808093cfbe7efebfcb2ac7b3;hb=268165cb2822b6ce4c55f00cac63eed2bb222ec7;hp=a20f833badbdfcd3b512cc16f2da5801732aa0bd;hpb=c6d45b1b0f3e823bf60a159250467625cbceb038;p=transportpce.git 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 a20f833ba..46a163a94 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 @@ -10,15 +10,15 @@ package org.opendaylight.transportpce.renderer.openroadminterface; import java.util.ArrayList; import java.util.List; import java.util.stream.IntStream; - import org.opendaylight.transportpce.common.mapping.PortMapping; import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaceException; import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaces; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200128.network.nodes.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.rev220316.mapping.Mapping; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.interfaces.grp.InterfaceBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.interfaces.grp.InterfaceKey; import org.opendaylight.yang.gen.v1.http.org.openroadm.equipment.states.types.rev171215.AdminStates; -import org.opendaylight.yang.gen.v1.http.org.openroadm.ethernet.interfaces.rev181019.Interface1; import org.opendaylight.yang.gen.v1.http.org.openroadm.ethernet.interfaces.rev181019.Interface1Builder; import org.opendaylight.yang.gen.v1.http.org.openroadm.ethernet.interfaces.rev181019.ethernet.container.EthernetBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev170626.EthernetCsmacd; @@ -29,293 +29,334 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev17121 import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev171215.ODU2e; import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev171215.ODUCTP; import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev171215.ODUTTPCTP; +import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev171215.OduFunctionIdentity; import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev171215.PayloadTypeDef; -import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181019.OduAttributes; +import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181019.OduAttributes.MonitoringMode; import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181019.odu.container.OduBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181019.opu.Opu; import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181019.opu.OpuBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181019.parent.odu.allocation.ParentOduAllocation; import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181019.parent.odu.allocation.ParentOduAllocationBuilder; import org.opendaylight.yangtools.yang.common.Uint16; +import org.opendaylight.yangtools.yang.common.Uint32; import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class OpenRoadmOtnInterface221 { + private static final String MAPPING_ERROR_EXCEPTION_MESSAGE = + "Unable to get mapping from PortMapping for node % and logical connection port %s"; private final PortMapping portMapping; private final OpenRoadmInterfaces openRoadmInterfaces; - private static final Logger LOG = LoggerFactory.getLogger(OpenRoadmOtnInterface221.class); + private static final Logger LOG = LoggerFactory + .getLogger(OpenRoadmOtnInterface221.class); - public OpenRoadmOtnInterface221(PortMapping portMapping, OpenRoadmInterfaces openRoadmInterfaces) { + public OpenRoadmOtnInterface221(PortMapping portMapping, + OpenRoadmInterfaces openRoadmInterfaces) { this.portMapping = portMapping; this.openRoadmInterfaces = openRoadmInterfaces; } - public String createOpenRoadmEth1GInterface(String nodeId, String logicalConnPoint) - throws OpenRoadmInterfaceException { + public String createOpenRoadmEth1GInterface(String nodeId, + String logicalConnPoint) throws OpenRoadmInterfaceException { Mapping portMap = this.portMapping.getMapping(nodeId, logicalConnPoint); if (portMap == null) { - throw new OpenRoadmInterfaceException(String.format( - "Unable to get mapping from PortMapping for node % and logical connection port %s", - nodeId, logicalConnPoint)); + throwException(nodeId, logicalConnPoint); } // Ethernet interface specific data - EthernetBuilder ethIfBuilder = new EthernetBuilder(); - //ethIfBuilder.setAutoNegotiation(EthAttributes.AutoNegotiation.Disabled); - ethIfBuilder.setSpeed(1000L); - InterfaceBuilder ethInterfaceBldr = - createGenericInterfaceBuilder(portMap, EthernetCsmacd.class, logicalConnPoint + "-ETHERNET1G"); + EthernetBuilder ethIfBuilder = new EthernetBuilder() + .setSpeed(Uint32.valueOf(1000)); + InterfaceBuilder ethInterfaceBldr = createGenericInterfaceBuilder( + portMap, EthernetCsmacd.class, + logicalConnPoint + "-ETHERNET1G"); // Create Interface1 type object required for adding as augmentation - Interface1Builder ethIf1Builder = new Interface1Builder(); - ethInterfaceBldr.addAugmentation(Interface1.class, ethIf1Builder.setEthernet(ethIfBuilder.build()).build()); + Interface1Builder ethIf1Builder = new Interface1Builder(); + ethInterfaceBldr.addAugmentation(ethIf1Builder.setEthernet(ethIfBuilder.build()).build()); // Post interface on the device this.openRoadmInterfaces.postOTNInterface(nodeId, ethInterfaceBldr); // Post the equipment-state change on the device circuit-pack - this.openRoadmInterfaces.postOTNEquipmentState(nodeId, portMap.getSupportingCircuitPackName(), true); - this.portMapping.updateMapping(nodeId,portMap); + this.openRoadmInterfaces.postOTNEquipmentState(nodeId, + portMap.getSupportingCircuitPackName(), true); + this.portMapping.updateMapping(nodeId, portMap); String ethernetInterfaceName = ethInterfaceBldr.getName(); return ethernetInterfaceName; } + private void throwException(String nodeId, String logicalConnPoint) + throws OpenRoadmInterfaceException { + throw new OpenRoadmInterfaceException(String.format( + "Unable to get mapping from PortMapping for node % and logical connection port %s", + nodeId, logicalConnPoint)); + } + private InterfaceBuilder createGenericInterfaceBuilder(Mapping portMap, Class type, String key) { - InterfaceBuilder interfaceBuilder = new InterfaceBuilder() - //.setDescription(" TBD ") - //.setCircuitId(" TBD ") - .setSupportingCircuitPackName(portMap.getSupportingCircuitPackName()) - .setSupportingPort(portMap.getSupportingPort()) - .setAdministrativeState(AdminStates.InService) - //TODO get rid of unchecked cast warning - .setType( - (Class) - type - ) - .setName(key) - .withKey(new InterfaceKey(key)); - return interfaceBuilder; + return new InterfaceBuilder() + // .setDescription(" TBD ") + // .setCircuitId(" TBD ") + .setSupportingCircuitPackName( + portMap.getSupportingCircuitPackName()) + .setSupportingPort(portMap.getSupportingPort()) + .setAdministrativeState(AdminStates.InService) + // TODO get rid of unchecked cast warning + .setType(type).setName(key).withKey(new InterfaceKey(key)); } - public String createOpenRoadmEth10GInterface(String nodeId, String logicalConnPoint) - throws OpenRoadmInterfaceException { + public String createOpenRoadmEth10GInterface(String nodeId, + String logicalConnPoint) throws OpenRoadmInterfaceException { Mapping portMap = this.portMapping.getMapping(nodeId, logicalConnPoint); if (portMap == null) { - throw new OpenRoadmInterfaceException( - String.format( - "Unable to get mapping from PortMapping for node % and logical connection port %s", - nodeId, logicalConnPoint)); + throwException(nodeId, logicalConnPoint); } // Ethernet interface specific data EthernetBuilder ethIfBuilder = new EthernetBuilder() - //.setAutoNegotiation(EthAttributes.AutoNegotiation.Disabled) - .setSpeed(10000L); + // .setAutoNegotiation(EthAttributes.AutoNegotiation.Disabled) + .setSpeed(Uint32.valueOf(10000)); // Create Interface1 type object required for adding as augmentation - Interface1Builder ethIf1Builder = new Interface1Builder(); - InterfaceBuilder ethInterfaceBldr = - createGenericInterfaceBuilder(portMap, EthernetCsmacd.class, logicalConnPoint + "-ETHERNET10G") - .addAugmentation(Interface1.class, ethIf1Builder.setEthernet(ethIfBuilder.build()).build()); + Interface1Builder ethIf1Builder = new Interface1Builder(); + InterfaceBuilder ethInterfaceBldr = createGenericInterfaceBuilder(portMap, EthernetCsmacd.class, + logicalConnPoint + "-ETHERNET10G").addAugmentation(ethIf1Builder.setEthernet(ethIfBuilder.build()) + .build()); // Post interface on the device this.openRoadmInterfaces.postOTNInterface(nodeId, ethInterfaceBldr); // Post the equipment-state change on the device circuit-pack - this.openRoadmInterfaces.postOTNEquipmentState(nodeId, portMap.getSupportingCircuitPackName(), true); - this.portMapping.updateMapping(nodeId,portMap); + this.openRoadmInterfaces.postOTNEquipmentState(nodeId, + portMap.getSupportingCircuitPackName(), true); + this.portMapping.updateMapping(nodeId, portMap); String ethernetInterfaceName = ethInterfaceBldr.getName(); return ethernetInterfaceName; } + public String createOpenRoadmOdu2eInterface(String nodeId, String logicalConnPoint, String serviceName, + boolean isCTP, int tribPortNumber, int tribSlotIndex, AEndApiInfo apiInfoA, ZEndApiInfo apiInfoZ, + String payloadType) throws OpenRoadmInterfaceException { - public String createOpenRoadmOdu2eInterface( - String nodeId, String logicalConnPoint, String serviceName, - String payLoad, boolean isNetworkPort, int tribPortNumber, int tribSlotIndex) - throws OpenRoadmInterfaceException { - Mapping portMap = this.portMapping.getMapping(nodeId, logicalConnPoint); - if (portMap == null) { - throw new OpenRoadmInterfaceException(String.format( - "Unable to get mapping from PortMapping for node % and logical connection port %s", - nodeId, logicalConnPoint)); + Mapping mapping = this.portMapping.getMapping(nodeId, logicalConnPoint); + if (mapping == null) { + throw new OpenRoadmInterfaceException( + String.format(MAPPING_ERROR_EXCEPTION_MESSAGE, nodeId, logicalConnPoint)); } - String supportingInterface = null; - - if (isNetworkPort) { - supportingInterface = portMap.getSupportingOdu4(); - } else { - supportingInterface = logicalConnPoint + "-ETHERNET10G"; + InterfaceBuilder oduInterfaceBldr = createGenericInterfaceBuilder(mapping, OtnOdu.class, + logicalConnPoint + "-ODU2e-" + serviceName); + if (mapping.getSupportingOdu4() != null) { + oduInterfaceBldr.setSupportingInterface(mapping.getSupportingOdu4()); } - - if (supportingInterface == null) { - throw new OpenRoadmInterfaceException( - "Interface Creation failed because of missing supported ODU4 on network end or Eth iface on client"); + if (mapping.getSupportingEthernet() != null) { + oduInterfaceBldr.setSupportingInterface(mapping.getSupportingEthernet()); } - InterfaceBuilder oduInterfaceBldr = - createGenericInterfaceBuilder(portMap, OtnOdu.class, logicalConnPoint + "-ODU2e-" + serviceName) - .setSupportingInterface(supportingInterface); - - // ODU interface specific data - OduBuilder oduIfBuilder = new OduBuilder() - .setRate(ODU2e.class) - .setOduFunction(ODUTTPCTP.class) - .setMonitoringMode(OduAttributes.MonitoringMode.Terminated); - LOG.debug("Inside the ODU2e creation {} {} {}",isNetworkPort,tribPortNumber,tribSlotIndex); - if (isNetworkPort) { + Class oduFunction; + MonitoringMode monitoringMode; + Opu opu = null; + ParentOduAllocation parentOduAllocation = null; + if (isCTP) { + oduFunction = ODUCTP.class; + monitoringMode = MonitoringMode.Monitored; List tribSlots = new ArrayList<>(); Uint16 newIdx = Uint16.valueOf(tribSlotIndex); tribSlots.add(newIdx); - IntStream.range(tribSlotIndex, tribSlotIndex + 8).forEach( - nbr -> tribSlots.add(Uint16.valueOf(nbr)) - ); - ParentOduAllocationBuilder parentOduAllocationBuilder = new ParentOduAllocationBuilder() - .setTribPortNumber(tribPortNumber) - .setTribSlots(tribSlots); - oduIfBuilder.setOduFunction(ODUCTP.class) - .setMonitoringMode(OduAttributes.MonitoringMode.Monitored) - .setParentOduAllocation(parentOduAllocationBuilder.build()); + IntStream.range(tribSlotIndex, tribSlotIndex + 8) + .forEach(nbr -> tribSlots.add(Uint16.valueOf(nbr))); + parentOduAllocation = new ParentOduAllocationBuilder() + .setTribPortNumber(Uint16.valueOf(tribPortNumber)) + .setTribSlots(tribSlots) + .build(); + } else { + oduFunction = ODUTTPCTP.class; + monitoringMode = MonitoringMode.Terminated; + opu = new OpuBuilder() + .setPayloadType(PayloadTypeDef.getDefaultInstance(payloadType)) + .setExpPayloadType(PayloadTypeDef.getDefaultInstance(payloadType)) + .build(); + } + OduBuilder oduIfBuilder = new OduBuilder() + .setRate(ODU2e.class) + .setOduFunction(oduFunction) + .setMonitoringMode(monitoringMode) + .setOpu(opu) + .setParentOduAllocation(parentOduAllocation); + if (apiInfoA != null) { + oduIfBuilder.setTxSapi(apiInfoA.getSapi()) + .setTxDapi(apiInfoA.getDapi()) + .setExpectedSapi(apiInfoA.getExpectedSapi()) + .setExpectedDapi(apiInfoA.getExpectedDapi()); } - else { - // Set Opu attributes - OpuBuilder opuBldr = new OpuBuilder() - .setPayloadType(new PayloadTypeDef(payLoad)) - .setExpPayloadType(new PayloadTypeDef(payLoad)); - oduIfBuilder.setOpu(opuBldr.build()); + if (apiInfoZ != null) { + oduIfBuilder.setTxSapi(apiInfoZ.getSapi()) + .setTxDapi(apiInfoZ.getDapi()) + .setExpectedSapi(apiInfoZ.getExpectedSapi()) + .setExpectedDapi(apiInfoZ.getExpectedDapi()); } // Create Interface1 type object required for adding as augmentation // TODO look at imports of different versions of class - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181019.Interface1Builder oduIf1Builder = - new org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181019.Interface1Builder(); - oduInterfaceBldr.addAugmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181019.Interface1.class, - oduIf1Builder.setOdu(oduIfBuilder.build()).build()); + org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181019.Interface1Builder + oduIf1Builder = new + org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181019.Interface1Builder(); + oduInterfaceBldr.addAugmentation(oduIf1Builder.setOdu(oduIfBuilder.build()).build()); // Post interface on the device this.openRoadmInterfaces.postOTNInterface(nodeId, oduInterfaceBldr); - LOG.info("returning the ODU2e inteface {}", oduInterfaceBldr.getName()); + if (!isCTP) { + LOG.info("{}-{} updating mapping with interface {}", nodeId, logicalConnPoint, oduInterfaceBldr.getName()); + this.portMapping.updateMapping(nodeId, mapping); + } return oduInterfaceBldr.getName(); } - public String createOpenRoadmOdu0Interface(String nodeId, String logicalConnPoint, - String serviceName, String payLoad, boolean isNetworkPort, int tribPortNumber, int tribSlot) - throws OpenRoadmInterfaceException { - Mapping portMap = this.portMapping.getMapping(nodeId, logicalConnPoint); - String supportingInterface = null; + public String createOpenRoadmOdu0Interface(String nodeId, String logicalConnPoint, String serviceName, + boolean isCTP, int tribPortNumber, int tribSlotIndex, AEndApiInfo apiInfoA, ZEndApiInfo apiInfoZ, + String payloadType) throws OpenRoadmInterfaceException { - if (isNetworkPort) { - supportingInterface = portMap.getSupportingOdu4(); - } else { - supportingInterface = logicalConnPoint + "-ETHERNET1G"; + Mapping mapping = this.portMapping.getMapping(nodeId, logicalConnPoint); + if (mapping == null) { + throw new OpenRoadmInterfaceException( + String.format(MAPPING_ERROR_EXCEPTION_MESSAGE, nodeId, logicalConnPoint)); } - if (portMap == null) { - throw new OpenRoadmInterfaceException(String.format( - "Unable to get mapping from PortMapping for node % and logical connection port %s", - nodeId, logicalConnPoint)); + InterfaceBuilder oduInterfaceBldr = createGenericInterfaceBuilder(mapping, OtnOdu.class, + logicalConnPoint + "-ODU0-" + serviceName); + if (mapping.getSupportingOdu4() != null) { + oduInterfaceBldr.setSupportingInterface(mapping.getSupportingOdu4()); + } + if (mapping.getSupportingEthernet() != null) { + oduInterfaceBldr.setSupportingInterface(mapping.getSupportingEthernet()); } - InterfaceBuilder oduInterfaceBldr = - createGenericInterfaceBuilder(portMap, OtnOdu.class, logicalConnPoint + "-ODU0-" + serviceName); - oduInterfaceBldr.setSupportingInterface(supportingInterface); - // ODU interface specific data + Class oduFunction; + MonitoringMode monitoringMode; + Opu opu = null; + ParentOduAllocation parentOduAllocation = null; + if (isCTP) { + oduFunction = ODUCTP.class; + monitoringMode = MonitoringMode.Monitored; + List tribSlots = new ArrayList<>(); + Uint16 newIdx = Uint16.valueOf(tribSlotIndex); + tribSlots.add(newIdx); + IntStream.range(tribSlotIndex, tribSlotIndex + 8) + .forEach(nbr -> tribSlots.add(Uint16.valueOf(nbr))); + parentOduAllocation = new ParentOduAllocationBuilder() + .setTribPortNumber(Uint16.valueOf(tribPortNumber)) + .setTribSlots(tribSlots) + .build(); + } else { + oduFunction = ODUTTPCTP.class; + monitoringMode = MonitoringMode.Terminated; + opu = new OpuBuilder() + .setPayloadType(PayloadTypeDef.getDefaultInstance(payloadType)) + .setExpPayloadType(PayloadTypeDef.getDefaultInstance(payloadType)) + .build(); + } OduBuilder oduIfBuilder = new OduBuilder() .setRate(ODU0.class) - .setOduFunction(ODUTTPCTP.class) - .setMonitoringMode(OduAttributes.MonitoringMode.Terminated); - if (isNetworkPort) { - LOG.debug("Network port is true"); - List tribSlots = new ArrayList<>(); - tribSlots.add(Uint16.valueOf(tribSlot)); //add trib slots - ParentOduAllocationBuilder parentOduAllocationBuilder = new ParentOduAllocationBuilder() - //set trib port numbers - .setTribPortNumber(tribPortNumber) - .setTribSlots(tribSlots); - oduIfBuilder.setOduFunction(ODUCTP.class) - .setMonitoringMode(OduAttributes.MonitoringMode.Monitored) - .setParentOduAllocation(parentOduAllocationBuilder.build()); - LOG.debug("Network port is true {} {} {}", - oduIfBuilder.getParentOduAllocation().getTribSlots(), - oduIfBuilder.getRate(), - oduIfBuilder.getParentOduAllocation().getTribPortNumber()); + .setOduFunction(oduFunction) + .setMonitoringMode(monitoringMode) + .setOpu(opu) + .setParentOduAllocation(parentOduAllocation); + if (apiInfoA != null) { + oduIfBuilder.setTxSapi(apiInfoA.getSapi()) + .setTxDapi(apiInfoA.getDapi()) + .setExpectedSapi(apiInfoA.getExpectedSapi()) + .setExpectedDapi(apiInfoA.getExpectedDapi()); } - else { - LOG.debug("Current port is a client port"); - OpuBuilder opuBldr = new OpuBuilder() - .setPayloadType(new PayloadTypeDef(payLoad)) - .setExpPayloadType(new PayloadTypeDef(payLoad)); - oduIfBuilder.setOpu(opuBldr.build()); + if (apiInfoZ != null) { + oduIfBuilder.setTxSapi(apiInfoZ.getSapi()) + .setTxDapi(apiInfoZ.getDapi()) + .setExpectedSapi(apiInfoZ.getExpectedSapi()) + .setExpectedDapi(apiInfoZ.getExpectedDapi()); } // Create Interface1 type object required for adding as augmentation // TODO look at imports of different versions of class - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181019.Interface1Builder oduIf1Builder = - new org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181019.Interface1Builder(); - oduInterfaceBldr.addAugmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181019.Interface1.class, - oduIf1Builder.setOdu(oduIfBuilder.build()).build()); + org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181019.Interface1Builder + oduIf1Builder = new + org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181019.Interface1Builder(); + oduInterfaceBldr.addAugmentation(oduIf1Builder.setOdu(oduIfBuilder.build()).build()); // Post interface on the device this.openRoadmInterfaces.postOTNInterface(nodeId, oduInterfaceBldr); - LOG.info("returning the ODU0 inteface {}", oduInterfaceBldr.getName()); + if (!isCTP) { + LOG.info("{}-{} updating mapping with interface {}", nodeId, logicalConnPoint, oduInterfaceBldr.getName()); + this.portMapping.updateMapping(nodeId, mapping); + } return oduInterfaceBldr.getName(); } + public String createOpenRoadmOdu2Interface(String nodeId, String logicalConnPoint, String serviceName, + boolean isCTP, int tribPortNumber, int tribSlotIndex, AEndApiInfo apiInfoA, ZEndApiInfo apiInfoZ, + String payloadType) throws OpenRoadmInterfaceException { - public String createOpenRoadmOdu2Interface( - String nodeId, String logicalConnPoint, String serviceName, - String payLoad, boolean isNetworkPort, int tribPortNumber, int tribSlotIndex) - throws OpenRoadmInterfaceException { - Mapping portMap = this.portMapping.getMapping(nodeId, logicalConnPoint); - String supportingInterface = null; - - if (isNetworkPort) { - supportingInterface = portMap.getSupportingOdu4(); - } else { - supportingInterface = portMap.getSupportingEthernet(); - } - if (portMap == null) { + Mapping mapping = this.portMapping.getMapping(nodeId, logicalConnPoint); + if (mapping == null) { throw new OpenRoadmInterfaceException( - String.format("Unable to get mapping from PortMapping for node % and logical connection port %s", - nodeId, logicalConnPoint)); + String.format(MAPPING_ERROR_EXCEPTION_MESSAGE, nodeId, logicalConnPoint)); + } + InterfaceBuilder oduInterfaceBldr = createGenericInterfaceBuilder(mapping, OtnOdu.class, + logicalConnPoint + "-ODU2-" + serviceName); + if (mapping.getSupportingOdu4() != null) { + oduInterfaceBldr.setSupportingInterface(mapping.getSupportingOdu4()); + } + if (mapping.getSupportingEthernet() != null) { + oduInterfaceBldr.setSupportingInterface(mapping.getSupportingEthernet()); } - InterfaceBuilder oduInterfaceBldr = - createGenericInterfaceBuilder(portMap, OtnOdu.class, logicalConnPoint + "-ODU2-" + serviceName) - .setSupportingInterface(supportingInterface); + Class oduFunction; + MonitoringMode monitoringMode; + Opu opu = null; + ParentOduAllocation parentOduAllocation = null; + if (isCTP) { + oduFunction = ODUCTP.class; + monitoringMode = MonitoringMode.Monitored; + List tribSlots = new ArrayList<>(); + Uint16 newIdx = Uint16.valueOf(tribSlotIndex); + tribSlots.add(newIdx); + IntStream.range(tribSlotIndex, tribSlotIndex + 8) + .forEach(nbr -> tribSlots.add(Uint16.valueOf(nbr))); + parentOduAllocation = new ParentOduAllocationBuilder() + .setTribPortNumber(Uint16.valueOf(tribPortNumber)) + .setTribSlots(tribSlots) + .build(); + } else { + oduFunction = ODUTTPCTP.class; + monitoringMode = MonitoringMode.Terminated; + opu = new OpuBuilder() + .setPayloadType(PayloadTypeDef.getDefaultInstance(payloadType)) + .setExpPayloadType(PayloadTypeDef.getDefaultInstance(payloadType)) + .build(); + } OduBuilder oduIfBuilder = new OduBuilder() .setRate(ODU2.class) - .setOduFunction(ODUTTPCTP.class) - .setMonitoringMode(OduAttributes.MonitoringMode.Terminated); - if (isNetworkPort) { - List tribSlots = new ArrayList<>(); - IntStream.range(tribSlotIndex, tribSlotIndex + 8).forEach( - nbr -> tribSlots.add(Uint16.valueOf(nbr)) - ); - ParentOduAllocationBuilder parentOduAllocationBuilder = new ParentOduAllocationBuilder() - //set trib port numbers - .setTribPortNumber(tribPortNumber) - .setTribSlots(tribSlots); - oduIfBuilder.setOduFunction(ODUCTP.class) - .setMonitoringMode(OduAttributes.MonitoringMode.Monitored) - .setParentOduAllocation(parentOduAllocationBuilder.build()); + .setOduFunction(oduFunction) + .setMonitoringMode(monitoringMode) + .setOpu(opu) + .setParentOduAllocation(parentOduAllocation); + if (apiInfoA != null) { + oduIfBuilder.setTxSapi(apiInfoA.getSapi()) + .setTxDapi(apiInfoA.getDapi()) + .setExpectedSapi(apiInfoA.getExpectedSapi()) + .setExpectedDapi(apiInfoA.getExpectedDapi()); } - else { - // Set Opu attributes - OpuBuilder opuBldr = new OpuBuilder() - .setPayloadType(new PayloadTypeDef(payLoad)) - .setExpPayloadType(new PayloadTypeDef(payLoad)); - oduIfBuilder.setOpu(opuBldr.build()); + if (apiInfoZ != null) { + oduIfBuilder.setTxSapi(apiInfoZ.getSapi()) + .setTxDapi(apiInfoZ.getDapi()) + .setExpectedSapi(apiInfoZ.getExpectedSapi()) + .setExpectedDapi(apiInfoZ.getExpectedDapi()); } - // Create Interface1 type object required for adding as augmentation // TODO look at imports of different versions of class - // Create Interface1 type object required for adding as augmentation - // TODO look at imports of different versions of class - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181019.Interface1Builder oduIf1Builder = - new org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181019.Interface1Builder(); - oduInterfaceBldr.addAugmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181019.Interface1.class, - oduIf1Builder.setOdu(oduIfBuilder.build()).build()); + org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181019.Interface1Builder + oduIf1Builder = new + org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181019.Interface1Builder(); + oduInterfaceBldr.addAugmentation(oduIf1Builder.setOdu(oduIfBuilder.build()).build()); // Post interface on the device this.openRoadmInterfaces.postOTNInterface(nodeId, oduInterfaceBldr); - LOG.info("returning the ODU2 inteface {}", oduInterfaceBldr.getName()); + if (!isCTP) { + LOG.info("{}-{} updating mapping with interface {}", nodeId, logicalConnPoint, oduInterfaceBldr.getName()); + this.portMapping.updateMapping(nodeId, mapping); + } return oduInterfaceBldr.getName(); } }