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=734c6e5818dcba4b648e8d376b2e1eb336766e3f;hb=refs%2Fchanges%2F54%2F74654%2F5;hp=a0f513a1f4026a81f206f0ade21651c42be2c8f9;hpb=17ed4b007aeaca9c1c88c49f70c70d2195f9cf5b;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 a0f513a1f..734c6e581 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 @@ -12,6 +12,7 @@ import java.math.BigDecimal; import org.opendaylight.transportpce.common.mapping.PortMapping; import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaceException; import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaces; +import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfacesImpl; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev161014.PowerDBm; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.interfaces.grp.InterfaceBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.interfaces.grp.InterfaceKey; @@ -50,12 +51,12 @@ public class OpenRoadmInterfaceFactory { this.openRoadmInterfaces = openRoadmInterfaces; } - public String createOpenRoadmEthInterface(String nodeId, - String logicalConnPoint) throws OpenRoadmInterfaceException { + public String createOpenRoadmEthInterface(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 %s 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)); } // Ethernet interface specific data @@ -67,7 +68,7 @@ public class OpenRoadmInterfaceFactory { ethIfBuilder.setMtu(9000L); InterfaceBuilder ethInterfaceBldr = createGenericInterfaceBuilder(portMap, EthernetCsmacd.class, - logicalConnPoint + "-ETHERNET"); + logicalConnPoint + "-ETHERNET"); // Create Interface1 type object required for adding as augmentation Interface1Builder ethIf1Builder = new Interface1Builder(); @@ -75,6 +76,10 @@ public class OpenRoadmInterfaceFactory { // Post interface on the device this.openRoadmInterfaces.postInterface(nodeId, ethInterfaceBldr); + + // Post the equipment-state change on the device circuit-pack + this.openRoadmInterfaces.postEquipmentState(nodeId, portMap.getSupportingCircuitPackName(), true); + return ethInterfaceBldr.getName(); } @@ -88,16 +93,16 @@ public class OpenRoadmInterfaceFactory { * @return Name of the interface if successful, otherwise return null. */ - public String createOpenRoadmOchInterface(String nodeId, String logicalConnPoint, Long waveNumber) throws - OpenRoadmInterfaceException { + public String createOpenRoadmOchInterface(String nodeId, String logicalConnPoint, Long waveNumber) + 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 %s and" - + " logical connection port %s", nodeId, logicalConnPoint)); + + " logical connection port %s", nodeId, logicalConnPoint)); } // Create generic interface InterfaceBuilder ochInterfaceBldr = createGenericInterfaceBuilder(portMap, OpticalChannel.class, - createOpenRoadmOchInterfaceName(logicalConnPoint, waveNumber)); + createOpenRoadmOchInterfaceName(logicalConnPoint, waveNumber)); // OCH interface specific data OchBuilder ocIfBuilder = new OchBuilder(); @@ -113,20 +118,25 @@ public class OpenRoadmInterfaceFactory { .Interface1Builder ochIf1Builder = new org.opendaylight.yang.gen.v1.http.org.openroadm.optical.channel .interfaces.rev161014.Interface1Builder(); ochInterfaceBldr.addAugmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.optical.channel.interfaces.rev161014.Interface1.class, - ochIf1Builder.setOch(ocIfBuilder.build()).build()); + org.opendaylight.yang.gen.v1.http.org.openroadm.optical.channel.interfaces.rev161014.Interface1.class, + ochIf1Builder.setOch(ocIfBuilder.build()).build()); // Post interface on the device this.openRoadmInterfaces.postInterface(nodeId, ochInterfaceBldr); + + // Post the equipment-state change on the device circuit-pack if xpdr node + if (portMap.getLogicalConnectionPoint().contains(OpenRoadmInterfacesImpl.NETWORK_TOKEN)) { + this.openRoadmInterfaces.postEquipmentState(nodeId, portMap.getSupportingCircuitPackName(), true); + } return ochInterfaceBldr.getName(); } - public String createOpenRoadmOchInterface(String nodeId, String logicalConnPoint, Long waveNumber, - Class rate, OchAttributes.ModulationFormat format) throws OpenRoadmInterfaceException { + public String createOpenRoadmOchInterface(String nodeId, String logicalConnPoint, Long waveNumber, Class< + ? extends RateIdentity> rate, OchAttributes.ModulationFormat format) 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 %s and" - + " logical connection port %s", nodeId, logicalConnPoint)); + + " logical connection port %s", nodeId, logicalConnPoint)); } // OCH interface specific data @@ -143,13 +153,18 @@ public class OpenRoadmInterfaceFactory { .interfaces.rev161014.Interface1Builder(); // Create generic interface InterfaceBuilder ochInterfaceBldr = createGenericInterfaceBuilder(portMap, OpticalChannel.class, - createOpenRoadmOchInterfaceName(logicalConnPoint, waveNumber)); + createOpenRoadmOchInterfaceName(logicalConnPoint, waveNumber)); ochInterfaceBldr.addAugmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.optical.channel.interfaces.rev161014.Interface1.class, - ochIf1Builder.setOch(ocIfBuilder.build()).build()); + org.opendaylight.yang.gen.v1.http.org.openroadm.optical.channel.interfaces.rev161014.Interface1.class, + ochIf1Builder.setOch(ocIfBuilder.build()).build()); // Post interface on the device this.openRoadmInterfaces.postInterface(nodeId, ochInterfaceBldr); + + // Post the equipment-state change on the device circuit-pack if xpdr node + if (portMap.getLogicalConnectionPoint().contains(OpenRoadmInterfacesImpl.NETWORK_TOKEN)) { + this.openRoadmInterfaces.postEquipmentState(nodeId, portMap.getSupportingCircuitPackName(), true); + } return ochInterfaceBldr.getName(); } @@ -165,14 +180,14 @@ public class OpenRoadmInterfaceFactory { */ public String createOpenRoadmOdu4Interface(String nodeId, String logicalConnPoint, String supportingOtuInterface) - throws OpenRoadmInterfaceException { + 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 %s 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"); + InterfaceBuilder oduInterfaceBldr = createGenericInterfaceBuilder(portMap, OtnOdu.class, logicalConnPoint + + "-ODU"); oduInterfaceBldr.setSupportingInterface(supportingOtuInterface); // ODU interface specific data @@ -180,20 +195,19 @@ public class OpenRoadmInterfaceFactory { oduIfBuilder.setRate(ODU4.class); oduIfBuilder.setMonitoringMode(OduAttributes.MonitoringMode.Terminated); - //Set Opu attributes + // Set Opu attributes OpuBuilder opuBldr = new OpuBuilder(); opuBldr.setPayloadType("07"); opuBldr.setExpPayloadType("07"); oduIfBuilder.setOpu(opuBldr.build()); - // 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.rev161014.Interface1Builder oduIf1Builder = - new org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev161014.Interface1Builder(); + new org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev161014.Interface1Builder(); oduInterfaceBldr.addAugmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev161014.Interface1.class, - oduIf1Builder.setOdu(oduIfBuilder.build()).build()); + org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev161014.Interface1.class, oduIf1Builder + .setOdu(oduIfBuilder.build()).build()); // Post interface on the device this.openRoadmInterfaces.postInterface(nodeId, oduInterfaceBldr); @@ -208,15 +222,15 @@ public class OpenRoadmInterfaceFactory { */ public String createOpenRoadmOtu4Interface(String nodeId, String logicalConnPoint, String supportOchInterface) - throws OpenRoadmInterfaceException { + 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 %s 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, - logicalConnPoint + "-OTU"); + InterfaceBuilder otuInterfaceBldr = createGenericInterfaceBuilder(portMap, OtnOtu.class, logicalConnPoint + + "-OTU"); otuInterfaceBldr.setSupportingInterface(supportOchInterface); // OTU interface specific data @@ -227,10 +241,10 @@ public class OpenRoadmInterfaceFactory { // 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.rev161014.Interface1Builder otuIf1Builder = - new org.opendaylight.yang.gen.v1.http.org.openroadm.otn.otu.interfaces.rev161014.Interface1Builder(); + new org.opendaylight.yang.gen.v1.http.org.openroadm.otn.otu.interfaces.rev161014.Interface1Builder(); otuInterfaceBldr.addAugmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.otu.interfaces.rev161014.Interface1.class, - otuIf1Builder.setOtu(otuIfBuilder.build()).build()); + org.opendaylight.yang.gen.v1.http.org.openroadm.otn.otu.interfaces.rev161014.Interface1.class, otuIf1Builder + .setOtu(otuIfBuilder.build()).build()); // Post interface on the device this.openRoadmInterfaces.postInterface(nodeId, otuInterfaceBldr); @@ -249,8 +263,8 @@ public class OpenRoadmInterfaceFactory { // Create Interface1 type object required for adding as // augmentation org.opendaylight.yang.gen.v1.http.org.openroadm.optical.transport.interfaces.rev161014 - .Interface1Builder otsIf1Builder = new org.opendaylight.yang.gen.v1.http.org.openroadm.optical - .transport.interfaces.rev161014.Interface1Builder(); + .Interface1Builder otsIf1Builder = new org.opendaylight.yang.gen.v1.http.org.openroadm.optical.transport + .interfaces.rev161014.Interface1Builder(); otsInterfaceBldr.addAugmentation( org.opendaylight.yang.gen.v1.http.org.openroadm.optical.transport.interfaces.rev161014.Interface1.class, otsIf1Builder.setOts(otsIfBuilder.build()).build()); @@ -282,7 +296,7 @@ public class OpenRoadmInterfaceFactory { } private InterfaceBuilder createGenericInterfaceBuilder(Mapping portMap, Class type, - String key) { + String key) { InterfaceBuilder interfaceBuilder = new InterfaceBuilder(); interfaceBuilder.setDescription(" TBD "); interfaceBuilder.setCircuitId(" TBD ");