Merge branch 'master' of http://github.com/OPENNETWORKINGLAB/ONOS
diff --git a/web/ons-demo/js/model.js b/web/ons-demo/js/model.js
index 81d5c27..6577fea 100644
--- a/web/ons-demo/js/model.js
+++ b/web/ons-demo/js/model.js
@@ -54,7 +54,7 @@
switches: '/wm/core/topology/switches/all/json',
flows: '/wm/flow/getall/json',
activeControllers: '/wm/registry/controllers/json',
- controllers: '/data/controllers.json',
+ controllers: 'data/controllers.json',
mapping: '/wm/registry/switches/json',
configuration: 'data/configuration.json'
}
@@ -118,4 +118,4 @@
alert(JSON.stringify(err));
}
});
-}
\ No newline at end of file
+}
diff --git a/web/restapi2.py b/web/restapi2.py
index a8188d8..ca6ad5c 100755
--- a/web/restapi2.py
+++ b/web/restapi2.py
@@ -54,8 +54,10 @@
return response
## PROXY API (allows development where the webui is served from someplace other than the ONOS_HOST)##
-ONOS_HOST="http://gui3.onlab.us:8080"
+#ONOS_HOST="http://gui3.onlab.us:8080"
+ONOS_HOST="http://localhost:8080" ;# for Amazon EC2
+@app.route("/wm/core/topology/switches/all/json")
@app.route("/proxy/wm/core/topology/switches/all/json")
def switches():
try:
@@ -69,6 +71,7 @@
resp = Response(result, status=200, mimetype='application/json')
return resp
+@app.route("/wm/core/topology/links/json")
@app.route("/proxy/wm/core/topology/links/json")
def links():
try:
@@ -82,6 +85,7 @@
resp = Response(result, status=200, mimetype='application/json')
return resp
+@app.route("/wm/flow/getall/json")
@app.route("/proxy/wm/flow/getall/json")
def flows():
try:
@@ -95,6 +99,7 @@
resp = Response(result, status=200, mimetype='application/json')
return resp
+@app.route("/wm/registry/controllers/json")
@app.route("/proxy/wm/registry/controllers/json")
def registry_controllers():
try:
@@ -108,6 +113,7 @@
resp = Response(result, status=200, mimetype='application/json')
return resp
+@app.route("/wm/registry/switches/json")
@app.route("/proxy/wm/registry/switches/json")
def registry_switches():
try:
@@ -324,7 +330,7 @@
if __name__ == "__main__":
app.debug = True
- app.run(host="0.0.0.0", port=9000)
+ app.run(threaded=True, host="0.0.0.0", port=9000)
# query_switch()
# query_links()
# devices()