Merge remote-tracking branch 'upstream/master'

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

diff --git a/src/emuvim/cli/monitor.py b/src/emuvim/cli/monitor.py
index 123abe5..34853a6 100755 (executable)
--- a/src/emuvim/cli/monitor.py
+++ b/src/emuvim/cli/monitor.py
@@ -56,6 +56,16 @@ class ZeroRpcClient(object):
             args.get("cookie"))\r
         pp.pprint(r)\r
 \r
+    def stop_flow(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
+        r = self.c.stop_flow(\r
+            vnf_name,\r
+            vnf_interface,\r
+            args.get("metric"),\r
+            args.get("cookie"))\r
+        pp.pprint(r)\r
+\r
     def prometheus(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
@@ -82,7 +92,8 @@ class ZeroRpcClient(object):
 parser = argparse.ArgumentParser(description='son-emu monitor')\r
 parser.add_argument(\r
     "command",\r
-    help="Action to be executed")\r
+    choices=['setup_metric', 'stop_metric', 'setup_flow', 'stop_flow','prometheus'],\r
+    help="setup/stop a metric/flow to be monitored or Prometheus query")\r
 parser.add_argument(\r
     "--vnf_name", "-vnf", dest="vnf_name",\r
     help="vnf name:interface to be monitored")\r