X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=common%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fcommon%2Fmapping%2FPortMappingImpl.java;h=640121aa0c7732f35650dfcfdbf816bb6f586aa8;hb=67763b4d82e44c68fdbc765cdeec5496ff65b01e;hp=2dac08d0543b6bd55510eb848c384bda408584b5;hpb=c8ee06305ef3e445b10ff207a220c7d5b40a8e3c;p=transportpce.git diff --git a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingImpl.java b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingImpl.java index 2dac08d05..640121aa0 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingImpl.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingImpl.java @@ -8,23 +8,28 @@ package org.opendaylight.transportpce.common.mapping; import static org.opendaylight.transportpce.common.StringConstants.OPENROADM_DEVICE_VERSION_1_2_1; -import static org.opendaylight.transportpce.common.StringConstants.OPENROADM_DEVICE_VERSION_2_2; +import static org.opendaylight.transportpce.common.StringConstants.OPENROADM_DEVICE_VERSION_2_2_1; +import static org.opendaylight.transportpce.common.StringConstants.OPENROADM_DEVICE_VERSION_7_1_0; +import java.util.Map; import java.util.Optional; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; - -import org.opendaylight.controller.md.sal.binding.api.DataBroker; -import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction; -import org.opendaylight.controller.md.sal.binding.api.WriteTransaction; -import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; -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.rev170228.network.nodes.Mapping; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev170228.network.nodes.MappingKey; +import org.opendaylight.mdsal.binding.api.DataBroker; +import org.opendaylight.mdsal.binding.api.ReadTransaction; +import org.opendaylight.mdsal.binding.api.WriteTransaction; +import org.opendaylight.mdsal.common.api.LogicalDatastoreType; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210315.Network; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210315.OpenroadmNodeVersion; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210315.mapping.Mapping; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210315.mapping.MappingKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210315.mc.capabilities.McCapabilities; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210315.mc.capabilities.McCapabilitiesKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210315.network.Nodes; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210315.network.NodesKey; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; +import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,37 +39,34 @@ public class PortMappingImpl implements PortMapping { private static final Logger LOG = LoggerFactory.getLogger(PortMappingImpl.class); private final DataBroker dataBroker; - private final MappingUtils mappingUtils; - private final PortMappingVersion22 portMappingVersion22; + private final PortMappingVersion710 portMappingVersion710; + private final PortMappingVersion221 portMappingVersion22; private final PortMappingVersion121 portMappingVersion121; - public PortMappingImpl(DataBroker dataBroker,PortMappingVersion22 portMappingVersion22,MappingUtils mappingUtils, - PortMappingVersion121 portMappingVersion121) { + public PortMappingImpl(DataBroker dataBroker, PortMappingVersion710 portMappingVersion710, + PortMappingVersion221 portMappingVersion22, PortMappingVersion121 portMappingVersion121) { this.dataBroker = dataBroker; - this.mappingUtils = mappingUtils; + this.portMappingVersion710 = portMappingVersion710; this.portMappingVersion22 = portMappingVersion22; this.portMappingVersion121 = portMappingVersion121; } @Override - public boolean createMappingData(String nodeId) { - - String openROADMversion = mappingUtils.getOpenRoadmVersion(nodeId); - if (openROADMversion.equals(OPENROADM_DEVICE_VERSION_1_2_1)) { - return portMappingVersion121.createMappingData(nodeId); - } - else if (openROADMversion.equals(OPENROADM_DEVICE_VERSION_2_2)) { - return portMappingVersion22.createMappingData(nodeId); - } - - else { - return false; + public boolean createMappingData(String nodeId, String nodeVersion) { + switch (nodeVersion) { + case OPENROADM_DEVICE_VERSION_1_2_1: + return portMappingVersion121.createMappingData(nodeId); + case OPENROADM_DEVICE_VERSION_2_2_1: + return portMappingVersion22.createMappingData(nodeId); + case OPENROADM_DEVICE_VERSION_7_1_0: + return portMappingVersion710.createMappingData(nodeId); + default: + LOG.error("Unable to create mapping data for unmanaged openroadm device version"); + return false; } } - - @Override public Mapping getMapping(String nodeId, String logicalConnPoint) { @@ -73,17 +75,14 @@ public class PortMappingImpl implements PortMapping { */ InstanceIdentifier portMappingIID = InstanceIdentifier.builder(Network.class).child(Nodes.class, new NodesKey(nodeId)).child(Mapping.class, new MappingKey(logicalConnPoint)).build(); - try (ReadOnlyTransaction readTx = this.dataBroker.newReadOnlyTransaction()) { - Optional mapObject = readTx.read(LogicalDatastoreType.CONFIGURATION, portMappingIID).get() - .toJavaUtil(); + try (ReadTransaction readTx = this.dataBroker.newReadOnlyTransaction()) { + Optional mapObject = readTx.read(LogicalDatastoreType.CONFIGURATION, portMappingIID).get(); if (mapObject.isPresent()) { Mapping mapping = mapObject.get(); - LOG.info("Found mapping for the logical port {}. Mapping: {}", logicalConnPoint, mapping.toString()); + LOG.info("Found mapping for {} - {}. Mapping: {}", nodeId, logicalConnPoint, mapping.toString()); return mapping; - } else { - LOG.warn("Could not find mapping for logical connection point {} for nodeId {}", logicalConnPoint, - nodeId); } + LOG.warn("Could not find mapping for logical connection point {} for nodeId {}", logicalConnPoint, nodeId); } catch (InterruptedException | ExecutionException ex) { LOG.error("Unable to read mapping for logical connection point : {} for nodeId {}", logicalConnPoint, nodeId, ex); @@ -91,7 +90,51 @@ public class PortMappingImpl implements PortMapping { return null; } + @Override + public Mapping getMapping(String nodeId, String circuitPackName, String portName) { + KeyedInstanceIdentifier portMappingIID = InstanceIdentifier.create(Network.class) + .child(Nodes.class, new NodesKey(nodeId)); + try (ReadTransaction readTx = this.dataBroker.newReadOnlyTransaction()) { + Optional portMapppingOpt = readTx.read(LogicalDatastoreType.CONFIGURATION, portMappingIID).get(); + if (!portMapppingOpt.isPresent()) { + LOG.warn("Could not get portMapping for node {}", nodeId); + return null; + } + Map mappings = portMapppingOpt.get().getMapping(); + for (Mapping mapping : mappings.values()) { + if (circuitPackName.equals(mapping.getSupportingCircuitPackName()) + && portName.equals(mapping.getSupportingPort())) { + return mapping; + } + } + } catch (InterruptedException | ExecutionException ex) { + LOG.error("Unable to get mapping list for nodeId {}", nodeId, ex); + } + return null; + } + @Override + public McCapabilities getMcCapbilities(String nodeId, String mcLcp) { + /* + * Getting physical mapping corresponding to logical connection point + */ + InstanceIdentifier mcCapabilitiesIID = InstanceIdentifier.builder(Network.class) + .child(Nodes.class, new NodesKey(nodeId)).child(McCapabilities.class, new McCapabilitiesKey(mcLcp)).build(); + try (ReadTransaction readTx = this.dataBroker.newReadOnlyTransaction()) { + Optional mcCapObject = readTx.read(LogicalDatastoreType.CONFIGURATION, + mcCapabilitiesIID).get(); + if (mcCapObject.isPresent()) { + McCapabilities mcCap = mcCapObject.get(); + LOG.info("Found MC-cap for {} - {}. Mapping: {}", nodeId, mcLcp, mcCap.toString()); + return mcCap; + } + LOG.warn("Could not find mapping for logical connection point {} for nodeId {}", mcLcp, nodeId); + } catch (InterruptedException | ExecutionException ex) { + LOG.error("Unable to read mapping for logical connection point : {} for nodeId {}", mcLcp, + nodeId, ex); + } + return null; + } @Override @@ -102,7 +145,7 @@ public class PortMappingImpl implements PortMapping { .child(Nodes.class, new NodesKey(nodeId)); rw.delete(LogicalDatastoreType.CONFIGURATION, nodesIID); try { - rw.submit().get(1, TimeUnit.SECONDS); + rw.commit().get(1, TimeUnit.SECONDS); LOG.info("Port mapping removal for node '{}'", nodeId); } catch (InterruptedException | ExecutionException | TimeoutException e) { LOG.error("Error for removing port mapping infos for node '{}'", nodeId); @@ -112,20 +155,35 @@ public class PortMappingImpl implements PortMapping { @Override public boolean updateMapping(String nodeId, Mapping oldMapping) { - - - String openROADMversion = mappingUtils.getOpenRoadmVersion(nodeId); - if (openROADMversion.equals(OPENROADM_DEVICE_VERSION_1_2_1)) { - return portMappingVersion121.updateMapping(nodeId,oldMapping); - } - else if (openROADMversion.equals(OPENROADM_DEVICE_VERSION_2_2)) { - return portMappingVersion22.updateMapping(nodeId,oldMapping); + OpenroadmNodeVersion openROADMversion = getNode(nodeId).getNodeInfo().getOpenroadmVersion(); + switch (openROADMversion.getIntValue()) { + case 1: + return portMappingVersion121.updateMapping(nodeId, oldMapping); + case 2: + return portMappingVersion22.updateMapping(nodeId, oldMapping); + case 3: + return portMappingVersion710.updateMapping(nodeId, oldMapping); + default: + return false; } + } - else { - return false; + @Override + public Nodes getNode(String nodeId) { + InstanceIdentifier nodePortMappingIID = InstanceIdentifier.builder(Network.class).child(Nodes.class, + new NodesKey(nodeId)).build(); + try (ReadTransaction readTx = this.dataBroker.newReadOnlyTransaction()) { + Optional nodePortMapObject = + readTx.read(LogicalDatastoreType.CONFIGURATION, nodePortMappingIID).get(); + if (nodePortMapObject.isPresent()) { + Nodes node = nodePortMapObject.get(); + LOG.info("Found node {} in portmapping.", nodeId); + return node; + } + LOG.warn("Could not find node {} in portmapping.", nodeId); + } catch (InterruptedException | ExecutionException ex) { + LOG.error("Unable to get node {} in portmapping", nodeId); } + return null; } - - }