update monitor features
diff --git a/src/emuvim/cli/monitor.py b/src/emuvim/cli/monitor.py
index 0c3c515..1d4abfb 100755
--- a/src/emuvim/cli/monitor.py
+++ b/src/emuvim/cli/monitor.py
@@ -28,22 +28,27 @@
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"))
+ 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("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)
+ '''
def _parse_vnf_name(self, vnf_name_str):
vnf_name = vnf_name_str.split(':')[0]
@@ -65,15 +70,12 @@
"--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)")
-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)