summaryrefslogtreecommitdiffstats
path: root/scripts/automation/trex_control_plane/client_utils
diff options
context:
space:
mode:
authorHanoh Haim <hhaim@cisco.com>2016-01-24 13:27:11 +0200
committerHanoh Haim <hhaim@cisco.com>2016-01-24 13:27:11 +0200
commit951dd56abfd78d5669f0f57d840b2fe623ded2cd (patch)
tree60857060a198512b0d629e04daf63ca2168f09b3 /scripts/automation/trex_control_plane/client_utils
parent2d27d1df02328d7148ac1c4ed029ecdaf1853c1e (diff)
parent6f4a51c126b7a78ee8e37d396ed2b61b05fa506c (diff)
Merge from origin
Diffstat (limited to 'scripts/automation/trex_control_plane/client_utils')
-rwxr-xr-xscripts/automation/trex_control_plane/client_utils/jsonrpc_client.py30
-rwxr-xr-xscripts/automation/trex_control_plane/client_utils/parsing_opts.py41
2 files changed, 41 insertions, 30 deletions
diff --git a/scripts/automation/trex_control_plane/client_utils/jsonrpc_client.py b/scripts/automation/trex_control_plane/client_utils/jsonrpc_client.py
index bdae7bd9..05a32bc4 100755
--- a/scripts/automation/trex_control_plane/client_utils/jsonrpc_client.py
+++ b/scripts/automation/trex_control_plane/client_utils/jsonrpc_client.py
@@ -42,8 +42,8 @@ class BatchMessage(object):
# JSON RPC v2.0 client
class JsonRpcClient(object):
- def __init__ (self, default_server, default_port, prn_func = None):
- self.verbose = False
+ def __init__ (self, default_server, default_port, logger):
+ self.logger = logger
self.connected = False
# default values
@@ -51,7 +51,6 @@ class JsonRpcClient(object):
self.server = default_server
self.id_gen = general_utils.random_id_gen()
- self.prn_func = prn_func
def get_connection_details (self):
rc = {}
@@ -82,10 +81,7 @@ class JsonRpcClient(object):
return pretty_str
def verbose_msg (self, msg):
- if not self.verbose:
- return
-
- print "[verbose] " + msg
+ self.logger.log("[verbose] " + msg, level = self.logger.VERBOSE_HIGH)
# batch messages
@@ -128,7 +124,7 @@ class JsonRpcClient(object):
break
except zmq.Again:
tries += 1
- if tries > 10:
+ if tries > 5:
self.disconnect()
return RC_ERR("*** [RPC] - Failed to send message to server")
@@ -140,9 +136,9 @@ class JsonRpcClient(object):
break
except zmq.Again:
tries += 1
- if tries > 10:
+ if tries > 5:
self.disconnect()
- return RC_ERR("*** [RPC] - Failed to get server response")
+ return RC_ERR("*** [RPC] - Failed to get server response at {0}".format(self.transport))
self.verbose_msg("Server Response:\n\n" + self.pretty_json(response) + "\n")
@@ -177,16 +173,14 @@ class JsonRpcClient(object):
else:
return RC_ERR(response_json["error"]["message"])
+
# if no error there should be a result
if ("result" not in response_json):
return RC_ERR("Malformed Response ({0})".format(str(response_json)))
return RC_OK(response_json["result"])
-
- def set_verbose(self, mode):
- self.verbose = mode
def disconnect (self):
if self.connected:
@@ -198,7 +192,7 @@ class JsonRpcClient(object):
return RC_ERR("Not connected to server")
- def connect(self, server = None, port = None, prn_func = None):
+ def connect(self, server = None, port = None):
if self.connected:
self.disconnect()
@@ -210,12 +204,6 @@ class JsonRpcClient(object):
# Socket to talk to server
self.transport = "tcp://{0}:{1}".format(self.server, self.port)
- msg = "\nConnecting To RPC Server On {0}".format(self.transport)
- if self.prn_func:
- self.prn_func(msg)
- else:
- print msg
-
self.socket = self.context.socket(zmq.REQ)
try:
self.socket.connect(self.transport)
@@ -245,7 +233,7 @@ class JsonRpcClient(object):
return self.connected
def __del__(self):
- print "Shutting down RPC client\n"
+ self.logger.log("Shutting down RPC client\n")
if hasattr(self, "context"):
self.context.destroy(linger=0)
diff --git a/scripts/automation/trex_control_plane/client_utils/parsing_opts.py b/scripts/automation/trex_control_plane/client_utils/parsing_opts.py
index 3735a45b..ba60c191 100755
--- a/scripts/automation/trex_control_plane/client_utils/parsing_opts.py
+++ b/scripts/automation/trex_control_plane/client_utils/parsing_opts.py
@@ -69,10 +69,19 @@ match_multiplier_help = """Multiplier should be passed in the following format:
will provide a percentage of the line rate. examples
: '-m 10', '-m 10kbps', '-m 10mpps', '-m 23%%' """
-def match_multiplier_common(val, strict_abs = True):
- # on strict absolute we do not allow +/-
- if strict_abs:
+# decodes multiplier
+# if allow_update - no +/- is allowed
+# divide states between how many entities the
+# value should be divided
+def decode_multiplier(val, allow_update = False, divide_count = 1):
+
+ # must be string
+ if not isinstance(val, str):
+ return None
+
+ # do we allow updates ? +/-
+ if not allow_update:
match = re.match("^(\d+(\.\d+)?)(bps|kbps|mbps|gbps|pps|kpps|mpps|%?)$", val)
op = None
else:
@@ -136,19 +145,32 @@ def match_multiplier_common(val, strict_abs = True):
else:
result['op'] = "abs"
+ if result['op'] != 'percentage':
+ result['value'] = result['value'] / divide_count
+
return result
else:
- raise argparse.ArgumentTypeError(match_multiplier_help)
+ return None
def match_multiplier(val):
'''match some val against multiplier shortcut inputs '''
- return match_multiplier_common(val, strict_abs = False)
+ result = decode_multiplier(val, allow_update = True)
+ if not result:
+ raise argparse.ArgumentTypeError(match_multiplier_help)
+
+ return val
+
def match_multiplier_strict(val):
'''match some val against multiplier shortcut inputs '''
- return match_multiplier_common(val, strict_abs = True)
+ result = decode_multiplier(val, allow_update = False)
+ if not result:
+ raise argparse.ArgumentTypeError(match_multiplier_help)
+
+ return val
+
def is_valid_file(filename):
if not os.path.isfile(filename):
@@ -230,6 +252,7 @@ OPTIONS_DB = {MULTIPLIER: ArgumentPack(['-m', '--multiplier'],
'default': False,
'help': "Starts TUI in xterm window"}),
+
FULL_OUTPUT: ArgumentPack(['--full'],
{'action': 'store_true',
'help': "Prompt full info in a JSON format"}),
@@ -284,12 +307,12 @@ class CCmdArgParser(argparse.ArgumentParser):
# if all ports are marked or
if (getattr(opts, "all_ports", None) == True) or (getattr(opts, "ports", None) == []):
- opts.ports = self.stateless_client.get_port_ids()
+ opts.ports = self.stateless_client.get_all_ports()
# so maybe we have ports configured
- elif (getattr(opts, "ports", None) == []):
+ elif getattr(opts, "ports", None):
for port in opts.ports:
- if not self.stateless_client.validate_port_list([port]):
+ if not self.stateless_client._validate_port_list([port]):
self.error("port id '{0}' is not a valid port id\n".format(port))
return opts