X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=renderer%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Frenderer%2Fopenroadminterface%2FOpenRoadmInterfaces.java;h=333177d43193adaf3661134c03d29eff03535945;hb=74d11927047a7b6ace072a208ee7b1d9a3769d9d;hp=a23d84e24e84e8bfef40a247626680eedc6e8b23;hpb=0f936bac041cec1f9845b4f1e00bb90df35f4f78;p=transportpce.git diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterfaces.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterfaces.java index a23d84e24..333177d43 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterfaces.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterfaces.java @@ -35,25 +35,48 @@ public class OpenRoadmInterfaces { protected final DataBroker db; protected final DataBroker netconfNodeDataBroker; protected final String nodeId; + protected final MountPointService mps; protected final Mapping portMap; protected final String logicalConnPoint; + private final String serviceName; private static final Logger LOG = LoggerFactory.getLogger(OpenRoadmInterfaces.class); public OpenRoadmInterfaces(DataBroker db, MountPointService mps, String nodeId, String logicalConnPoint) { this.db = db; + this.mps = mps; this.logicalConnPoint = logicalConnPoint; this.nodeId = nodeId; - this.portMap = PortMapping.getMapping(nodeId, logicalConnPoint, db); + if (logicalConnPoint != null) { + this.portMap = PortMapping.getMapping(nodeId, logicalConnPoint, db); + } else { + this.portMap = null; + } + this.serviceName = null; + netconfNodeDataBroker = PortMapping.getDeviceDataBroker(nodeId, mps); + } + + public OpenRoadmInterfaces(DataBroker db, MountPointService mps, String nodeId, String logicalConnPoint, + String serviceName) { + this.db = db; + this.mps = mps; + this.logicalConnPoint = logicalConnPoint; + this.nodeId = nodeId; + if (logicalConnPoint != null) { + this.portMap = PortMapping.getMapping(nodeId, logicalConnPoint, db); + } else { + this.portMap = null; + } + this.serviceName = serviceName; netconfNodeDataBroker = PortMapping.getDeviceDataBroker(nodeId, mps); } /** - * This methods creates a generic interface builder object to set the value - * that are common irrespective of the interface type. + * This methods creates a generic interface builder object to set the value that + * are common irrespective of the interface type. * * @param portMap - * Mapping object containing attributes required to create - * interface on the device. + * Mapping object containing attributes required to create interface + * on the device. * * @return InterfaceBuilder object with the data. */ @@ -69,8 +92,8 @@ public class OpenRoadmInterfaces { } /** - * This methods does an edit-config operation on the openROADM device in - * order to create the given interface. + * This methods does an edit-config operation on the openROADM device in order + * to create the given interface. * *
* Before posting the interface it checks if:
@@ -87,28 +110,26 @@ public class OpenRoadmInterfaces {
* @return Result of operation true/false based on success/failure.
*/
public boolean postInterface(InterfaceBuilder ifBuilder) {
-
String intf2Post = ifBuilder.getName();
Interface intf2PostCheck = getInterface(intf2Post);
- if (intf2PostCheck != null) {
- if (intf2PostCheck.getAdministrativeState() == AdminStates.InService) {
- LOG.info("Interface with same name in service already exists");
- return true;
- }
+ if (intf2PostCheck != null && intf2PostCheck.getAdministrativeState() == AdminStates.InService) {
+ LOG.info("Interface with same name in service already exists on node " + nodeId);
+ return true;
}
+
// Post interface with its specific augmentation to the device
if (netconfNodeDataBroker != null) {
- InstanceIdentifier
* Before deleting the method:
@@ -175,35 +196,35 @@ public class OpenRoadmInterfaces {
// post interface with updated admin state
if (postInterface(ifBuilder)) {
InstanceIdentifier