Code correction to integrate 2.2.1 devices in topo

- change several device datastores from config to operational
- reactivate node deletion/portmapping deletion

Change-Id: I3c8ee105b977d12adbebc1116545fa04185013c8
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>

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 da1fa9afca25043e2dd824a17984366c1e88a4a1..3b8e6b88e97a70af9d91cb9a276089de81d91629 100644 (file)
--- a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingImpl.java
+++ b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingImpl.java
@@ -51,11 +51,10 @@ public class PortMappingImpl implements PortMapping {
     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)) {
+        } 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;
         }
     }

diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/NetConfTopologyListener.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/NetConfTopologyListener.java
index 5dca0d67f70bcd404852863b041a61c72351e7bd..790d6c901c423b3e43eeb955641ffc06f39829a5 100644 (file)
--- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/NetConfTopologyListener.java
+++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/NetConfTopologyListener.java
@@ -229,7 +229,7 @@ public class NetConfTopologyListener implements DataTreeChangeListener<Node> {
             nodeRegistration.getAccessAlarmNotificationListenerRegistration().close();
             nodeRegistration.getAccessDeOperationasNotificationListenerRegistration().close();
             nodeRegistration.getAccessDeviceNotificationListenerRegistration().close();
-            nodeRegistration.getAccessLldpNotificationListenerRegistration().close();
+//            nodeRegistration.getAccessLldpNotificationListenerRegistration().close();
             nodeRegistration.getAccessTcaNotificationListenerRegistration().close();
         }
     }

diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelServiceImpl.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelServiceImpl.java
index 73bcecd5da9e1e7fb7b724870110069f80edfef1..1b3c7cb3f7e1dff9183f60e2b6d2ca2457bc2e76 100644 (file)
--- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelServiceImpl.java
+++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelServiceImpl.java
@@ -9,6 +9,10 @@ package org.opendaylight.transportpce.networkmodel.service;
 
 import java.util.HashMap;
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.transportpce.common.NetworkUtils;
 import org.opendaylight.transportpce.common.device.DeviceTransactionManager;
@@ -18,10 +22,13 @@ import org.opendaylight.transportpce.networkmodel.dto.TopologyShard;
 import org.opendaylight.transportpce.networkmodel.util.ClliNetwork;
 import org.opendaylight.transportpce.networkmodel.util.OpenRoadmFactory;
 import org.opendaylight.transportpce.networkmodel.util.OpenRoadmNetwork;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev170228.network.Nodes.OpenroadmVersion;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev150608.Network;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev150608.NetworkId;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev150608.NetworkKey;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev150608.NodeId;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev150608.network.Node;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev150608.network.NodeKey;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev150608.Network1;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev150608.network.Link;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNodeConnectionStatus;
