Merge remote-tracking branch 'upstream/master' into demo-mano-integration

[osm/vim-emu.git] / src / emuvim / api / rest / network.py

diff --git a/src/emuvim/api/rest/network.py b/src/emuvim/api/rest/network.py
index 28b5c66..9aab1e6 100755 (executable)
--- a/src/emuvim/api/rest/network.py
+++ b/src/emuvim/api/rest/network.py
@@ -38,7 +38,7 @@ from flask import request
 import json
 import networkx
 
-logging.basicConfig(level=logging.INFO)
+logging.basicConfig()
 
 CORS_HEADER = {'Access-Control-Allow-Origin': '*'}
 
@@ -84,15 +84,12 @@ class NetworkAction(Resource):
             logging.debug("json: {}".format(request.json))
             logging.debug("args: {}".format(request.args))
 
-            # when called directly with curl via REST
             data = request.json
+            if data is None:
+                data = request.args
             if data is None:
                 data = {}
-            # check if json data is a dict
-            elif type(data) is not dict:
-                data = json.loads(request.json)
 
-            logging.info("data: {}".format(data))
             vnf_src_name = data.get("vnf_src_name")
             vnf_dst_name = data.get("vnf_dst_name")
             vnf_src_interface = data.get("vnf_src_interface")
@@ -152,4 +149,4 @@ class DrawD3jsgraph(Resource):
                 links.append(edge_dict)
 
         json = {"nodes":nodes, "links":links}
-        return json, 200, CORS_HEADER
\ No newline at end of file
+        return json, 200, CORS_HEADER