Merge branch 'master' into rx_phase_2

2 files changed, 42 insertions, 8 deletions

diff --git a/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_jsonrpc_client.py b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_jsonrpc_client.py
index 93a930e4..51e93f5a 100644
--- a/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_jsonrpc_client.py
+++ b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_jsonrpc_client.py
@@ -32,13 +32,35 @@ class BatchMessage(object):
         id, msg = self.rpc_client.create_jsonrpc_v2(method_name, params, api_class, encode = False)
         self.batch_list.append(msg)
 
-    def invoke(self, block = False):
+    def invoke(self, block = False, chunk_size = 500000):
         if not self.rpc_client.connected:
             return RC_ERR("Not connected to server")
 
-        msg = json.dumps(self.batch_list)
-
-        return self.rpc_client.send_msg(msg)
+        if chunk_size:
+            response_batch = RC()
+            size = 0
+            new_batch = []
+            for msg in self.batch_list:
+                size += len(json.dumps(msg))
+                new_batch.append(msg)
+                if size > chunk_size:
+                    batch_json = json.dumps(new_batch)
+                    response = self.rpc_client.send_msg(batch_json)
+                    if not response:
+                        return response
+                    response_batch.add(response)
+                    size = 0
+                    new_batch = []
+            if new_batch:
+                batch_json = json.dumps(new_batch)
+                response = self.rpc_client.send_msg(batch_json)
+                if not response:
+                    return response
+                response_batch.add(response)
+            return response_batch
+        else:
+            batch_json = json.dumps(self.batch_list)
+            return self.rpc_client.send_msg(batch_json)
 
 
 # JSON RPC v2.0 client
@@ -130,13 +152,13 @@ class JsonRpcClient(object):
 
         if self.zipper.check_threshold(buffer):
             response = self.send_raw_msg(self.zipper.compress(buffer))
-            if response:
-                response = self.zipper.decompress(response)
         else:
             response = self.send_raw_msg(buffer)
 
         if not response:
             return response
+        elif self.zipper.is_compressed(response):
+            response = self.zipper.decompress(response)
 
         # return to string
         response = response.decode()
diff --git a/scripts/automation/trex_control_plane/stl/trex_stl_lib/utils/zipmsg.py b/scripts/automation/trex_control_plane/stl/trex_stl_lib/utils/zipmsg.py
index 397ada16..a2a47927 100644
--- a/scripts/automation/trex_control_plane/stl/trex_stl_lib/utils/zipmsg.py
+++ b/scripts/automation/trex_control_plane/stl/trex_stl_lib/utils/zipmsg.py
@@ -6,7 +6,7 @@ class ZippedMsg:
     MSG_COMPRESS_THRESHOLD    = 256
     MSG_COMPRESS_HEADER_MAGIC = 0xABE85CEA
 
-    def check_threshold (self, msg):
+    def check_threshold(self, msg):
         return len(msg) >= self.MSG_COMPRESS_THRESHOLD
 
     def compress (self, msg):
@@ -16,7 +16,7 @@ class ZippedMsg:
         return new_msg
 
 
-    def decompress (self, msg):
+    def decompress(self, msg):
         if len(msg) < 8:
             return None
 
@@ -30,3 +30,15 @@ class ZippedMsg:
 
         return x
 
+
+    def is_compressed(self, msg):
+        if len(msg) < 8:
+            return False
+
+        t = struct.unpack(">II", msg[:8])
+        if (t[0] != self.MSG_COMPRESS_HEADER_MAGIC):
+            return False
+
+        return True
+
+