X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=src%2Femuvim%2Fcli%2Fmonitor.py;h=3b667f76c22ea1013e94660daecee2497344202c;hb=994245bc4fb59f4c5129a5cb977af1871f08ce13;hp=1d4abfbb09bdf92e6384aeef2fd8fc660c6aad9a;hpb=8675d09a5488f60a856145f92380db6066200484;p=osm%2Fvim-emu.git

diff --git a/src/emuvim/cli/monitor.py b/src/emuvim/cli/monitor.py
index 1d4abfb..3b667f7 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>
 """
 
@@ -36,19 +36,15 @@ class ZeroRpcClient(object):
             vnf_interface,
             args.get("metric"))
         pp.pprint(r)
-        '''
-        self.c.monitor_setup_rate_measurement(
+
+    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"))
-        while True:
-            r = self.c.monitor_get_rate(
-                vnf_name,
-                vnf_interface,
-                args.get("metric"))
-            pp.pprint(r)
-            time.sleep(1)
-        '''
+        pp.pprint(r)
 
     def _parse_vnf_name(self, vnf_name_str):
         vnf_name = vnf_name_str.split(':')[0]
@@ -65,14 +61,15 @@ 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")
+    help="vnf name:interface to be monitored")
 parser.add_argument(
     "--metric", "-m", dest="metric",
     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)