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

diff --git a/src/emuvim/cli/monitor.py b/src/emuvim/cli/monitor.py
index 6885a3c..1d4abfb 100755
--- a/src/emuvim/cli/monitor.py
+++ b/src/emuvim/cli/monitor.py
@@ -7,6 +7,7 @@ import argparse
 import pprint
 from tabulate import tabulate
 import zerorpc
+import time
 
 
 pp = pprint.PrettyPrinter(indent=4)
@@ -27,12 +28,39 @@ class ZeroRpcClient(object):
         else:
             print "Command not implemented."
 
-    def get_rate(self, args):
-        r = self.c.monitor_get_rate(
-            args.get("vnf_name"),
-            args.get("direction"))
+    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)
+        '''
+        self.c.monitor_setup_rate_measurement(
+            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)
+        '''
 
+    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 network')
 parser.add_argument(
@@ -42,12 +70,12 @@ parser.add_argument(
     "--vnf_name", "-vnf", dest="vnf_name",
     help="vnf name to be monitored")
 parser.add_argument(
-    "--direction", "-d", dest="direction",
-    help="in (ingress rate) or out (egress rate)")
+    "--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)
+    #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)