X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=src%2Femuvim%2Fcli%2Fmonitor.py;h=14cce082862db3bf8a076fd73a4d213204e2a482;hb=300e1e54aefeace41e0f2785c82daccb3dc50357;hp=0c3c515289a79b29315755a31212aff5bcf085ac;hpb=43a9649213180695e908e67e01d3c4e77bc7b2ca;p=osm%2Fvim-emu.git

diff --git a/src/emuvim/cli/monitor.py b/src/emuvim/cli/monitor.py
index 0c3c515..14cce08 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,22 +28,23 @@ class ZeroRpcClient(object):
         else:
             print "Command not implemented."
 
-    def get_rate(self, args):
+    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"))
-        self.c.monitor_setup_rate_measurement(
+        r = self.c.setup_metric(
             vnf_name,
             vnf_interface,
-            args.get("direction"),
             args.get("metric"))
-        while True:
-            r = self.c.monitor_get_rate(
-                vnf_name,
-                vnf_interface,
-                args.get("direction"),
-                args.get("metric"))
-            pp.pprint(r)
-            time.sleep(1)
+        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)
 
     def _parse_vnf_name(self, vnf_name_str):
         vnf_name = vnf_name_str.split(':')[0]
@@ -60,20 +61,17 @@ class ZeroRpcClient(object):
 parser = argparse.ArgumentParser(description='son-emu network')
 parser.add_argument(
     "command",
-    help="Action to be executed: get_rate")
+    help="Action to be executed")
 parser.add_argument(
     "--vnf_name", "-vnf", dest="vnf_name",
-    help="vnf name to be monitored")
-parser.add_argument(
-    "--direction", "-d", dest="direction",
-    help="rx (ingress rate) or tx (egress rate)")
+    help="vnf name:interface to be monitored")
 parser.add_argument(
     "--metric", "-m", dest="metric",
-    help="bytes (byte rate), packets (packet rate)")
+    help="tx_bytes, rx_bytes, tx_packets, rx_packets")
 
 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)