ISSUE: After controller restart, proactive flows are not installed

This is because of an incongruence between Devices.web and SwitchManagerImpl code, where the
former only consider the Node.nodeID string form and the latter expects the full Node string form.
CHANGE:
Have Devices.web passing Node.toString() form to front-end

Change-Id: I04443178099f151b37b76d4f8a5e41cee64f5ecb
Signed-off-by: Alessandro Boch <aboch@cisco.com>

diff --git a/opendaylight/switchmanager/src/main/java/org/opendaylight/controller/switchmanager/internal/SwitchManagerImpl.java b/opendaylight/switchmanager/src/main/java/org/opendaylight/controller/switchmanager/internal/SwitchManagerImpl.java
index 54508de6d246c379e0b5516cfca1bc93a798aaa6..c4f4b111e3fdc976e93b2b9b01f813d87b2cb09b 100755 (executable)
--- a/opendaylight/switchmanager/src/main/java/org/opendaylight/controller/switchmanager/internal/SwitchManagerImpl.java
+++ b/opendaylight/switchmanager/src/main/java/org/opendaylight/controller/switchmanager/internal/SwitchManagerImpl.java
@@ -582,6 +582,7 @@ public class SwitchManagerImpl implements ISwitchManager,
         }
     }
 
         }
     }
 

+    @Override

     public void updateSwitchConfig(SwitchConfig cfgObject) {
         boolean modeChange = false;
 
     public void updateSwitchConfig(SwitchConfig cfgObject) {
         boolean modeChange = false;
 


@@ -736,7 +737,7 @@ public class SwitchManagerImpl implements ISwitchManager,
         // copy node properties from config
         boolean proactiveForwarding = false;
         if (nodeConfigList != null) {
         // copy node properties from config
         boolean proactiveForwarding = false;
         if (nodeConfigList != null) {

-            String nodeId = node.getNodeIDString();
+            String nodeId = node.toString();

             for (SwitchConfig conf : nodeConfigList.values()) {
                 if (conf.getNodeId().equals(nodeId)) {
                     Property description = new Description(conf.getNodeDescription());
             for (SwitchConfig conf : nodeConfigList.values()) {
                 if (conf.getNodeId().equals(nodeId)) {
                     Property description = new Description(conf.getNodeDescription());

diff --git a/opendaylight/web/devices/src/main/java/org/opendaylight/controller/devices/web/Devices.java b/opendaylight/web/devices/src/main/java/org/opendaylight/controller/devices/web/Devices.java
index 5371f708de93b4235c24ec599914b70648ce6209..ff6fc835f907b8621aefaf07635545a7b5f5ce61 100644 (file)
--- a/opendaylight/web/devices/src/main/java/org/opendaylight/controller/devices/web/Devices.java
+++ b/opendaylight/web/devices/src/main/java/org/opendaylight/controller/devices/web/Devices.java
@@ -95,7 +95,7 @@ public class Devices implements IDaylightWeb {
 
             nodeDatum.put("containerName", containerName);
             nodeDatum.put("nodeName", switchManager.getNodeDescription(node));
 
             nodeDatum.put("containerName", containerName);
             nodeDatum.put("nodeName", switchManager.getNodeDescription(node));

-            nodeDatum.put("nodeId", node.getNodeIDString());
+            nodeDatum.put("nodeId", node.toString());//.getNodeIDString());

             int tierNumber = (tier == null) ? TierHelper.unknownTierNumber
                     : tier.getValue();
             nodeDatum.put("tierName", TierHelper.getTierName(tierNumber)
             int tierNumber = (tier == null) ? TierHelper.unknownTierNumber
                     : tier.getValue();
             nodeDatum.put("tierName", TierHelper.getTierName(tierNumber)