commit f693a3b7d6bc9190f180bbd23ae4c577143fe5a5
author stevenvanrossem <steven.vanrossem@intec.ugent.be> Thu Jun 01 15:15:59 2017 +0200
committer stevenvanrossem <steven.vanrossem@intec.ugent.be> Thu Jun 01 15:15:59 2017 +0200
tree e780928327afff169915deba909859344d63fc33
parent ce69f2e9f813fefb0d56dfb6624e5200399becd6

update son-emu-cli network CLI

src/emuvim/api/rest/network.py

diff --git a/src/emuvim/api/rest/network.py b/src/emuvim/api/rest/network.py
index 84db87e..1374373 100755
--- a/src/emuvim/api/rest/network.py
+++ b/src/emuvim/api/rest/network.py
@@ -38,7 +38,7 @@
 import json
 import networkx
 
-logging.basicConfig(level=logging.INFO)
+logging.basicConfig(level=logging.DEBUG)
 
 CORS_HEADER = {'Access-Control-Allow-Origin': '*'}
 
@@ -83,8 +83,7 @@
             # check if json data is a dict
             data = request.args
             # try json payload
-            if data is None:
-                data = request.json
+            data = request.json
             # then no data
             if data is None:
                 data = {}

src/emuvim/api/rest/rest_api_endpoint.py

diff --git a/src/emuvim/api/rest/rest_api_endpoint.py b/src/emuvim/api/rest/rest_api_endpoint.py
index 10b6c26..b2a7b86 100755
--- a/src/emuvim/api/rest/rest_api_endpoint.py
+++ b/src/emuvim/api/rest/rest_api_endpoint.py
@@ -56,10 +56,13 @@
     default command line client.
     """
 
-    def __init__(self, listenip, port):
+    def __init__(self, listenip, port, DCnetwork=None):
         self.ip = listenip
         self.port = port
 
+        # connect this DC network to the rest api endpoint (needed for the networking and monitoring api)
+        self.connectDCNetwork(DCnetwork)
+
         # setup Flask
         # find directory of dashboard files
         dashboard_file = pkg_resources.resource_filename('emuvim.dashboard', "index.html")