@@ -65,13 +72,13 @@ public class NetworkModelServiceImpl implements NetworkModelService {
         try {
             LOG.info("createOpenROADMNode: {} ", nodeId);
 
-            if (!portMapping.createMappingData(nodeId,openRoadmVersion)) {
-                LOG.warn("Could not generate port mapping for {} skipping network model creation",nodeId);
+            if (!portMapping.createMappingData(nodeId, openRoadmVersion)) {
+                LOG.warn("Could not generate port mapping for {} skipping network model creation", nodeId);
                 return;
             }
             //this.linkDiscovery.readLLDP(new NodeId(nodeId));
 
-            Node clliNode = ClliNetwork.createNode(this.deviceTransactionManager, nodeId,openRoadmVersion);
+            Node clliNode = ClliNetwork.createNode(this.deviceTransactionManager, nodeId, openRoadmVersion);
             if (clliNode == null) {
                 LOG.error("Unable to create clli node! Node id: {}", nodeId);
                 return;
@@ -88,7 +95,7 @@ public class NetworkModelServiceImpl implements NetworkModelService {
             networkTransactionService.merge(LogicalDatastoreType.CONFIGURATION, iiClliNode, clliNode,
                 CREATE_MISSING_PARENTS);
 
-            Node openRoadmNode = OpenRoadmNetwork.createNode(nodeId, this.deviceTransactionManager,openRoadmVersion);
+            Node openRoadmNode = OpenRoadmNetwork.createNode(nodeId, this.deviceTransactionManager, openRoadmVersion);
             if (openRoadmNode == null) {
                 LOG.error("Unable to create OpenRoadm node! Node id: {}", nodeId);
                 return;
@@ -161,26 +168,28 @@ public class NetworkModelServiceImpl implements NetworkModelService {
 
     @Override
     public void deleteOpenRoadmnode(String nodeId) {
-        /*try {
-            LOG.info("deleteOpenROADMnode: {} ", nodeId);
+        try {
+            @Nullable
+            OpenroadmVersion deviceVersion = this.portMapping.getNode(nodeId).getOpenroadmVersion();
+            LOG.info("deleteOpenROADMnode: {} version {}", nodeId, deviceVersion.getName());
             this.portMapping.deleteMappingData(nodeId);
 
             NodeKey nodeIdKey = new NodeKey(new NodeId(nodeId));
-            WriteTransaction writeTransaction = this.dataBroker.newWriteOnlyTransaction();
+
             LOG.info("deleting node in {}", NetworkUtils.CLLI_NETWORK_ID);
             InstanceIdentifier<Node> iiClliNode = InstanceIdentifier
-                .builder(Networks.class)
-                .child(Network.class, new NetworkKey(new NetworkId(NetworkUtils.CLLI_NETWORK_ID)))
+                .builder(Network.class, new NetworkKey(new NetworkId(NetworkUtils.CLLI_NETWORK_ID)))
                 .child(Node.class, nodeIdKey)
                 .build();
-            writeTransaction.delete(LogicalDatastoreType.CONFIGURATION, iiClliNode);
+            this.networkTransactionService.delete(LogicalDatastoreType.CONFIGURATION, iiClliNode);
+
             LOG.info("deleting node in {}", NetworkUtils.UNDERLAY_NETWORK_ID);
             InstanceIdentifier<Node> iiOpenRoadmNode = InstanceIdentifier
-                .builder(Networks.class)
-                .child(Network.class, new NetworkKey(new NetworkId(NetworkUtils.UNDERLAY_NETWORK_ID)))
+                .builder(Network.class, new NetworkKey(new NetworkId(NetworkUtils.UNDERLAY_NETWORK_ID)))
                 .child(Node.class, nodeIdKey)
                 .build();
-            writeTransaction.delete(LogicalDatastoreType.CONFIGURATION, iiOpenRoadmNode);
+            this.networkTransactionService.delete(LogicalDatastoreType.CONFIGURATION, iiOpenRoadmNode);
+
             TopologyShard topologyShard = this.topologyShardMountedDevice.get(nodeId);
             if (topologyShard != null) {
                 LOG.info("TopologyShard for node '{}' is present", nodeId);
@@ -188,30 +197,28 @@ public class NetworkModelServiceImpl implements NetworkModelService {
                     LOG.info("deleting node {} in {}", openRoadmTopologyNode.getNodeId().getValue(),
                             NetworkUtils.OVERLAY_NETWORK_ID);
                     InstanceIdentifier<Node> iiOpenRoadmTopologyNode = InstanceIdentifier
-                        .builder(Networks.class)
-                        .child(Network.class, new NetworkKey(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID)))
+                        .builder(Network.class, new NetworkKey(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID)))
                         .child(Node.class, openRoadmTopologyNode.key())
                         .build();
-                    writeTransaction.delete(LogicalDatastoreType.CONFIGURATION, iiOpenRoadmTopologyNode);
+                    this.networkTransactionService.delete(LogicalDatastoreType.CONFIGURATION, iiOpenRoadmTopologyNode);
                 }
                 for (Link openRoadmTopologyLink: topologyShard.getLinks()) {
                     LOG.info("deleting link {} in {}", openRoadmTopologyLink.getLinkId().getValue(),
                             NetworkUtils.OVERLAY_NETWORK_ID);
                     InstanceIdentifier<Link> iiOpenRoadmTopologyLink = InstanceIdentifier
-                        .builder(Networks.class)
-                        .child(Network.class, new NetworkKey(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID)))
+                        .builder(Network.class, new NetworkKey(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID)))
                         .augmentation(Network1.class)
                         .child(Link.class, openRoadmTopologyLink.key())
                         .build();
-                    writeTransaction.delete(LogicalDatastoreType.CONFIGURATION, iiOpenRoadmTopologyLink);
+                    this.networkTransactionService.delete(LogicalDatastoreType.CONFIGURATION, iiOpenRoadmTopologyLink);
                 }
             } else {
                 LOG.warn("TopologyShard for node '{}' is not present", nodeId);
             }
-            writeTransaction.submit().get();
+            this.networkTransactionService.submit().get(1, TimeUnit.SECONDS);
             LOG.info("all nodes and links deleted ! ");
-        } catch (InterruptedException | ExecutionException e) {
+        } catch (InterruptedException | ExecutionException | TimeoutException e) {
             LOG.error("Error when trying to delete node : {}", nodeId, e);
-        }*/
+        }
     }
 }

diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/InfoSubtree.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/InfoSubtree.java
index 4956f06d122388bc119fd67151ea08572ec46f66..bbbc57898b21be7240aa419e0623e763a5f48728 100644 (file)
--- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/InfoSubtree.java
+++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/InfoSubtree.java
@@ -115,7 +115,6 @@ public class InfoSubtree {
         //this.model = deviceInfo.getModel();
         this.ipAddress = deviceInfo.getIpAddress();
         this.nodeType = deviceInfo.getNodeType().getIntValue();
-
         return true;
     }
 

diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmNetwork.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmNetwork.java
index 2cf82886aa83748f65f27bde994497efaed3acaa..93b68cea7df91f1436da3ab3e2136e23e04934eb 100644 (file)
--- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmNetwork.java
+++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmNetwork.java
@@ -87,7 +87,7 @@ public final class OpenRoadmNetwork {
         IpAddress ipAddress;
         int nodeType;
 
-        if (infoSubtree.getDeviceInfo(nodeId,deviceTransactionManager)) {
+        if (infoSubtree.getDeviceInfo(nodeId, deviceTransactionManager)) {
 
             clli = infoSubtree.getClli();
 

diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopology22.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopology22.java
index ecb21b2279c2e164fd40cd202dfda5e780c7d2e7..f02c82199189f952be31965f14b12eba53242824 100644 (file)
--- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopology22.java
+++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopology22.java
@@ -145,7 +145,7 @@ public class OpenRoadmTopology22 {
 
         InstanceIdentifier<Info> infoIID = InstanceIdentifier.create(OrgOpenroadmDevice.class).child(Info.class);
         java.util.Optional<Info> deviceInfoOpt =
-                deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType.CONFIGURATION, infoIID,
+                deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType.OPERATIONAL, infoIID,
                         Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT);
         Info deviceInfo;
         if (deviceInfoOpt.isPresent()) {
@@ -155,9 +155,8 @@ public class OpenRoadmTopology22 {
             return null;
         }
         List<Node> nodes = new ArrayList<>();
-
         // Check if node is ROADM
-        if (NodeTypes.Rdm.equals(deviceInfo.getNodeType())) {
+        if (NodeTypes.Rdm.getName().equals(deviceInfo.getNodeType().getName())) {
 
             /*
              * Adding Degree Node Get Degree Number -> x then get connection ports then find the port directions
@@ -222,7 +221,7 @@ public class OpenRoadmTopology22 {
             links.addAll(createAddDropLinks(nodeId, numOfDegrees, numOfSrgs, portDirectionEnum));
             LOG.info("created nodes/links: {}/{}", nodes.size(), links.size());
             return new TopologyShard(nodes, links);
-        } else if (NodeTypes.Xpdr.equals(deviceInfo.getNodeType())) {
+        } else if (NodeTypes.Xpdr.getName().equals(deviceInfo.getNodeType().getName())) {
             // Check if node is XPONDER
             Integer clientport = getNoOfClientPorts(nodeId);
             List<Link> links = new ArrayList<>();
@@ -240,7 +239,7 @@ public class OpenRoadmTopology22 {
             }
             return new TopologyShard(nodes, links);
         }
-
+        LOG.error("Device node Type not managed yet");
         return null;
     }
 
@@ -499,7 +498,6 @@ public class OpenRoadmTopology22 {
                 tpList.add(tempTpBldr.build());
             }
         }
-
         org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev150608
                 .Node1Builder tpNode1 =
                 new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf
@@ -544,7 +542,7 @@ public class OpenRoadmTopology22 {
         InstanceIdentifier<SharedRiskGroup> deviceIID = InstanceIdentifier.create(OrgOpenroadmDevice.class)
                 .child(SharedRiskGroup.class, new SharedRiskGroupKey(srgCounter));
         Optional<SharedRiskGroup> ordmSrgObject =
-                deviceTransactionManager.getDataFromDevice(deviceId, LogicalDatastoreType.CONFIGURATION, deviceIID,
+                deviceTransactionManager.getDataFromDevice(deviceId, LogicalDatastoreType.OPERATIONAL, deviceIID,
                         Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT);
         if (ordmSrgObject.isPresent()) {
             if (ordmSrgObject.get().getMaxAddDropPorts() != null) {
@@ -585,7 +583,7 @@ public class OpenRoadmTopology22 {
                 .child(Ports.class, new PortsKey(portName));
         LOG.info("Fetching Port Direction for port {} at circuit pack {}", portName, circuitPackName);
         Optional<Ports> portObject =
-                deviceTransactionManager.getDataFromDevice(deviceId, LogicalDatastoreType.CONFIGURATION, portIID,
+                deviceTransactionManager.getDataFromDevice(deviceId, LogicalDatastoreType.OPERATIONAL, portIID,
                         Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT);
         if (portObject.isPresent()) {
             Ports port = portObject.get();