X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=common%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fcommon%2Fmapping%2FMappingUtilsImpl.java;h=db4e35715d78fed12e52ff349c3f067bd9dbac67;hb=9c1c56c8dc12c164601d12f507cf3125eb43780a;hp=bd2e1a80d0bb752cc58f8fa6f50ec1b0bbece56d;hpb=3ab12a8fb928c149e4779143ba3d98206a3c6d19;p=transportpce.git diff --git a/common/src/main/java/org/opendaylight/transportpce/common/mapping/MappingUtilsImpl.java b/common/src/main/java/org/opendaylight/transportpce/common/mapping/MappingUtilsImpl.java index bd2e1a80d..db4e35715 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/mapping/MappingUtilsImpl.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/mapping/MappingUtilsImpl.java @@ -13,9 +13,10 @@ import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.transportpce.common.StringConstants; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev170228.Network; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev170228.network.Nodes; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev170228.network.NodesKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev190702.Network; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev190702.network.Nodes; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev190702.network.NodesKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev190702.network.nodes.NodeInfo; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,14 +37,14 @@ public class MappingUtilsImpl implements MappingUtils { /* * Getting physical mapping corresponding to logical connection point */ - InstanceIdentifier portMappingIID = InstanceIdentifier.builder(Network.class).child(Nodes.class, - new NodesKey(nodeId)).build(); + InstanceIdentifier nodeInfoIID = InstanceIdentifier.builder(Network.class).child(Nodes.class, + new NodesKey(nodeId)).child(NodeInfo.class).build(); try (ReadOnlyTransaction readTx = dataBroker.newReadOnlyTransaction()) { - Optional mapObject = - readTx.read(LogicalDatastoreType.CONFIGURATION, portMappingIID).get().toJavaUtil(); - if (mapObject.isPresent()) { - Nodes mapping = mapObject.get(); - switch (mapping.getOpenroadmVersion()) { + Optional nodeInfoObj = + readTx.read(LogicalDatastoreType.CONFIGURATION, nodeInfoIID).get().toJavaUtil(); + if (nodeInfoObj.isPresent()) { + NodeInfo nodInfo = nodeInfoObj.get(); + switch (nodInfo.getOpenroadmVersion()) { case _221: return StringConstants.OPENROADM_DEVICE_VERSION_2_2_1; case _121: