X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=renderer%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Frenderer%2Fopenroadminterface%2FOpenRoadmInterfaceFactory.java;fp=renderer%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Frenderer%2Fopenroadminterface%2FOpenRoadmInterfaceFactory.java;h=70abad7dc1453e4abe2109dc8704fbefca632412;hb=82610815f1b706e2f9b5e5578474f3a8205c41aa;hp=75b43fa2729389aa1b73ebae5bf0d364423c7a06;hpb=253d858d4554b9b60ca0fb245f86dbd75e2db846;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 75b43fa27..70abad7dc 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 @@ -13,6 +13,7 @@ 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.opendaylight.transportpce.portmapping.rev170228.network.nodes.Mapping; 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; @@ -40,7 +41,6 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev161 import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.otu.interfaces.rev161014.OTU4; import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.otu.interfaces.rev161014.OtuAttributes; import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.otu.interfaces.rev161014.otu.container.OtuBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.portmapping.rev170228.network.nodes.Mapping; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -54,7 +54,7 @@ public class OpenRoadmInterfaceFactory { this.openRoadmInterfaces = openRoadmInterfaces; } - public String createOpenRoadmEthInterface(String nodeId, String logicalConnPoint,String serviceName) + public String createOpenRoadmEthInterface(String nodeId, String logicalConnPoint) throws OpenRoadmInterfaceException { Mapping portMap = this.portMapping.getMapping(nodeId, logicalConnPoint); if (portMap == null) { @@ -71,7 +71,7 @@ public class OpenRoadmInterfaceFactory { ethIfBuilder.setMtu(9000L); InterfaceBuilder ethInterfaceBldr = createGenericInterfaceBuilder(portMap, EthernetCsmacd.class, - logicalConnPoint + "-ETHERNET",serviceName); + logicalConnPoint + "-ETHERNET"); // Create Interface1 type object required for adding as augmentation Interface1Builder ethIf1Builder = new Interface1Builder(); @@ -90,14 +90,15 @@ public class OpenRoadmInterfaceFactory { * This methods creates an OCH interface on the given termination point on * Roadm. * - * @param waveNumber - * wavelength number of the OCH interface. + * @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 OpenRoadmInterfaceException */ - public String createOpenRoadmOchInterface(String nodeId, String logicalConnPoint, Long waveNumber, - String serviceName) + public String createOpenRoadmOchInterface(String nodeId, String logicalConnPoint, Long waveNumber) throws OpenRoadmInterfaceException { Mapping portMap = this.portMapping.getMapping(nodeId, logicalConnPoint); if (portMap == null) { @@ -106,7 +107,7 @@ public class OpenRoadmInterfaceFactory { } // Create generic interface InterfaceBuilder ochInterfaceBldr = createGenericInterfaceBuilder(portMap, OpticalChannel.class, - createOpenRoadmOchInterfaceName(logicalConnPoint, waveNumber),serviceName); + createOpenRoadmOchInterfaceName(logicalConnPoint, waveNumber)); // OCH interface specific data OchBuilder ocIfBuilder = new OchBuilder(); @@ -136,8 +137,7 @@ public class OpenRoadmInterfaceFactory { } public String createOpenRoadmOchInterface(String nodeId, String logicalConnPoint, Long waveNumber, Class< - ? extends RateIdentity> rate, OchAttributes.ModulationFormat format,String serviceName) - throws OpenRoadmInterfaceException { + ? 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" @@ -158,7 +158,7 @@ public class OpenRoadmInterfaceFactory { .interfaces.rev161014.Interface1Builder(); // Create generic interface InterfaceBuilder ochInterfaceBldr = createGenericInterfaceBuilder(portMap, OpticalChannel.class, - createOpenRoadmOchInterfaceName(logicalConnPoint, waveNumber),serviceName); + createOpenRoadmOchInterfaceName(logicalConnPoint, waveNumber)); ochInterfaceBldr.addAugmentation( org.opendaylight.yang.gen.v1.http.org.openroadm.optical.channel.interfaces.rev161014.Interface1.class, ochIf1Builder.setOch(ocIfBuilder.build()).build()); @@ -180,12 +180,15 @@ public class OpenRoadmInterfaceFactory { /** * This methods creates an ODU interface on the given termination point. * + * @param nodeId node ID + * @param logicalConnPoint logical Connection Point + * @param supportingOtuInterface supporting OTU Interface * * @return Name of the interface if successful, otherwise return null. + * @throws OpenRoadmInterfaceException OpenRoadmInterfaceException */ - public String createOpenRoadmOdu4Interface(String nodeId, String logicalConnPoint, String supportingOtuInterface, - String serviceName) + public String createOpenRoadmOdu4Interface(String nodeId, String logicalConnPoint, String supportingOtuInterface) throws OpenRoadmInterfaceException { Mapping portMap = this.portMapping.getMapping(nodeId, logicalConnPoint); if (portMap == null) { @@ -193,7 +196,7 @@ public class OpenRoadmInterfaceFactory { + " logical connection port %s", nodeId, logicalConnPoint)); } InterfaceBuilder oduInterfaceBldr = createGenericInterfaceBuilder(portMap, OtnOdu.class, logicalConnPoint - + "-ODU",serviceName); + + "-ODU"); oduInterfaceBldr.setSupportingInterface(supportingOtuInterface); // ODU interface specific data @@ -223,13 +226,15 @@ public class OpenRoadmInterfaceFactory { /** * This methods creates an OTU interface on the given termination point. * + * @param nodeId node ID + * @param logicalConnPoint logical Connection Point + * @param supportOchInterface support OCH Interface * * @return Name of the interface if successful, otherwise return null. * @throws OpenRoadmInterfaceException OpenRoadmInterfaceException */ - public String createOpenRoadmOtu4Interface(String nodeId, String logicalConnPoint, String supportOchInterface, - String serviceName) + public String createOpenRoadmOtu4Interface(String nodeId, String logicalConnPoint, String supportOchInterface) throws OpenRoadmInterfaceException { Mapping portMap = this.portMapping.getMapping(nodeId, logicalConnPoint); if (portMap == null) { @@ -238,7 +243,7 @@ public class OpenRoadmInterfaceFactory { } // Create generic interface InterfaceBuilder otuInterfaceBldr = createGenericInterfaceBuilder(portMap, OtnOtu.class, logicalConnPoint - + "-OTU",serviceName); + + "-OTU"); otuInterfaceBldr.setSupportingInterface(supportOchInterface); // OTU interface specific data @@ -263,7 +268,7 @@ public class OpenRoadmInterfaceFactory { if (mapping.getSupportingOts() == null) { // Create generic interface InterfaceBuilder otsInterfaceBldr = createGenericInterfaceBuilder(mapping, OpticalTransport.class, "OTS-" - + mapping.getLogicalConnectionPoint(),""); + + mapping.getLogicalConnectionPoint()); // OTS interface augmentation specific data OtsBuilder otsIfBuilder = new OtsBuilder(); otsIfBuilder.setFiberType(FiberType.Smf); @@ -288,7 +293,7 @@ public class OpenRoadmInterfaceFactory { if (mapping.getSupportingOms() == null) { // Create generic interface InterfaceBuilder omsInterfaceBldr = createGenericInterfaceBuilder(mapping, OpenROADMOpticalMultiplex.class, - "OMS-" + mapping.getLogicalConnectionPoint(),""); + "OMS-" + mapping.getLogicalConnectionPoint()); if (mapping.getSupportingOts() != null) { omsInterfaceBldr.setSupportingInterface(mapping.getSupportingOts()); } else { @@ -305,10 +310,10 @@ public class OpenRoadmInterfaceFactory { } private InterfaceBuilder createGenericInterfaceBuilder(Mapping portMap, Class type, - String key,String serviceName) { + String key) { InterfaceBuilder interfaceBuilder = new InterfaceBuilder(); interfaceBuilder.setDescription(" TBD "); - interfaceBuilder.setCircuitId(serviceName); + interfaceBuilder.setCircuitId(" TBD "); interfaceBuilder.setSupportingCircuitPackName(portMap.getSupportingCircuitPackName()); interfaceBuilder.setSupportingPort(portMap.getSupportingPort()); interfaceBuilder.setAdministrativeState(AdminStates.InService);