commit e313645097c82c87916f3ed62d274fe87d8de609
author Masayoshi Kobayashi <masayoshi@onlab.us> Fri Apr 05 02:57:37 2013 +0000
committer Masayoshi Kobayashi <masayoshi@onlab.us> Fri Apr 05 02:57:37 2013 +0000
tree e63d700829e8985b7e371a704f87d93c66874358
parent b56f297c8fb084563051985e26a9b8d6c838b1e3
parent 9425f701c0e7316e407e45227d3fb94b7434bfcc

Merge branch 'master' of github.com:OPENNETWORKINGLAB/ONOS

web/topology_rest.py

diff --git a/web/topology_rest.py b/web/topology_rest.py
index bc52992..efc395f 100755
--- a/web/topology_rest.py
+++ b/web/topology_rest.py
@@ -212,7 +212,6 @@
   return "http://" + host + ":8080"
 
 ## Switch ##
-=======
 @app.route("/wm/core/topology/switches/all/json")
 def switches():
   if request.args.get('proxy') == None:
@@ -818,11 +817,14 @@
     print command
     result = os.popen(command).read()
   except:
-    
     exit
 
-  resp = Response(result, status=200, mimetype='application/json')
-  return resp
+  if len(result) == 0:
+    resp = Response(result, status=400, mimetype='text/html')
+    return "no iperf file found (flowid %s)" % flow_id;
+  else:
+    resp = Response(result, status=200, mimetype='application/json')
+    return resp
 
 
 if __name__ == "__main__":