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 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.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.Mapping;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev190702.network.nodes.MappingBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev190702.network.nodes.MappingKey;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev190702.network.nodes.NodeInfo.OpenroadmVersion;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
private static final Logger LOG = LoggerFactory.getLogger(PortMappingImpl.class);
private final DataBroker dataBroker;
- private final MappingUtils mappingUtils;
- private final PortMappingVersion22 portMappingVersion22;
+ private final PortMappingVersion221 portMappingVersion22;
private final PortMappingVersion121 portMappingVersion121;
- public PortMappingImpl(DataBroker dataBroker,PortMappingVersion22 portMappingVersion22,MappingUtils mappingUtils,
- PortMappingVersion121 portMappingVersion121) {
+ public PortMappingImpl(DataBroker dataBroker, PortMappingVersion221 portMappingVersion22,
+ PortMappingVersion121 portMappingVersion121) {
this.dataBroker = dataBroker;
- this.mappingUtils = mappingUtils;
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)) {
+ public boolean createMappingData(String nodeId, String nodeVersion) {
+ if (nodeVersion.equals(OPENROADM_DEVICE_VERSION_1_2_1)) {
return portMappingVersion121.createMappingData(nodeId);
- }
- else if (openROADMversion.equals(OPENROADM_DEVICE_VERSION_2_2)) {
+ } else if (nodeVersion.equals(OPENROADM_DEVICE_VERSION_2_2_1)) {
return portMappingVersion22.createMappingData(nodeId);
- }
-
- else {
+ } else {
+ LOG.error("Unable to create mapping data for unmanaged openroadm device version");
return false;
}
}
*/
InstanceIdentifier<Mapping> 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<Mapping> mapObject = readTx.read(LogicalDatastoreType.CONFIGURATION, portMappingIID).get()
- .toJavaUtil();
+ try (ReadTransaction readTx = this.dataBroker.newReadOnlyTransaction()) {
+ Optional<Mapping> 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,
.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);
@Override
public boolean updateMapping(String nodeId, Mapping oldMapping) {
-
-
- String openROADMversion = mappingUtils.getOpenRoadmVersion(nodeId);
- if (openROADMversion.equals(OPENROADM_DEVICE_VERSION_1_2_1)) {
+ OpenroadmVersion openROADMversion = this.getNode(nodeId).getNodeInfo().getOpenroadmVersion();
+ if (openROADMversion.getIntValue() == 1) {
return portMappingVersion121.updateMapping(nodeId,oldMapping);
}
- else if (openROADMversion.equals(OPENROADM_DEVICE_VERSION_2_2)) {
- return portMappingVersion22.updateMapping(nodeId,oldMapping);
+ else if (openROADMversion.getIntValue() == 2) {
+ org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev190702.network.nodes
+ .MappingBuilder oldMapping2Bldr = new MappingBuilder().setLogicalConnectionPoint(oldMapping
+ .getLogicalConnectionPoint()).setPortDirection(oldMapping.getPortDirection());
+ if (oldMapping.getAssociatedLcp() != null) {
+ oldMapping2Bldr.setAssociatedLcp(oldMapping.getAssociatedLcp());
+ }
+ 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());
}
else {
}
}
+ @Override
+ public Nodes getNode(String nodeId) {
+ InstanceIdentifier<Nodes> nodePortMappingIID = InstanceIdentifier.builder(Network.class).child(Nodes.class,
+ new NodesKey(nodeId)).build();
+ try (ReadTransaction readTx = this.dataBroker.newReadOnlyTransaction()) {
+ Optional<Nodes> nodePortMapObject =
+ readTx.read(LogicalDatastoreType.CONFIGURATION, nodePortMappingIID).get();
+ if (nodePortMapObject.isPresent()) {
+ Nodes node = nodePortMapObject.get();
+ LOG.info("Found node {} in portmapping.", nodeId);
+ return node;
+ } else {
+ LOG.warn("Could not find node {} in portmapping.", nodeId);
+ }
+ } catch (InterruptedException | ExecutionException ex) {
+ LOG.error("Unable to get node {} in portmapping", nodeId);
+ }
+ return null;
+ }
+
}