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 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;
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.rev210310.Network;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.network.Nodes;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.network.NodesKey;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.network.nodes.Mapping;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.network.nodes.MappingBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.network.nodes.MappingKey;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.network.nodes.McCapabilities;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.network.nodes.McCapabilitiesKey;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.network.nodes.NodeInfo.OpenroadmVersion;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210927.Network;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210927.OpenroadmNodeVersion;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210927.mapping.Mapping;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210927.mapping.MappingKey;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210927.mc.capabilities.McCapabilities;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210927.mc.capabilities.McCapabilitiesKey;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210927.network.Nodes;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210927.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.slf4j.Logger;
import org.slf4j.LoggerFactory;
return portMappingVersion121.createMappingData(nodeId);
case OPENROADM_DEVICE_VERSION_2_2_1:
return portMappingVersion22.createMappingData(nodeId);
- case OPENROADM_DEVICE_VERSION_7_1_0:
+ case OPENROADM_DEVICE_VERSION_7_1:
return portMappingVersion710.createMappingData(nodeId);
default:
LOG.error("Unable to create mapping data for unmanaged openroadm device version");
}
}
-
-
@Override
public Mapping getMapping(String nodeId, String logicalConnPoint) {
return null;
}
+ @Override
+ public Mapping getMapping(String nodeId, String circuitPackName, String portName) {
+ KeyedInstanceIdentifier<Nodes, NodesKey> portMappingIID = InstanceIdentifier.create(Network.class)
+ .child(Nodes.class, new NodesKey(nodeId));
+ try (ReadTransaction readTx = this.dataBroker.newReadOnlyTransaction()) {
+ Optional<Nodes> portMapppingOpt = readTx.read(LogicalDatastoreType.CONFIGURATION, portMappingIID).get();
+ if (!portMapppingOpt.isPresent()) {
+ LOG.warn("Could not get portMapping for node {}", nodeId);
+ return null;
+ }
+ Map<MappingKey, Mapping> 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) {
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);
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 = getNode(nodeId).getNodeInfo().getOpenroadmVersion();
+ OpenroadmNodeVersion openROADMversion = getNode(nodeId).getNodeInfo().getOpenroadmVersion();
switch (openROADMversion.getIntValue()) {
case 1:
return portMappingVersion121.updateMapping(nodeId, oldMapping);
case 2:
- MappingBuilder oldMapping2Bldr221 = new MappingBuilder()
- .setLogicalConnectionPoint(oldMapping.getLogicalConnectionPoint())
- .setPortDirection(oldMapping.getPortDirection());
- if (oldMapping.getConnectionMapLcp() != null) {
- oldMapping2Bldr221.setConnectionMapLcp(oldMapping.getConnectionMapLcp());
- }
- if (oldMapping.getPartnerLcp() != null) {
- oldMapping2Bldr221.setPartnerLcp(oldMapping.getPartnerLcp());
- }
- if (oldMapping.getPortQual() != null) {
- oldMapping2Bldr221.setPortQual(oldMapping.getPortQual());
- }
- if (oldMapping.getSupportingCircuitPackName() != null) {
- oldMapping2Bldr221.setSupportingCircuitPackName(oldMapping.getSupportingCircuitPackName());
- }
- if (oldMapping.getSupportingOms() != null) {
- oldMapping2Bldr221.setSupportingOms(oldMapping.getSupportingOms());
- }
- if (oldMapping.getSupportingOts() != null) {
- oldMapping2Bldr221.setSupportingOts(oldMapping.getSupportingOts());
- }
- if (oldMapping.getSupportingPort() != null) {
- oldMapping2Bldr221.setSupportingPort(oldMapping.getSupportingPort());
- }
- return portMappingVersion22.updateMapping(nodeId, oldMapping2Bldr221.build());
+ return portMappingVersion22.updateMapping(nodeId, oldMapping);
case 3:
- MappingBuilder oldMapping2Bldr710 = new MappingBuilder()
- .setLogicalConnectionPoint(oldMapping.getLogicalConnectionPoint())
- .setPortDirection(oldMapping.getPortDirection());
- if (oldMapping.getConnectionMapLcp() != null) {
- oldMapping2Bldr710.setConnectionMapLcp(oldMapping.getConnectionMapLcp());
- }
- if (oldMapping.getPartnerLcp() != null) {
- oldMapping2Bldr710.setPartnerLcp(oldMapping.getPartnerLcp());
- }
- if (oldMapping.getPortQual() != null) {
- oldMapping2Bldr710.setPortQual(oldMapping.getPortQual());
- }
- if (oldMapping.getSupportingCircuitPackName() != null) {
- oldMapping2Bldr710.setSupportingCircuitPackName(oldMapping.getSupportingCircuitPackName());
- }
- if (oldMapping.getSupportingOms() != null) {
- oldMapping2Bldr710.setSupportingOms(oldMapping.getSupportingOms());
- }
- if (oldMapping.getSupportingOts() != null) {
- oldMapping2Bldr710.setSupportingOts(oldMapping.getSupportingOts());
- }
- if (oldMapping.getSupportingPort() != null) {
- oldMapping2Bldr710.setSupportingPort(oldMapping.getSupportingPort());
- }
- return portMappingVersion710.updateMapping(nodeId, oldMapping2Bldr710.build());
+ return portMappingVersion710.updateMapping(nodeId, oldMapping);
default:
return false;
}
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<OduSwitchingPools> ospIID,
+ Map<Uint16, List<InstanceIdentifier<PortList>>> 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;
+ }
}