From af52e17f717ee272577bcaa3524b272531752423 Mon Sep 17 00:00:00 2001 From: Ido Barnea Date: Wed, 15 Feb 2017 17:17:18 +0200 Subject: VLAN keyword in platform config file will now make all traffic be sent over vlan Signed-off-by: Ido Barnea --- scripts/cap2/dns.yaml | 2 -- scripts/cap2/dns_no_delay.yaml | 2 -- scripts/cap2/ipv4_load_balance.yaml | 21 +++++++++++++++++++++ scripts/cap2/ipv4_vlan.yaml | 21 --------------------- scripts/cap2/ipv6_load_balance.yaml | 23 +++++++++++++++++++++++ scripts/cap2/ipv6_vlan.yaml | 23 ----------------------- scripts/cap2/jumbo.yaml | 2 -- scripts/cap2/wrong_ip.yaml | 2 -- 8 files changed, 44 insertions(+), 52 deletions(-) create mode 100755 scripts/cap2/ipv4_load_balance.yaml delete mode 100755 scripts/cap2/ipv4_vlan.yaml create mode 100755 scripts/cap2/ipv6_load_balance.yaml delete mode 100755 scripts/cap2/ipv6_vlan.yaml (limited to 'scripts/cap2') diff --git a/scripts/cap2/dns.yaml b/scripts/cap2/dns.yaml index dd577894..23b02fd6 100755 --- a/scripts/cap2/dns.yaml +++ b/scripts/cap2/dns.yaml @@ -11,8 +11,6 @@ tcp_aging : 1 udp_aging : 1 mac : [0x00,0x00,0x00,0x01,0x00,0x00] - #vlan : { enable : 1 , vlan0 : 100 , vlan1 : 200 } - #mac_override_by_ip : true cap_info : - name: cap2/dns.pcap cps : 1.0 diff --git a/scripts/cap2/dns_no_delay.yaml b/scripts/cap2/dns_no_delay.yaml index ab387d31..6139716c 100644 --- a/scripts/cap2/dns_no_delay.yaml +++ b/scripts/cap2/dns_no_delay.yaml @@ -11,8 +11,6 @@ tcp_aging : 0 udp_aging : 0 mac : [0x00,0x00,0x00,0x01,0x00,0x00] - #vlan : { enable : 1 , vlan0 : 100 , vlan1 : 200 } - #mac_override_by_ip : true cap_info : - name: cap2/dns.pcap cps : 1.0 diff --git a/scripts/cap2/ipv4_load_balance.yaml b/scripts/cap2/ipv4_load_balance.yaml new file mode 100755 index 00000000..63f7db7d --- /dev/null +++ b/scripts/cap2/ipv4_load_balance.yaml @@ -0,0 +1,21 @@ +- duration : 10 + generator : + distribution : "seq" + clients_start : "16.0.0.1" + clients_end : "16.0.1.255" + servers_start : "48.0.0.1" + servers_end : "48.0.0.255" + clients_per_gb : 201 + min_clients : 101 + dual_port_mask : "1.0.0.0" + tcp_aging : 1 + udp_aging : 1 + mac : [0x0,0x0,0x0,0x1,0x0,0x00] + vlan : { enable : 1 , vlan0 : 100 , vlan1 : 200 } + cap_info : + - name: cap2/udp_64B.pcap + cps : 10.0 + ipg : 10000 + rtt : 10000 + w : 4 + limit : 20 diff --git a/scripts/cap2/ipv4_vlan.yaml b/scripts/cap2/ipv4_vlan.yaml deleted file mode 100755 index 63f7db7d..00000000 --- a/scripts/cap2/ipv4_vlan.yaml +++ /dev/null @@ -1,21 +0,0 @@ -- duration : 10 - generator : - distribution : "seq" - clients_start : "16.0.0.1" - clients_end : "16.0.1.255" - servers_start : "48.0.0.1" - servers_end : "48.0.0.255" - clients_per_gb : 201 - min_clients : 101 - dual_port_mask : "1.0.0.0" - tcp_aging : 1 - udp_aging : 1 - mac : [0x0,0x0,0x0,0x1,0x0,0x00] - vlan : { enable : 1 , vlan0 : 100 , vlan1 : 200 } - cap_info : - - name: cap2/udp_64B.pcap - cps : 10.0 - ipg : 10000 - rtt : 10000 - w : 4 - limit : 20 diff --git a/scripts/cap2/ipv6_load_balance.yaml b/scripts/cap2/ipv6_load_balance.yaml new file mode 100755 index 00000000..bb91a4f8 --- /dev/null +++ b/scripts/cap2/ipv6_load_balance.yaml @@ -0,0 +1,23 @@ +- duration : 10 + generator : + distribution : "seq" + clients_start : "16.0.0.1" + clients_end : "16.0.1.255" + servers_start : "48.0.0.1" + servers_end : "48.0.0.255" + clients_per_gb : 201 + min_clients : 101 + dual_port_mask : "1.0.0.0" + tcp_aging : 1 + udp_aging : 1 + src_ipv6 : [0x2001,0x0232,0x1002,0x0051,0x0000,0x0000] + dst_ipv6 : [0x3001,0x0DB8,0x0003,0x0004,0x0000,0x0000] + mac : [0x0,0x0,0x0,0x1,0x0,0x00] + vlan : { enable : 1 , vlan0 : 100 , vlan1 : 200 } + cap_info : + - name: cap2/ipv6.pcap + cps : 10.0 + ipg : 10000 + rtt : 10000 + w : 4 + limit : 20 diff --git a/scripts/cap2/ipv6_vlan.yaml b/scripts/cap2/ipv6_vlan.yaml deleted file mode 100755 index bb91a4f8..00000000 --- a/scripts/cap2/ipv6_vlan.yaml +++ /dev/null @@ -1,23 +0,0 @@ -- duration : 10 - generator : - distribution : "seq" - clients_start : "16.0.0.1" - clients_end : "16.0.1.255" - servers_start : "48.0.0.1" - servers_end : "48.0.0.255" - clients_per_gb : 201 - min_clients : 101 - dual_port_mask : "1.0.0.0" - tcp_aging : 1 - udp_aging : 1 - src_ipv6 : [0x2001,0x0232,0x1002,0x0051,0x0000,0x0000] - dst_ipv6 : [0x3001,0x0DB8,0x0003,0x0004,0x0000,0x0000] - mac : [0x0,0x0,0x0,0x1,0x0,0x00] - vlan : { enable : 1 , vlan0 : 100 , vlan1 : 200 } - cap_info : - - name: cap2/ipv6.pcap - cps : 10.0 - ipg : 10000 - rtt : 10000 - w : 4 - limit : 20 diff --git a/scripts/cap2/jumbo.yaml b/scripts/cap2/jumbo.yaml index b45a6ca3..901e6189 100644 --- a/scripts/cap2/jumbo.yaml +++ b/scripts/cap2/jumbo.yaml @@ -11,8 +11,6 @@ tcp_aging : 1 udp_aging : 1 mac : [0x00,0x00,0x00,0x01,0x00,0x00] - #vlan : { enable : 1 , vlan0 : 100 , vlan1 : 200 } - #mac_override_by_ip : true cap_info : - name: cap2/jumbo.pcap cps : 1.0 diff --git a/scripts/cap2/wrong_ip.yaml b/scripts/cap2/wrong_ip.yaml index 7de3b82d..226b0c5c 100644 --- a/scripts/cap2/wrong_ip.yaml +++ b/scripts/cap2/wrong_ip.yaml @@ -11,8 +11,6 @@ tcp_aging : 1 udp_aging : 1 mac : [0x00,0x00,0x00,0x01,0x00,0x00] - #vlan : { enable : 1 , vlan0 : 100 , vlan1 : 200 } - #mac_override_by_ip : true cap_info : - name: cap2/wrong_ip.pcap cps : 1.0 -- cgit 1.2.3-korg