flask json argument needs to be a dict for unviersal use of the rest api
diff --git a/src/emuvim/cli/rest/compute.py b/src/emuvim/cli/rest/compute.py
index 2a055a3..3a719cc 100755
--- a/src/emuvim/cli/rest/compute.py
+++ b/src/emuvim/cli/rest/compute.py
@@ -47,18 +47,16 @@
def start(self, args):
- nw_list = list()
- if args.get("network") is not None:
- nw_list = self._parse_network(args.get("network"))
req = {'image':args.get("image"),
'command':args.get("docker_command"),
- 'network':nw_list}
+ 'network':args.get("network")}
response = put("%s/restapi/compute/%s/%s/start" %
(args.get("endpoint"),
args.get("datacenter"),
args.get("name")),
- json = json.dumps(req))
+ json = req)
+
pp.pprint(response.json())
def stop(self, args):
@@ -109,22 +107,6 @@
pp.pprint(list)
-
- def _parse_network(self, network_str):
- '''
- parse the options for all network interfaces of the vnf
- :param network_str: (id=x,ip=x.x.x.x/x), ...
- :return: list of dicts [{"id":x,"ip":"x.x.x.x/x"}, ...]
- '''
- nw_list = list()
- networks = network_str[1:-1].split('),(')
- for nw in networks:
- nw_dict = dict(tuple(e.split('=')) for e in nw.split(','))
- nw_list.append(nw_dict)
-
- return nw_list
-
-
parser = argparse.ArgumentParser(description='son-emu datacenter')
parser.add_argument(
"command",
diff --git a/src/emuvim/cli/rest/network.py b/src/emuvim/cli/rest/network.py
index c87a924..c6e1dcc 100755
--- a/src/emuvim/cli/rest/network.py
+++ b/src/emuvim/cli/rest/network.py
@@ -61,7 +61,7 @@
(args.get("endpoint"),
vnf_src_name,
vnf_dst_name),
- json=json.dumps(params))
+ json=params)
pp.pprint(response.json())
def remove(self, args):
@@ -80,7 +80,7 @@
(args.get("endpoint"),
vnf_src_name,
vnf_dst_name),
- json=json.dumps(params))
+ json=params)
pp.pprint(response.json())
def _parse_vnf_name(self, vnf_name_str):