Merge branch 'master' into rpc

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

1 files changed, 51 insertions, 0 deletions

diff --git a/scripts/cap2/per_template_gen5.yaml b/scripts/cap2/per_template_gen5.yaml
new file mode 100755
index 00000000..e29a2bfc
--- /dev/null
+++ b/scripts/cap2/per_template_gen5.yaml
@@ -0,0 +1,51 @@
+- duration : 1.0
+  generator :  
+          distribution : "seq"
+          clients_start : "20.0.0.1"
+          clients_end   : "20.0.0.255"
+          servers_start : "90.0.0.1"
+          servers_end   : "90.0.255.255"
+          clients_per_gb : 201
+          min_clients    : 101
+          dual_port_mask : "1.0.0.0" 
+          tcp_aging      : 0
+          udp_aging      : 0
+          generator_clients :
+              - name : "c1"
+                distribution : "seq"
+                ip_start : "26.0.0.1"
+                ip_end : "26.0.1.255"
+              - name : "c2"
+                distribution : "seq"
+                ip_start : "36.0.0.1"
+                ip_end : "36.0.1.254"
+          generator_servers :
+              - name : "s1"
+                distribution : "seq"
+                ip_start : "28.0.0.1"
+                ip_end : "28.0.1.255"
+                track_ports : false
+              - name : "s2"
+                distribution : "seq"
+                ip_start : "38.0.0.1"
+                ip_end : "38.0.3.255"
+                track_ports : false
+  mac        : [0x0,0x0,0x0,0x1,0x0,0x00]
+  cap_info : 
+     - name: cap2/http_get.pcap
+       client_pool: "c2"
+       server_pool: "s1"
+       cps : 1.0
+       ipg : 100
+       rtt : 10000
+       w   : 1
+     - name: avl/delay_10_rtp_160k_full.pcap
+       client_pool: "c1"
+       server_pool: "s2"
+       cps : 0.7
+       ipg : 10000
+       rtt : 10000
+       w   : 1
+       one_app_server : false
+       plugin_id : 1
+