X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=common%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fcommon%2Fopenroadminterfaces%2FOpenRoadmInterfacesImpl710.java;h=7adf3950c86dc640527ea36855331450c7902ffe;hb=98b07b5da982529cdec2db98f5b96902ed47323b;hp=4152b2e38d7549abbee43b7d8d958277e5444740;hpb=a2c0845af51f68102d9f32df83cdfa93fbf9bb35;p=transportpce.git diff --git a/common/src/main/java/org/opendaylight/transportpce/common/openroadminterfaces/OpenRoadmInterfacesImpl710.java b/common/src/main/java/org/opendaylight/transportpce/common/openroadminterfaces/OpenRoadmInterfacesImpl710.java index 4152b2e38..7adf3950c 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/openroadminterfaces/OpenRoadmInterfacesImpl710.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/openroadminterfaces/OpenRoadmInterfacesImpl710.java @@ -21,7 +21,8 @@ import org.opendaylight.transportpce.common.device.DeviceTransaction; import org.opendaylight.transportpce.common.device.DeviceTransactionManager; import org.opendaylight.transportpce.common.mapping.PortMapping; import org.opendaylight.transportpce.common.mapping.PortMappingVersion710; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.mapping.Mapping; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.mapping.Mapping; +import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.OrgOpenroadmDeviceData; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.circuit.pack.Ports; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.circuit.pack.PortsKey; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.circuit.packs.CircuitPacks; @@ -35,7 +36,6 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.port.Int import org.opendaylight.yang.gen.v1.http.org.openroadm.equipment.states.types.rev191129.AdminStates; import org.opendaylight.yang.gen.v1.http.org.openroadm.equipment.states.types.rev191129.States; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -47,11 +47,10 @@ public class OpenRoadmInterfacesImpl710 { private final PortMapping portMapping; private final PortMappingVersion710 portMapping710; - public OpenRoadmInterfacesImpl710(DeviceTransactionManager deviceTransactionManager, - PortMapping portMapping, PortMappingVersion710 portMapping710) { + public OpenRoadmInterfacesImpl710(DeviceTransactionManager deviceTransactionManager, PortMapping portMapping) { this.deviceTransactionManager = deviceTransactionManager; this.portMapping = portMapping; - this.portMapping710 = portMapping710; + this.portMapping710 = portMapping.getPortMappingVersion710(); } public void postInterface(String nodeId, InterfaceBuilder ifBuilder) throws OpenRoadmInterfaceException { @@ -70,8 +69,10 @@ public class OpenRoadmInterfacesImpl710 { nodeId), e); } - InstanceIdentifier interfacesIID = InstanceIdentifier.create(OrgOpenroadmDevice.class).child( - Interface.class, new InterfaceKey(ifBuilder.getName())); + InstanceIdentifier interfacesIID = InstanceIdentifier + .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class) + .child(Interface.class, new InterfaceKey(ifBuilder.getName())) + .build(); LOG.info("POST INTERF for {} : InterfaceBuilder : name = {} \t type = {}", nodeId, ifBuilder.getName(), ifBuilder.getType().toString()); deviceTx.merge(LogicalDatastoreType.CONFIGURATION, interfacesIID, ifBuilder.build()); @@ -93,13 +94,17 @@ public class OpenRoadmInterfacesImpl710 { }; try { txSubmitFuture.get(); - LOG.info("Successfully posted interface {} on node {}", ifBuilder.getName(), nodeId); - boolean devicePortIsUptodated = false; - while (!devicePortIsUptodated) { - devicePortIsUptodated = checkIfDevicePortIsUpdatedWithInterface(nodeId, ifBuilder); + LOG.info("Successfully posted/deleted interface {} on node {}", ifBuilder.getName(), nodeId); + // this check is not needed during the delete operation + // during the delete operation, ifBuilder does not contain supporting-cp and supporting-port + if (ifBuilder.getSupportingCircuitPackName() != null && ifBuilder.getSupportingPort() != null) { + boolean devicePortIsUptodated = false; + while (!devicePortIsUptodated) { + devicePortIsUptodated = checkIfDevicePortIsUpdatedWithInterface(nodeId, ifBuilder); + } + LOG.info("{} - {} - interface {} updated on port {}", nodeId, ifBuilder.getSupportingCircuitPackName(), + ifBuilder.getName(), ifBuilder.getSupportingPort()); } - LOG.info("{} - {} - interface {} updated on port {}", nodeId, ifBuilder.getSupportingCircuitPackName(), - ifBuilder.getName(), ifBuilder.getSupportingPort()); timer.interrupt(); } catch (InterruptedException | ExecutionException e) { throw new OpenRoadmInterfaceException(String.format("Failed to post interface %s on node %s!", ifBuilder @@ -109,8 +114,10 @@ public class OpenRoadmInterfacesImpl710 { public Optional getInterface(String nodeId, String interfaceName) throws OpenRoadmInterfaceException { - InstanceIdentifier interfacesIID = InstanceIdentifier.create(OrgOpenroadmDevice.class) - .child(Interface.class, new InterfaceKey(interfaceName)); + InstanceIdentifier interfacesIID = InstanceIdentifier + .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class) + .child(Interface.class, new InterfaceKey(interfaceName)) + .build(); return deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType.CONFIGURATION, interfacesIID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); } @@ -136,10 +143,7 @@ public class OpenRoadmInterfacesImpl710 { // Though these could be redundant, but 'when' statements are causing problem, // when deleting the interfaces trying to be deleted .setName(intf2Delete.getName()) - .setType(intf2Delete.getType()) - // CP name and the ports are needed, since the post interface is validated - .setSupportingCircuitPackName(intf2Delete.getSupportingCircuitPackName()) - .setSupportingPort(intf2Delete.getSupportingPort()); + .setType(intf2Delete.getType()); // post interface with updated admin state try { @@ -149,8 +153,10 @@ public class OpenRoadmInterfacesImpl710 { + " deleting it!", interfaceName, AdminStates.OutOfService), ex); } - InstanceIdentifier interfacesIID = InstanceIdentifier.create(OrgOpenroadmDevice.class).child( - Interface.class, new InterfaceKey(interfaceName)); + InstanceIdentifier interfacesIID = InstanceIdentifier + .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class) + .child(Interface.class, new InterfaceKey(interfaceName)) + .build(); Future> deviceTxFuture = this.deviceTransactionManager.getDeviceTransaction( nodeId); DeviceTransaction deviceTx; @@ -196,8 +202,10 @@ public class OpenRoadmInterfacesImpl710 { public void postEquipmentState(String nodeId, String circuitPackName, boolean activate) throws OpenRoadmInterfaceException { - InstanceIdentifier circuitPackIID = InstanceIdentifier.create(OrgOpenroadmDevice.class).child( - CircuitPacks.class, new CircuitPacksKey(circuitPackName)); + InstanceIdentifier circuitPackIID = InstanceIdentifier + .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class) + .child(CircuitPacks.class, new CircuitPacksKey(circuitPackName)) + .build(); Optional cpOpt = this.deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType.CONFIGURATION, circuitPackIID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); @@ -255,7 +263,7 @@ public class OpenRoadmInterfacesImpl710 { try { supInterfOpt = getInterface(nodeId, interf); if (supInterfOpt.isPresent()) { - return supInterfOpt.get().getSupportingInterfaceList().get(0); + return supInterfOpt.get().getSupportingInterfaceList().stream().findFirst().get(); } else { return null; } @@ -266,9 +274,11 @@ public class OpenRoadmInterfacesImpl710 { } private boolean checkIfDevicePortIsUpdatedWithInterface(String nodeId, InterfaceBuilder ifBuilder) { - KeyedInstanceIdentifier portIID = InstanceIdentifier.create(OrgOpenroadmDevice.class) + InstanceIdentifier portIID = InstanceIdentifier + .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class) .child(CircuitPacks.class, new CircuitPacksKey(ifBuilder.getSupportingCircuitPackName())) - .child(Ports.class, new PortsKey(ifBuilder.getSupportingPort())); + .child(Ports.class, new PortsKey(ifBuilder.getSupportingPort())) + .build(); Ports port = deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType.OPERATIONAL, portIID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT).get(); if (port.getInterfaces() == null) {