summaryrefslogtreecommitdiffstats
path: root/scripts/automation
diff options
context:
space:
mode:
authorHanoh Haim <hhaim@cisco.com>2015-11-12 15:33:30 +0200
committerHanoh Haim <hhaim@cisco.com>2015-11-12 15:33:30 +0200
commit45b71cff9d0465b77f82e4cd40b64a9f3183c1c7 (patch)
tree131242205381140fffeab0e7c2e05618efcc39ce /scripts/automation
parent12aa72196b6ccac1b335fa7f06e9351c28c79158 (diff)
refactor stream object
Diffstat (limited to 'scripts/automation')
-rw-r--r--scripts/automation/trex_control_plane/client/trex_async_client.py3
-rwxr-xr-xscripts/automation/trex_control_plane/console/trex_console.py8
2 files changed, 6 insertions, 5 deletions
diff --git a/scripts/automation/trex_control_plane/client/trex_async_client.py b/scripts/automation/trex_control_plane/client/trex_async_client.py
index 72cce5aa..d13513bf 100644
--- a/scripts/automation/trex_control_plane/client/trex_async_client.py
+++ b/scripts/automation/trex_control_plane/client/trex_async_client.py
@@ -181,7 +181,8 @@ class CTRexAsyncClient():
self.socket.setsockopt(zmq.SUBSCRIBE, '')
while self.active:
- msg = json.loads(self.socket.recv_string())
+ line = self.socket.recv_string();
+ msg = json.loads(line)
key = msg['name']
self.raw_snapshot[key] = msg['data']
diff --git a/scripts/automation/trex_control_plane/console/trex_console.py b/scripts/automation/trex_control_plane/console/trex_console.py
index 06ae762a..5470e694 100755
--- a/scripts/automation/trex_control_plane/console/trex_console.py
+++ b/scripts/automation/trex_control_plane/console/trex_console.py
@@ -371,12 +371,12 @@ def setParserOptions():
default = "localhost",
type = str)
- parser.add_argument("-p", "--port", help = "TRex Server Port [default is 5505]\n",
- default = 5505,
+ parser.add_argument("-p", "--port", help = "TRex Server Port [default is 4501]\n",
+ default = 4501,
type = int)
- parser.add_argument("--async_port", help = "TRex ASync Publisher Port [default is 4505]\n",
- default = 4505,
+ parser.add_argument("--async_port", help = "TRex ASync Publisher Port [default is 4500]\n",
+ default = 4500,
dest='pub',
type = int)