set chaining via VLANs
diff --git a/src/emuvim/cli/compute.py b/src/emuvim/cli/compute.py
index 0cfb024..dcb499d 100755
--- a/src/emuvim/cli/compute.py
+++ b/src/emuvim/cli/compute.py
@@ -15,7 +15,7 @@
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 @@
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
diff --git a/src/emuvim/cli/monitor.py b/src/emuvim/cli/monitor.py
index 3b667f7..123abe5 100755
--- a/src/emuvim/cli/monitor.py
+++ b/src/emuvim/cli/monitor.py
@@ -46,6 +46,27 @@
args.get("metric"))
pp.pprint(r)
+ def setup_flow(self, args):
+ vnf_name = self._parse_vnf_name(args.get("vnf_name"))
+ vnf_interface = self._parse_vnf_interface(args.get("vnf_name"))
+ r = self.c.setup_flow(
+ vnf_name,
+ vnf_interface,
+ args.get("metric"),
+ args.get("cookie"))
+ pp.pprint(r)
+
+ def prometheus(self, args):
+ vnf_name = self._parse_vnf_name(args.get("vnf_name"))
+ vnf_interface = self._parse_vnf_interface(args.get("vnf_name"))
+ r = self.c.prometheus(
+ args.get("datacenter"),
+ vnf_name,
+ vnf_interface,
+ args.get("query"))
+ pp.pprint(r)
+
+
def _parse_vnf_name(self, vnf_name_str):
vnf_name = vnf_name_str.split(':')[0]
return vnf_name
@@ -58,7 +79,7 @@
return vnf_interface
-parser = argparse.ArgumentParser(description='son-emu network')
+parser = argparse.ArgumentParser(description='son-emu monitor')
parser.add_argument(
"command",
help="Action to be executed")
@@ -68,7 +89,15 @@
parser.add_argument(
"--metric", "-m", dest="metric",
help="tx_bytes, rx_bytes, tx_packets, rx_packets")
-
+parser.add_argument(
+ "--cookie", "-c", dest="cookie",
+ help="flow cookie to monitor")
+parser.add_argument(
+ "--query", "-q", dest="query",
+ help="prometheus query")
+parser.add_argument(
+ "--datacenter", "-d", dest="datacenter",
+ help="Data center where the vnf is deployed")
def main(argv):
#print "This is the son-emu monitor CLI."