X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=common%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fcommon%2Fopenroadminterfaces%2FOpenRoadmInterfacesImpl221.java;h=1148f179997a79df4196c57c2d51acf417e24c95;hb=27c71d2147b65e5f174f0be81a25c09e45645df0;hp=f4aec0ab25490402f0571fa27c531455c3bd78ae;hpb=869d6c3def408c3d984617a2dd4bada049db94a1;p=transportpce.git diff --git a/common/src/main/java/org/opendaylight/transportpce/common/openroadminterfaces/OpenRoadmInterfacesImpl221.java b/common/src/main/java/org/opendaylight/transportpce/common/openroadminterfaces/OpenRoadmInterfacesImpl221.java index f4aec0ab2..1148f1799 100755 --- a/common/src/main/java/org/opendaylight/transportpce/common/openroadminterfaces/OpenRoadmInterfacesImpl221.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/openroadminterfaces/OpenRoadmInterfacesImpl221.java @@ -84,7 +84,7 @@ public class OpenRoadmInterfacesImpl221 { public Optional getInterface(String nodeId, String interfaceName) throws OpenRoadmInterfaceException { InstanceIdentifier interfacesIID = InstanceIdentifier.create(OrgOpenroadmDevice.class) .child(Interface.class, new InterfaceKey(interfaceName)); - return deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType.OPERATIONAL, + return deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType.CONFIGURATION, interfacesIID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); } @@ -181,7 +181,6 @@ public class OpenRoadmInterfacesImpl221 { public void postEquipmentState(String nodeId, String circuitPackName, boolean activate) throws OpenRoadmInterfaceException { - InstanceIdentifier circuitPackIID = InstanceIdentifier.create(OrgOpenroadmDevice.class).child( CircuitPacks.class, new CircuitPacksKey(circuitPackName)); Optional cpOpt = this.deviceTransactionManager.getDataFromDevice(nodeId, @@ -197,12 +196,13 @@ public class OpenRoadmInterfacesImpl221 { CircuitPacksBuilder cpBldr = new CircuitPacksBuilder(cp); boolean change = false; if (activate) { - if (cpBldr.getEquipmentState() != null && !cpBldr.getEquipmentState().equals(States.NotReservedInuse)) { + if (cpBldr.getEquipmentState() != null && !cpBldr.getEquipmentState().getName() + .equals(States.NotReservedInuse)) { cpBldr.setEquipmentState(States.NotReservedInuse); change = true; } - } else if ( - (cpBldr.getEquipmentState() != null && !cpBldr.getEquipmentState().equals(States.NotReservedAvailable))) { + } else if ((cpBldr.getEquipmentState() != null && !cpBldr.getEquipmentState().getName() + .equals(States.NotReservedAvailable))) { cpBldr.setEquipmentState(States.NotReservedAvailable); change = true; }