cleanup monitoring commands
diff --git a/src/emuvim/api/zerorpc/compute.py b/src/emuvim/api/zerorpc/compute.py
index 63786fa..a08c118 100755
--- a/src/emuvim/api/zerorpc/compute.py
+++ b/src/emuvim/api/zerorpc/compute.py
@@ -119,12 +119,13 @@
return ex.message
@zerorpc.stream
- def compute_profile(self, dc_label, compute_name, image, kwargs):
+ def compute_profile(self, dc_label, compute_name, kwargs):
# note: zerorpc does not support keyword arguments
## VIM/dummy gatekeeper's tasks:
# start vnf
- vnf_status = self.compute_action_start( dc_label, compute_name, image,
+ vnf_status = self.compute_action_start( dc_label, compute_name,
+ kwargs.get('image'),
kwargs.get('network'),
kwargs.get('command'))
# start traffic source (with fixed ip addres, no use for now...)
diff --git a/src/emuvim/cli/compute.py b/src/emuvim/cli/compute.py
index c096475..4869a17 100755
--- a/src/emuvim/cli/compute.py
+++ b/src/emuvim/cli/compute.py
@@ -86,15 +86,14 @@
params = self._create_dict(
network=nw_list,
command=args.get("docker_command"),
+ image=args.get("image"),
input=args.get("input"),
output=args.get("output"))
for output in self.c.compute_profile(
args.get("datacenter"),
args.get("name"),
- args.get("image"),
- params
- ):
+ params):
print(output + '\n')
#pp.pprint(r)
diff --git a/src/emuvim/cli/son_emu_cli.py b/src/emuvim/cli/son_emu_cli.py
index 195fe06..842d0a1 100755
--- a/src/emuvim/cli/son_emu_cli.py
+++ b/src/emuvim/cli/son_emu_cli.py
@@ -20,7 +20,7 @@
def main():
if len(sys.argv) < 2:
- print "Usage: son-emu-cli <toolname> <arguments>"
+ print("Usage: son-emu-cli <toolname> <arguments>")
exit(0)
if sys.argv[1] == "compute":
compute.main(sys.argv[2:])