diff options
| author |   imarom <imarom@cisco.com> | 2017-01-22 16:20:45 +0200 |
|---|---|---|
| committer | imarom <imarom@cisco.com> | 2017-01-22 16:20:45 +0200 |
| commit | 904eacd9be1230efb7ae0ab7997ec131b588ec8a (patch) | |
| tree | 8e4bcd1b1a5f683efdb8f3eeb962acefc3201961 /scripts/cfg | |
| parent | d2f1c8451e2e8ffc47b208f68f9b16697d706d60 (diff) | |
| parent | b81cdb6c2d6d118c1c346e7c8dae6a5e747d867d (diff) | |
Merge branch 'master' into capture
Signed-off-by: imarom <imarom@cisco.com>
Conflicts:
scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_client.py
scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_jsonrpc_client.py
scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_port.py
src/main_dpdk.cpp
Diffstat (limited to 'scripts/cfg')
| -rw-r--r-- | scripts/cfg/client_cfg_template.yaml | 56 | ||||
| -rw-r--r-- | scripts/cfg/kiwi02_more_flows.yaml | 12 |
2 files changed, 12 insertions, 56 deletions
diff --git a/scripts/cfg/client_cfg_template.yaml b/scripts/cfg/client_cfg_template.yaml deleted file mode 100644 index 8257b981..00000000 --- a/scripts/cfg/client_cfg_template.yaml +++ /dev/null @@ -1,56 +0,0 @@ -# -# 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/kiwi02_more_flows.yaml b/scripts/cfg/kiwi02_more_flows.yaml index a156d4f4..42735fdb 100644 --- a/scripts/cfg/kiwi02_more_flows.yaml +++ b/scripts/cfg/kiwi02_more_flows.yaml @@ -10,6 +10,18 @@ threads : [1,2,3,4] - socket : 1 threads : [8,9,10,11] + port_info: + - dest_mac : [0x00,0x00,0x00,0x01,0x00,0x00] + src_mac : [0x00,0x00,0x00,0x01,0x00,0x00] + + - dest_mac : [0x00,0x00,0x00,0x01,0x00,0x00] + src_mac : [0x00,0x00,0x00,0x01,0x00,0x00] + + - dest_mac : [0x00,0x00,0x00,0x01,0x00,0x00] + src_mac : [0x00,0x00,0x00,0x01,0x00,0x00] + + - dest_mac : [0x00,0x00,0x00,0x01,0x00,0x00] + src_mac : [0x00,0x00,0x00,0x01,0x00,0x00] memory : dp_flows : 4048576 |