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=7167c41d624ede484a87a691548883eb884716b4;hpb=d5b35044e42b9db01e2cc8472fb7b45fe224319d;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 7167c41d6..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 @@ -9,7 +9,9 @@ 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_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; @@ -18,16 +20,16 @@ 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.rev200827.Network; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.Nodes; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.NodesKey; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.nodes.Mapping; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.nodes.MappingBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.nodes.MappingKey; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.nodes.McCapabilities; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.nodes.McCapabilitiesKey; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.nodes.NodeInfo.OpenroadmVersion; +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; @@ -37,30 +39,34 @@ public class PortMappingImpl implements PortMapping { private static final Logger LOG = LoggerFactory.getLogger(PortMappingImpl.class); private final DataBroker dataBroker; + private final PortMappingVersion710 portMappingVersion710; private final PortMappingVersion221 portMappingVersion22; private final PortMappingVersion121 portMappingVersion121; - public PortMappingImpl(DataBroker dataBroker, PortMappingVersion221 portMappingVersion22, - PortMappingVersion121 portMappingVersion121) { + public PortMappingImpl(DataBroker dataBroker, PortMappingVersion710 portMappingVersion710, + PortMappingVersion221 portMappingVersion22, PortMappingVersion121 portMappingVersion121) { this.dataBroker = dataBroker; + this.portMappingVersion710 = portMappingVersion710; this.portMappingVersion22 = portMappingVersion22; this.portMappingVersion121 = portMappingVersion121; } @Override public boolean createMappingData(String nodeId, String nodeVersion) { - if (nodeVersion.equals(OPENROADM_DEVICE_VERSION_1_2_1)) { - return portMappingVersion121.createMappingData(nodeId); - } else if (nodeVersion.equals(OPENROADM_DEVICE_VERSION_2_2_1)) { - return portMappingVersion22.createMappingData(nodeId); + 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; } - LOG.error("Unable to create mapping data for unmanaged openroadm device version"); - return false; } - - @Override public Mapping getMapping(String nodeId, String logicalConnPoint) { @@ -84,6 +90,28 @@ 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) { @@ -127,37 +155,17 @@ public class PortMappingImpl implements PortMapping { @Override public boolean updateMapping(String nodeId, Mapping oldMapping) { - OpenroadmVersion openROADMversion = this.getNode(nodeId).getNodeInfo().getOpenroadmVersion(); - if (openROADMversion.getIntValue() == 1) { - return portMappingVersion121.updateMapping(nodeId,oldMapping); - } else if (openROADMversion.getIntValue() == 2) { - org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.nodes - .MappingBuilder oldMapping2Bldr = new MappingBuilder().setLogicalConnectionPoint(oldMapping - .getLogicalConnectionPoint()).setPortDirection(oldMapping.getPortDirection()); - if (oldMapping.getConnectionMapLcp() != null) { - oldMapping2Bldr.setConnectionMapLcp(oldMapping.getConnectionMapLcp()); - } - if (oldMapping.getPartnerLcp() != null) { - oldMapping2Bldr.setPartnerLcp(oldMapping.getPartnerLcp()); - } - if (oldMapping.getPortQual() != null) { - oldMapping2Bldr.setPortQual(oldMapping.getPortQual()); - } - if (oldMapping.getSupportingCircuitPackName() != null) { - oldMapping2Bldr.setSupportingCircuitPackName(oldMapping.getSupportingCircuitPackName()); - } - if (oldMapping.getSupportingOms() != null) { - oldMapping2Bldr.setSupportingOms(oldMapping.getSupportingOms()); - } - if (oldMapping.getSupportingOts() != null) { - oldMapping2Bldr.setSupportingOts(oldMapping.getSupportingOts()); - } - if (oldMapping.getSupportingPort() != null) { - oldMapping2Bldr.setSupportingPort(oldMapping.getSupportingPort()); - } - return portMappingVersion22.updateMapping(nodeId, oldMapping2Bldr.build()); + 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; } - return false; } @Override @@ -178,6 +186,4 @@ public class PortMappingImpl implements PortMapping { } return null; } - - }