X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=src%2Femuvim%2Fcli%2Fmonitor.py;h=34853a61580ceadf7e7fbfe8f1f8a6ad8ccbaf25;hb=418815231ec9713829606e56e3cf6ea022b3dccf;hp=2caca2c00a62ed1093e40fb38bdef86f2cada599;hpb=9315da41a33ef046bc82a589028e8bd471e75200;p=osm%2Fvim-emu.git

diff --git a/src/emuvim/cli/monitor.py b/src/emuvim/cli/monitor.py
index 2caca2c..34853a6 100755
--- a/src/emuvim/cli/monitor.py
+++ b/src/emuvim/cli/monitor.py
@@ -1,5 +1,5 @@
 """
-son-emu network CLI
+son-emu monitor CLI
 (c) 2016 by Manuel Peuster <manuel.peuster@upb.de>
 """
 
@@ -28,29 +28,91 @@ class ZeroRpcClient(object):
         else:
             print "Command not implemented."
 
-    def get_rate(self, args):
-        while True:
-            r = self.c.monitor_get_rate(
-                args.get("vnf_name"),
-                args.get("direction"))
-            pp.pprint(r)
-            time.sleep(1)
+    def setup_metric(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_metric(
+            vnf_name,
+            vnf_interface,
+            args.get("metric"))
+        pp.pprint(r)
 
+    def stop_metric(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.stop_metric(
+            vnf_name,
+            vnf_interface,
+            args.get("metric"))
+        pp.pprint(r)
 
-parser = argparse.ArgumentParser(description='son-emu network')
+    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 stop_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.stop_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
+
+    def _parse_vnf_interface(self, vnf_name_str):
+        try:
+            vnf_interface = vnf_name_str.split(':')[1]
+        except:
+            vnf_interface = None
+
+        return vnf_interface
+
+parser = argparse.ArgumentParser(description='son-emu monitor')
 parser.add_argument(
     "command",
-    help="Action to be executed: get_rate")
+    choices=['setup_metric', 'stop_metric', 'setup_flow', 'stop_flow','prometheus'],
+    help="setup/stop a metric/flow to be monitored or Prometheus query")
 parser.add_argument(
     "--vnf_name", "-vnf", dest="vnf_name",
-    help="vnf name to be monitored")
+    help="vnf name:interface to be monitored")
+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(
-    "--direction", "-d", dest="direction",
-    help="in (ingress rate) or out (egress rate)")
+    "--datacenter", "-d", dest="datacenter",
+    help="Data center where the vnf is deployed")
 
 def main(argv):
-    print "This is the son-emu monitor CLI."
-    print "Arguments: %s" % str(argv)
+    #print "This is the son-emu monitor CLI."
+    #print "Arguments: %s" % str(argv)
     args = vars(parser.parse_args(argv))
     c = ZeroRpcClient()
     c.execute_command(args)