Merge branch 'master' into scapy_server

4 files changed, 135 insertions, 0 deletions

diff --git a/scripts/cfg/client_cfg_template.yaml b/scripts/cfg/client_cfg_template.yaml
new file mode 100644
index 00000000..8257b981
--- /dev/null
+++ b/scripts/cfg/client_cfg_template.yaml
@@ -0,0 +1,56 @@
+# 
+# Client configuration example file
+# The file must contain the following fields
+#
+# 'vlan'   - is the entire configuration under VLAN
+#            if so, each client group must include vlan
+#            configuration
+#
+# 'groups' - each client group must contain a range of IP
+#            and initiator and responder maps 
+#            'count' represents the number of MAC devices
+#            on the group.
+#
+# initiator and responder can contain 'vlan', 'src_mac', 'dst_mac'
+#
+
+vlan: true
+
+groups:
+
+-    ip_start  : 5.0.0.1
+     ip_end    : 5.0.0.4
+     initiator : 
+                 vlan    : 100
+                 dst_mac : "00:00:00:01:00:00"
+     responder : 
+                 vlan    : 200
+                 dst_mac : "00:00:00:01:00:00"
+
+     count     : 2
+ 
+-    ip_start  : 5.0.0.5
+     ip_end    : 5.0.0.12
+     initiator :
+                 vlan    : 101
+                 dst_mac : "01:00:00:00:01:01"
+
+     responder:  
+                 vlan    : 201
+                 dst_mac : "01:00:00:00:02:01"
+
+     count     : 4
+
+-    ip_start  : 5.0.0.13
+     ip_end    : 5.0.0.30
+
+     initiator : 
+                vlan    : 103
+                dst_mac : "02:00:00:00:01:01"
+     responder :
+
+                vlan    : 203
+                dst_mac : "02:00:00:00:02:01"
+
+     count     : 8
+
diff --git a/scripts/cfg/trex_advanced_cfg-10g.yaml b/scripts/cfg/trex_advanced_cfg-10g.yaml
new file mode 100644
index 00000000..4450bb5b
--- /dev/null
+++ b/scripts/cfg/trex_advanced_cfg-10g.yaml
@@ -0,0 +1,15 @@
+- port_limit    : 2         
+  version       : 2
+  #interfaces    : ["04:00.0", "04:00.1", "06:00.0", "06:00.1"]   # list of the interfaces to bind run ./dpdk_nic_bind.py --status 
+  interfaces    : ["04:00.0", "04:00.1"]   # list of the interfaces to bind run ./dpdk_nic_bind.py --status 
+  port_info       :  # set eh mac addr 
+  prefix          : setup1   # WARNING,WARNING,WARNING DON'T USE THIS IF YOU DON'T KNOW WHAT YOU ARE DOING
+  limit_memory    : 1024     # WARNING,WARNING,WARNING DON'T USE THIS IF YOU DON'T KNOW WHAT YOU ARE DOING
+  port_info       :  # set eh mac addr
+         - dest_mac        :   [0x00, 0xe0, 0xed, 0x5d, 0x84, 0x65]
+           src_mac         :   [0x00, 0xe0, 0xed, 0x5d, 0x84, 0x64]
+         - dest_mac        :   [0x00, 0xe0, 0xed, 0x5d, 0x84, 0x64]
+           src_mac         :   [0x00, 0xe0, 0xed, 0x5d, 0x84, 0x65]
+
+
+
diff --git a/scripts/cfg/trex_advanced_dont_use_x710-card1.yaml b/scripts/cfg/trex_advanced_dont_use_x710-card1.yaml
new file mode 100644
index 00000000..2a9f1c94
--- /dev/null
+++ b/scripts/cfg/trex_advanced_dont_use_x710-card1.yaml
@@ -0,0 +1,23 @@
+- port_limit    : 2
+  version       : 2
+  interfaces    : ["06:00.0", "06:00.1"]   
+  prefix          : setup2 # WARNING,WARNING,WARNING DON'T USE THIS IF YOU DON'T KNOW WHAT YOU ARE DOING
+  limit_memory    : 1024   # WARNING,WARNING,WARNING DON'T USE THIS IF YOU DON'T KNOW WHAT YOU ARE DOING
+  zmq_pub_port    : 4510   # WARNING,WARNING,WARNING DON'T USE THIS IF YOU DON'T KNOW WHAT YOU ARE DOING
+  zmq_rpc_port    : 4511   # WARNING,WARNING,WARNING DON'T USE THIS IF YOU DON'T KNOW WHAT YOU ARE DOING
+  port_info       :  # set eh mac addr
+         - dest_mac        :   [0x00, 0xe0, 0xed, 0x5d, 0x84, 0x65]
+           src_mac         :   [0x00, 0xe0, 0xed, 0x5d, 0x84, 0x64]
+         - dest_mac        :   [0x00, 0xe0, 0xed, 0x5d, 0x84, 0x64]
+           src_mac         :   [0x00, 0xe0, 0xed, 0x5d, 0x84, 0x65]
+         - dest_mac        :   [0x00, 0xe0, 0xed, 0x5d, 0x84, 0x67]
+           src_mac         :   [0x00, 0xe0, 0xed, 0x5d, 0x84, 0x66]
+         - dest_mac        :   [0x00, 0xe0, 0xed, 0x5d, 0x84, 0x66]
+           src_mac         :   [0x00, 0xe0, 0xed, 0x5d, 0x84, 0x67]
+  platform :
+        master_thread_id  : 4
+        latency_thread_id : 7
+        dual_if   :
+             - socket   : 0
+               threads  : [5,6]
+
diff --git a/scripts/cfg/x710_advance_more_flows.yaml b/scripts/cfg/x710_advance_more_flows.yaml
new file mode 100644
index 00000000..074420ef
--- /dev/null
+++ b/scripts/cfg/x710_advance_more_flows.yaml
@@ -0,0 +1,41 @@
+- port_limit    : 4
+  version       : 2
+  interfaces    : ["02:00.0","02:00.1","84:00.0","84:00.1"]   # list of the interfaces to bind run ./dpdk_nic_bind.py --status
+  c : 4
+  #port_bandwidth_gb : 40
+  port_bandwidth_gb : 10
+
+  port_info       :  # set eh mac addr
+
+          - dest_mac        :   [0x68, 0x05, 0xca, 0x32, 0x0c, 0x39]
+            src_mac         :   [0x68, 0x05, 0xca, 0x32, 0x15, 0xb0]
+
+
+          - dest_mac        :   [0x68, 0x05, 0xca, 0x32, 0x0c, 0x38]
+            src_mac         :   [0x68, 0x05, 0xca, 0x32, 0x15, 0xb1]
+
+          - dest_mac        :   [0x68, 0x05, 0xca, 0x32, 0x15, 0xb1]
+            src_mac         :   [0x68, 0x05, 0xca, 0x32, 0x0c, 0x38]
+
+          - dest_mac        :   [0x68, 0x05, 0xca, 0x32, 0x15, 0xb0]
+            src_mac         :   [0x68, 0x05, 0xca, 0x32, 0x0c, 0x39]
+
+
+  platform :
+        master_thread_id  : 0
+        latency_thread_id : 8
+        dual_if   :
+             - socket   : 0
+               threads  : [1, 2, 3, 4, 5, 6, 7]
+             - socket   : 1
+               threads  : [9, 10, 11, 12, 13, 14, 15]
+
+
+
+  memory    :                                          
+        dp_flows    : 10048576
+        
+        
+             
+
+