updated SDN chaining commands

[osm/vim-emu.git] / src / emuvim / cli / monitor.py

diff --git a/src/emuvim/cli/monitor.py b/src/emuvim/cli/monitor.py
index 2caca2c..0c3c515 100755 (executable)
--- a/src/emuvim/cli/monitor.py
+++ b/src/emuvim/cli/monitor.py
@@ -29,13 +29,33 @@ class ZeroRpcClient(object):
             print "Command not implemented."\r
 \r
     def get_rate(self, args):\r
+        vnf_name = self._parse_vnf_name(args.get("vnf_name"))\r
+        vnf_interface = self._parse_vnf_interface(args.get("vnf_name"))\r
+        self.c.monitor_setup_rate_measurement(\r
+            vnf_name,\r
+            vnf_interface,\r
+            args.get("direction"),\r
+            args.get("metric"))\r
         while True:\r
             r = self.c.monitor_get_rate(\r
-                args.get("vnf_name"),\r
-                args.get("direction"))\r
+                vnf_name,\r
+                vnf_interface,\r
+                args.get("direction"),\r
+                args.get("metric"))\r
             pp.pprint(r)\r
             time.sleep(1)\r
 \r
+    def _parse_vnf_name(self, vnf_name_str):\r
+        vnf_name = vnf_name_str.split(':')[0]\r
+        return vnf_name\r
+\r
+    def _parse_vnf_interface(self, vnf_name_str):\r
+        try:\r
+            vnf_interface = vnf_name_str.split(':')[1]\r
+        except:\r
+            vnf_interface = None\r
+\r
+        return vnf_interface\r
 \r
 parser = argparse.ArgumentParser(description='son-emu network')\r
 parser.add_argument(\r
@@ -46,7 +66,10 @@ parser.add_argument(
     help="vnf name to be monitored")\r
 parser.add_argument(\r
     "--direction", "-d", dest="direction",\r
-    help="in (ingress rate) or out (egress rate)")\r
+    help="rx (ingress rate) or tx (egress rate)")\r
+parser.add_argument(\r
+    "--metric", "-m", dest="metric",\r
+    help="bytes (byte rate), packets (packet rate)")\r
 \r
 def main(argv):\r
     print "This is the son-emu monitor CLI."\r