Merge branch 'master' into rpc

Conflicts:
	scripts/automation/trex_control_plane/client_utils/jsonrpc_client.py

1 files changed, 18 insertions, 0 deletions

diff --git a/scripts/automation/trex_control_plane/client/trex_hltapi.py b/scripts/automation/trex_control_plane/client/trex_hltapi.py
new file mode 100644
index 00000000..46c283f8
--- /dev/null
+++ b/scripts/automation/trex_control_plane/client/trex_hltapi.py
@@ -0,0 +1,18 @@
+#!/router/bin/python
+
+import trex_root_path
+from client_utils.packet_builder import CTRexPktBuilder
+
+print "done!"
+
+class CTRexHltApi(object):
+
+    def __init__(self):
+        pass
+
+    def config_traffic(self):
+        pass
+
+if __name__ == "__main__":
+    pass
+