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=9d15dffac4826e5cd3f3a569b3c6d789ae4c88ac;hb=98b07b5da982529cdec2db98f5b96902ed47323b;hp=3527817143004ed965967162d7ee9f8046265a5e;hpb=f639861b2b1375318906720d0ac2aa1d3a137889;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 352781714..9d15dffac 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,10 @@ 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; +import java.util.List; +import java.util.Map; import java.util.Optional; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; @@ -18,48 +21,78 @@ 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.rev201012.Network; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.Nodes; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.NodesKey; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.Mapping; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.MappingBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.MappingKey; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.McCapabilities; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.McCapabilitiesKey; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.NodeInfo.OpenroadmVersion; +import org.opendaylight.transportpce.common.device.DeviceTransactionManager; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.Network; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.OpenroadmNodeVersion; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.mapping.Mapping; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.mapping.MappingKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.mc.capabilities.McCapabilities; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.mc.capabilities.McCapabilitiesKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.network.Nodes; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.network.NodesKey; +import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.org.openroadm.device.container.org.openroadm.device.OduSwitchingPools; +import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.org.openroadm.device.container.org.openroadm.device.odu.switching.pools.non.blocking.list.PortList; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; +import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier; +import org.opendaylight.yangtools.yang.common.Uint16; +import org.osgi.service.component.annotations.Activate; +import org.osgi.service.component.annotations.Component; +import org.osgi.service.component.annotations.Reference; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - +@Component 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) { + @Activate + public PortMappingImpl(@Reference DataBroker dataBroker, + @Reference DeviceTransactionManager deviceTransactionManager) { + this(dataBroker, + new PortMappingVersion710(dataBroker, deviceTransactionManager), + new PortMappingVersion221(dataBroker, deviceTransactionManager), + new PortMappingVersion121(dataBroker, deviceTransactionManager)); + } + + 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); - } - LOG.error("Unable to create mapping data for unmanaged openroadm device version"); - return false; + public PortMappingVersion221 getPortMappingVersion221() { + return portMappingVersion22; } + @Override + public PortMappingVersion710 getPortMappingVersion710() { + return portMappingVersion710; + } + @Override + 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: + 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) { @@ -84,6 +117,44 @@ 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 void deleteMapping(String nodeId, String logicalConnectionPoint) { + LOG.info("Deleting Mapping {} of node '{}'", logicalConnectionPoint, nodeId); + WriteTransaction rw = this.dataBroker.newWriteOnlyTransaction(); + InstanceIdentifier mappingIID = InstanceIdentifier.create(Network.class) + .child(Nodes.class, new NodesKey(nodeId)).child(Mapping.class, new MappingKey(logicalConnectionPoint)); + rw.delete(LogicalDatastoreType.CONFIGURATION, mappingIID); + try { + rw.commit().get(1, TimeUnit.SECONDS); + LOG.info("Mapping {} removed for node '{}'", logicalConnectionPoint, nodeId); + } catch (InterruptedException | ExecutionException | TimeoutException e) { + LOG.error("Error for removing mapping {} for node '{}'", logicalConnectionPoint, nodeId); + } + } @Override public McCapabilities getMcCapbilities(String nodeId, String mcLcp) { @@ -100,7 +171,7 @@ public class PortMappingImpl implements PortMapping { 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); + LOG.warn("Could not find mc-capabilities 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); @@ -110,7 +181,7 @@ public class PortMappingImpl implements PortMapping { @Override - public void deleteMappingData(String nodeId) { + public void deletePortMappingNode(String nodeId) { LOG.info("Deleting Mapping Data corresponding at node '{}'", nodeId); WriteTransaction rw = this.dataBroker.newWriteOnlyTransaction(); InstanceIdentifier nodesIID = InstanceIdentifier.create(Network.class) @@ -120,44 +191,23 @@ public class PortMappingImpl implements PortMapping { 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); + LOG.error("Error for removing port mapping infos for node '{}'", nodeId, e); } - } @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.rev201012.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 @@ -173,11 +223,29 @@ public class PortMappingImpl implements PortMapping { return node; } LOG.warn("Could not find node {} in portmapping.", nodeId); - } catch (InterruptedException | ExecutionException ex) { - LOG.error("Unable to get node {} in portmapping", nodeId); + } catch (InterruptedException | ExecutionException e) { + LOG.error("Unable to get node {} in portmapping", nodeId, e); } return null; } + @Override + public boolean updatePortMappingWithOduSwitchingPools(String nodeId, InstanceIdentifier ospIID, + Map>> nbliidMap) { + OpenroadmNodeVersion openROADMversion = getNode(nodeId).getNodeInfo().getOpenroadmVersion(); + switch (openROADMversion.getIntValue()) { + case 3: + return portMappingVersion710.updatePortMappingWithOduSwitchingPools(nodeId, ospIID, nbliidMap); + default: + LOG.error("Update of the port-mapping [odu-switching-pool] not available for this device version {}", + openROADMversion); + return false; + } + } + + @Override + public boolean isNodeExist(String nodeId) { + return this.getNode(nodeId) != null; + } }