Change portId to accept a generic data-type 20/3520/3
authorSapan Shah <sapshah@cisco.com>
Fri, 6 Dec 2013 00:44:06 +0000 (16:44 -0800)
committerGerrit Code Review <gerrit@opendaylight.org>
Mon, 9 Dec 2013 18:32:31 +0000 (18:32 +0000)
Change-Id: Id582e279802643dcf7bd9f1531c5dfc90ba40870
Signed-off-by: Sapan Shah <sapshah@cisco.com>
opendaylight/web/flows/src/main/java/org/opendaylight/controller/flows/web/Flows.java

index 8a7c3983d1cae6e7c2260c00dbdeb8d1263065f2..259ffde4b447e1d5d8c916ff96a26ee38198b3bf 100644 (file)
@@ -142,17 +142,17 @@ public class Flows implements IDaylightWeb {
         }
 
         Map<String, Object> nodes = new HashMap<String, Object>();
-        Map<Short, String> port;
+        Map<String, String> port;
 
         for (Switch node : switchManager.getNetworkDevices()) {
-            port = new HashMap<Short, String>(); // new port
+            port = new HashMap<String, String>(); // new port
             Set<NodeConnector> nodeConnectorSet = node.getNodeConnectors();
 
             if (nodeConnectorSet != null) {
                 for (NodeConnector nodeConnector : nodeConnectorSet) {
                     String nodeConnectorName = ((Name) switchManager.getNodeConnectorProp(nodeConnector,
                             Name.NamePropName)).getValue();
-                    port.put((Short) nodeConnector.getID(),
+                    port.put( nodeConnector.getID().toString(),
                             nodeConnectorName + "(" + nodeConnector.getNodeConnectorIDString() + ")");
                 }
             }