commit ca79f9665d108707e5e45229f73b73da8059056f
author Srikanth Vavilapalli <srikanth.vavilapalli@ericsson.com> Wed Apr 01 18:48:05 2015 -0700
committer Srikanth Vavilapalli <srikanth.vavilapalli@ericsson.com> Wed Apr 01 18:48:05 2015 -0700
tree f259d4b2b458f0937f0b07c8386c2989c129326e
parent 59ddcde89df99dd22d3c2d19349f08cae0aa2926

Spring CLI changes to work with onos-next - partial

cli/fmtcnv.py

diff --git a/cli/fmtcnv.py b/cli/fmtcnv.py
index 485dbf4..aca97ca 100644
--- a/cli/fmtcnv.py
+++ b/cli/fmtcnv.py
@@ -32,6 +32,7 @@
 import command
 import json
 
+onos = 1
 
 # Timezone constants
 class Utc(tzinfo):
@@ -67,10 +68,18 @@
     #result = command.sdnsh.store.rest_simple_request(query_url)
     entries = result
     entries = json.loads(result)
+    switchIdField = 'dpid'
+    if onos==2:
+        entries = entries['devices']
+        switchIdField = 'id'
     #eprint entries
     for switch in entries:
         #print switch
-        switches_dpid_name[switch.get("dpid")] = switch.get("stringAttributes").get('name')
+        if onos == 1:
+            switches_dpid_name[switch.get(switchIdField)] = switch.get("stringAttributes").get('name')
+        elif onos == 2:
+            switches_dpid_name[switch.get(switchIdField)] = switch.get(switchIdField)
+             
         #print switch.get("dpid")
         #print switch.get("stringAttributes").get('name')
     return switches_dpid_name