X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=renderer%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Frenderer%2Fopenroadminterface%2FOpenRoadmInterface221.java;h=772f1a53b62bcd62645984c68b6acac45e81494b;hb=34cbca4ad81fbd29e833197f0e4b09128daa8b95;hp=232b75518d6c74ad0f862d3f7c879cef03e6282d;hpb=869d6c3def408c3d984617a2dd4bada049db94a1;p=transportpce.git diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface221.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface221.java index 232b75518..772f1a53b 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface221.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface221.java @@ -13,14 +13,15 @@ import java.util.ArrayList; import java.util.List; import java.util.Optional; -import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; +import org.opendaylight.mdsal.common.api.LogicalDatastoreType; +import org.opendaylight.transportpce.common.StringConstants; import org.opendaylight.transportpce.common.Timeouts; import org.opendaylight.transportpce.common.device.DeviceTransactionManager; import org.opendaylight.transportpce.common.fixedflex.FixedFlexInterface; 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.rev170228.network.nodes.Mapping; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.Mapping; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.FrequencyGHz; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.FrequencyTHz; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.PowerDBm; @@ -84,11 +85,8 @@ public class OpenRoadmInterface221 { // Ethernet interface specific data EthernetBuilder ethIfBuilder = new EthernetBuilder(); - ethIfBuilder.setAutoNegotiation(EthAttributes.AutoNegotiation.Enabled); - ethIfBuilder.setDuplex(EthAttributes.Duplex.Full); ethIfBuilder.setFec(EthAttributes.Fec.Off); ethIfBuilder.setSpeed(100000L); - ethIfBuilder.setMtu(9000L); InterfaceBuilder ethInterfaceBldr = createGenericInterfaceBuilder(portMap, EthernetCsmacd.class, logicalConnPoint + "-ETHERNET"); @@ -98,6 +96,10 @@ public class OpenRoadmInterface221 { // Post interface on the device openRoadmInterfaces.postInterface(nodeId, ethInterfaceBldr); + + // Post the equipment-state change on the device circuit-pack + openRoadmInterfaces.postEquipmentState(nodeId, portMap.getSupportingCircuitPackName(), true); + return ethInterfaceBldr.getName(); } @@ -105,8 +107,13 @@ public class OpenRoadmInterface221 { * This methods creates an OCH interface on the given termination point on * Roadm. * + * @param nodeId node ID + * @param logicalConnPoint logical connection point * @param waveNumber wavelength number of the OCH interface. + * * @return Name of the interface if successful, otherwise return null. + * + * @throws OpenRoadmInterfaceException OpenRoadm interface exception */ public List createFlexOCH(String nodeId, String logicalConnPoint, Long waveNumber) @@ -114,12 +121,14 @@ public class OpenRoadmInterface221 { List interfacesCreated = new ArrayList<>(); + if (logicalConnPoint.contains("DEG")) { + String mcInterfaceCreated = createMCInterface(nodeId, logicalConnPoint, waveNumber); + interfacesCreated.add(mcInterfaceCreated); + } + String nmcInterfaceCreated = createNMCInterface(nodeId, logicalConnPoint, waveNumber); interfacesCreated.add(nmcInterfaceCreated); - String mcInterfaceCreated = createMCInterface(nodeId, logicalConnPoint, waveNumber); - interfacesCreated.add(mcInterfaceCreated); - return interfacesCreated; } @@ -132,14 +141,15 @@ public class OpenRoadmInterface221 { Mapping portMap = 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)); + throw new OpenRoadmInterfaceException( + String.format("Unable to get mapping from PortMapping for node % and logical connection port %s", + nodeId, logicalConnPoint)); } // TODO : Check this method InterfaceBuilder mcInterfaceBldr = createGenericInterfaceBuilder(portMap, - MediaChannelTrailTerminationPoint.class, logicalConnPoint + "-mc"); + MediaChannelTrailTerminationPoint.class, logicalConnPoint + "-mc" + "-" + waveNumber); mcInterfaceBldr.setSupportingInterface(portMap.getSupportingOms()); McTtpBuilder mcTtpBuilder = new McTtpBuilder(); @@ -148,8 +158,8 @@ public class OpenRoadmInterface221 { // Create Interface1 type object required for adding as augmentation org.opendaylight.yang.gen.v1.http.org.openroadm.media.channel.interfaces.rev181019.Interface1Builder - interface1Builder = new org.opendaylight.yang.gen.v1.http.org.openroadm.media.channel.interfaces.rev181019 - .Interface1Builder(); + interface1Builder = + new org.opendaylight.yang.gen.v1.http.org.openroadm.media.channel.interfaces.rev181019.Interface1Builder(); interface1Builder.setMcTtp(mcTtpBuilder.build()); mcInterfaceBldr.addAugmentation( org.opendaylight.yang.gen.v1.http.org.openroadm.media.channel.interfaces.rev181019.Interface1.class, @@ -169,26 +179,36 @@ public class OpenRoadmInterface221 { Mapping portMap = 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)); + throw new OpenRoadmInterfaceException( + String.format("Unable to get mapping from PortMapping for node % and logical connection port %s", + nodeId, logicalConnPoint)); } - // TODO : Check this method + LOG.info(" Freq Start {} and Freq End {} and center-Freq {}", + String.valueOf(fixedFlex.getStart()), String.valueOf(fixedFlex.getStop()), + String.valueOf(fixedFlex.getCenterFrequency())); + //TODO : Check this method InterfaceBuilder nmcInterfaceBldr = createGenericInterfaceBuilder(portMap, - NetworkMediaChannelConnectionTerminationPoint.class, logicalConnPoint + "-nmc"); - nmcInterfaceBldr.setSupportingInterface(logicalConnPoint + "-mc"); + NetworkMediaChannelConnectionTerminationPoint.class, logicalConnPoint + "-nmc" + "-" + waveNumber); + if (logicalConnPoint.contains("DEG")) { + nmcInterfaceBldr.setSupportingInterface(logicalConnPoint + "-mc" + "-" + waveNumber); + } + NmcCtpBuilder nmcCtpIfBuilder = new NmcCtpBuilder(); nmcCtpIfBuilder.setFrequency(FrequencyTHz.getDefaultInstance(String.valueOf(fixedFlex.getCenterFrequency()))); - nmcCtpIfBuilder.setWidth(FrequencyGHz.getDefaultInstance(String.valueOf(fixedFlex.getWavelength()))); + nmcCtpIfBuilder.setWidth(FrequencyGHz.getDefaultInstance("40")); + // Create Interface1 type object required for adding as augmentation org.opendaylight.yang.gen.v1.http.org.openroadm.network.media.channel.interfaces.rev181019.Interface1Builder - nmcCtpI1fBuilder = new org.opendaylight.yang.gen.v1.http.org.openroadm.network.media.channel.interfaces - .rev181019.Interface1Builder(); + nmcCtpI1fBuilder = new + org.opendaylight.yang.gen.v1.http.org.openroadm.network.media.channel.interfaces.rev181019 + .Interface1Builder(); nmcCtpI1fBuilder.setNmcCtp(nmcCtpIfBuilder.build()); nmcInterfaceBldr.addAugmentation( org.opendaylight.yang.gen.v1.http.org.openroadm.network.media.channel.interfaces.rev181019.Interface1.class, nmcCtpI1fBuilder.build()); + // Post interface on the device openRoadmInterfaces.postInterface(nodeId, nmcInterfaceBldr); return nmcInterfaceBldr.getName(); @@ -202,16 +222,15 @@ public class OpenRoadmInterface221 { Mapping portMap = portMapping.getMapping(nodeId, logicalConnPoint); if (portMap == null) { - throw new OpenRoadmInterfaceException(String.format("Unable to get mapping from PortMapping for node %s and" - + " logical connection port %s", nodeId, logicalConnPoint)); + throw new OpenRoadmInterfaceException( + String.format("Unable to get mapping from PortMapping for node %s and logical connection port %s", + nodeId, logicalConnPoint)); } // OCH interface specific data OchBuilder ocIfBuilder = new OchBuilder(); ocIfBuilder.setFrequency(FrequencyTHz.getDefaultInstance(String.valueOf(fixedFlex.getCenterFrequency()))); - // ocIfBuilder.setWidth(FrequencyGHz.getDefaultInstance(String.valueOf(fixedFlex.getWavelength()))); - // ocIfBuilder.setModulationFormat(ModulationFormat.DpQpsk); ocIfBuilder.setRate(R100G.class); ocIfBuilder.setTransmitPower(new PowerDBm(new BigDecimal("-5"))); @@ -229,6 +248,12 @@ public class OpenRoadmInterface221 { // Post interface on the device openRoadmInterfaces.postInterface(nodeId, ochInterfaceBldr); + + // Post the equipment-state change on the device circuit-pack if xpdr node + if (portMap.getLogicalConnectionPoint().contains(StringConstants.NETWORK_TOKEN)) { + this.openRoadmInterfaces.postEquipmentState(nodeId, portMap.getSupportingCircuitPackName(), true); + } + return ochInterfaceBldr.getName(); } @@ -236,8 +261,9 @@ public class OpenRoadmInterface221 { throws OpenRoadmInterfaceException { Mapping portMap = 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)); + throw new OpenRoadmInterfaceException( + String.format("Unable to get mapping from PortMapping for node % and logical connection port %s", + nodeId, logicalConnPoint)); } InterfaceBuilder oduInterfaceBldr = createGenericInterfaceBuilder(portMap, OtnOdu.class, logicalConnPoint + "-ODU"); @@ -256,9 +282,8 @@ public class OpenRoadmInterface221 { // 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(); + 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()); @@ -272,8 +297,9 @@ public class OpenRoadmInterface221 { throws OpenRoadmInterfaceException { Mapping portMap = 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)); + throw new OpenRoadmInterfaceException( + String.format("Unable to get mapping from PortMapping for node % and logical connection port %s", + nodeId, logicalConnPoint)); } // Create generic interface InterfaceBuilder otuInterfaceBldr = createGenericInterfaceBuilder(portMap, OtnOtu.class, @@ -287,9 +313,8 @@ public class OpenRoadmInterface221 { // 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.otu.interfaces.rev181019.Interface1Builder - otuIf1Builder = new org.opendaylight.yang.gen.v1.http.org.openroadm.otn.otu.interfaces.rev181019 - .Interface1Builder(); + org.opendaylight.yang.gen.v1.http.org.openroadm.otn.otu.interfaces.rev181019.Interface1Builder otuIf1Builder = + new org.opendaylight.yang.gen.v1.http.org.openroadm.otn.otu.interfaces.rev181019.Interface1Builder(); otuInterfaceBldr.addAugmentation( org.opendaylight.yang.gen.v1.http.org.openroadm.otn.otu.interfaces.rev181019.Interface1.class, otuIf1Builder.setOtu(otuIfBuilder.build()).build());