merge master

[osm/vim-emu.git] / src / emuvim / cli / compute.py

diff --git a/src/emuvim/cli/compute.py b/src/emuvim/cli/compute.py
index 2636315..dcb499d 100755 (executable)
--- a/src/emuvim/cli/compute.py
+++ b/src/emuvim/cli/compute.py
@@ -15,7 +15,7 @@ pp = pprint.PrettyPrinter(indent=4)
 class ZeroRpcClient(object):
 
     def __init__(self):
-        self.c = zerorpc.Client()
+        self.c = zerorpc.Client(heartbeat=None, timeout=120) #heartbeat=None, timeout=120
         self.c.connect("tcp://127.0.0.1:4242")  # TODO hard coded for now. we'll change this later
         self.cmds = {}
 
@@ -90,13 +90,16 @@ class ZeroRpcClient(object):
             input=args.get("input"),
             output=args.get("output"))
 
-        r = self.c.compute_profile(
+        for output in self.c.compute_profile(
             args.get("datacenter"),
             args.get("name"),
             args.get("image"),
             params
-        )
-        pp.pprint(r)
+            ):
+            print(output + '\n')
+
+        #pp.pprint(r)
+        #print(r)
 
     def _create_dict(self, **kwargs):
         return kwargs
@@ -120,7 +123,7 @@ class ZeroRpcClient(object):
 parser = argparse.ArgumentParser(description='son-emu compute')
 parser.add_argument(
     "command",
-    choices=['start', 'stop', 'list', 'status'],
+    choices=['start', 'stop', 'list', 'status', 'profile'],
     help="Action to be executed.")
 parser.add_argument(
     "--datacenter", "-d", dest="datacenter",