summaryrefslogtreecommitdiffstats
path: root/scripts/automation/trex_control_plane/client/trex_client.py
diff options
context:
space:
mode:
authorYaroslav Brustinov <ybrustin@cisco.com>2015-12-13 18:00:30 +0200
committerYaroslav Brustinov <ybrustin@cisco.com>2015-12-13 18:00:30 +0200
commit3b66e1dd3b9c5b1895f7302c36c6bfc476492a56 (patch)
treebf4479cfcceee977e43a4a87a49c033ff871b3f9 /scripts/automation/trex_control_plane/client/trex_client.py
parent9738e267d806223ee25e013b5959ccac26c1a14a (diff)
python API: determine TRex version in more robust way
Diffstat (limited to 'scripts/automation/trex_control_plane/client/trex_client.py')
-rwxr-xr-xscripts/automation/trex_control_plane/client/trex_client.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/automation/trex_control_plane/client/trex_client.py b/scripts/automation/trex_control_plane/client/trex_client.py
index 77b11c37..e1130a97 100755
--- a/scripts/automation/trex_control_plane/client/trex_client.py
+++ b/scripts/automation/trex_control_plane/client/trex_client.py
@@ -546,7 +546,7 @@ class CTRexClient(object):
Get TRex version details.
:return:
- Trex details (Version, User, Date, Uuid) as ordered dictionary
+ Trex details (Version, User, Date, Uuid, Git SHA) as ordered dictionary
:raises:
+ :exc:`trex_exceptions.TRexRequestDenied`, in case TRex version could not be determined.
@@ -558,9 +558,11 @@ class CTRexClient(object):
version_dict = OrderedDict()
result_lines = binascii.a2b_base64(self.server.get_trex_version()).split('\n')
for line in result_lines:
+ if not line:
+ continue
key, value = line.strip().split(':', 1)
version_dict[key.strip()] = value.strip()
- for key in ('Version', 'User', 'Date', 'Uuid'):
+ for key in ('Version', 'User', 'Date', 'Uuid', 'Git SHA'):
if key not in version_dict:
raise Exception('get_trex_version: got server response without key: {0}'.format(key))
return version_dict