projects
/
osm
/
vim-emu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix network definition when starting container
[osm/vim-emu.git]
/
src
/
emuvim
/
cli
/
monitor.py
diff --git
a/src/emuvim/cli/monitor.py
b/src/emuvim/cli/monitor.py
index
1d4abfb
..
3b667f7
100755
(executable)
--- a/
src/emuvim/cli/monitor.py
+++ b/
src/emuvim/cli/monitor.py
@@
-1,5
+1,5
@@
"""
\r
"""
\r
-son-emu
network
CLI
\r
+son-emu
monitor
CLI
\r
(c) 2016 by Manuel Peuster <manuel.peuster@upb.de>
\r
"""
\r
\r
(c) 2016 by Manuel Peuster <manuel.peuster@upb.de>
\r
"""
\r
\r
@@
-36,19
+36,15
@@
class ZeroRpcClient(object):
vnf_interface,
\r
args.get("metric"))
\r
pp.pprint(r)
\r
vnf_interface,
\r
args.get("metric"))
\r
pp.pprint(r)
\r
- '''
\r
- self.c.monitor_setup_rate_measurement(
\r
+
\r
+ def stop_metric(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_metric(
\r
vnf_name,
\r
vnf_interface,
\r
args.get("metric"))
\r
vnf_name,
\r
vnf_interface,
\r
args.get("metric"))
\r
- while True:
\r
- r = self.c.monitor_get_rate(
\r
- vnf_name,
\r
- vnf_interface,
\r
- args.get("metric"))
\r
- pp.pprint(r)
\r
- time.sleep(1)
\r
- '''
\r
+ pp.pprint(r)
\r
\r
def _parse_vnf_name(self, vnf_name_str):
\r
vnf_name = vnf_name_str.split(':')[0]
\r
\r
def _parse_vnf_name(self, vnf_name_str):
\r
vnf_name = vnf_name_str.split(':')[0]
\r
@@
-65,14
+61,15
@@
class ZeroRpcClient(object):
parser = argparse.ArgumentParser(description='son-emu network')
\r
parser.add_argument(
\r
"command",
\r
parser = argparse.ArgumentParser(description='son-emu network')
\r
parser.add_argument(
\r
"command",
\r
- help="Action to be executed
: get_rate
")
\r
+ help="Action to be executed")
\r
parser.add_argument(
\r
"--vnf_name", "-vnf", dest="vnf_name",
\r
parser.add_argument(
\r
"--vnf_name", "-vnf", dest="vnf_name",
\r
- help="vnf name to be monitored")
\r
+ help="vnf name
:interface
to be monitored")
\r
parser.add_argument(
\r
"--metric", "-m", dest="metric",
\r
help="tx_bytes, rx_bytes, tx_packets, rx_packets")
\r
\r
parser.add_argument(
\r
"--metric", "-m", dest="metric",
\r
help="tx_bytes, rx_bytes, tx_packets, rx_packets")
\r
\r
+
\r
def main(argv):
\r
#print "This is the son-emu monitor CLI."
\r
#print "Arguments: %s" % str(argv)
\r
def main(argv):
\r
#print "This is the son-emu monitor CLI."
\r
#print "Arguments: %s" % str(argv)
\r