Merge branch 'master' of github.com:OPENNETWORKINGLAB/ONOS
diff --git a/web/js/onos-topology.js b/web/js/onos-topology.js
index 4e9dce1..57016c4 100644
--- a/web/js/onos-topology.js
+++ b/web/js/onos-topology.js
@@ -232,6 +232,7 @@
if (d.group == 1){return "red";}
else if (d.group == 2){return "blue";}
else if (d.group == 3){return "green";}
+ else if (d.group == 4){return "orange";}
else{ return "gray"; }
});
@@ -315,6 +316,7 @@
if (d.group == 1){return "red";}
else if (d.group == 2){return "blue";}
else if (d.group == 3){return "green";}
+ else if (d.group == 3){return "orange";}
else{ return "gray"; }
});
// text.attr("x", function(d) { return d.x; }).attr("y", function(d) { return d.y; });
diff --git a/web/topology_rest.py b/web/topology_rest.py
index 9c820ef..1b4fdca 100755
--- a/web/topology_rest.py
+++ b/web/topology_rest.py
@@ -14,6 +14,7 @@
RestIP="localhost"
RestPort=8080
#DBName="onos-network-map"
+controllers=["onos9vpc", "onos10vpc", "onos11vpc", "onos12vpc"]
DEBUG=1
pp = pprint.PrettyPrinter(indent=4)
@@ -121,27 +122,27 @@
state = str(v['state'])
sw = {}
sw['name']=dpid
+ sw['group']= -1
if state == "ACTIVE":
-# print state
if dpid.split(":")[5] == "0a":
sw['group']=1
if dpid.split(":")[5] == "0b":
sw['group']=2
if dpid.split(":")[5] == "0c":
sw['group']=3
+ if dpid.split(":")[5] == "0d":
+ sw['group']=4
if state == "INACTIVE":
-# print state
sw['group']=0
-# print sw
switches.append(sw)
- try:
- command = "curl -s \'http://%s:%s/wm/registry/controllers/json\'" % (RestIP, RestPort)
- result = os.popen(command).read()
- controllers = json.loads(result)
- except:
- log_error("xx REST IF has issue: %s" % command)
- log_error("%s" % result)
+# try:
+# command = "curl -s \'http://%s:%s/wm/registry/controllers/json\'" % (RestIP, RestPort)
+# result = os.popen(command).read()
+# controllers = json.loads(result)
+# except:
+# log_error("xx REST IF has issue: %s" % command)
+# log_error("%s" % result)
try:
command = "curl -s \'http://%s:%s/wm/registry/switches/json\'" % (RestIP, RestPort)
@@ -159,6 +160,9 @@
if switches[sw_id]['group'] != 0:
switches[sw_id]['group'] = controllers.index(ctrl) + 1
+
+
+
try:
command = "curl -s \'http://%s:%s/wm/core/topology/links/json\'" % (RestIP, RestPort)
result = os.popen(command).read()