diff options
author | 2016-03-16 11:30:40 +0200 | |
---|---|---|
committer | 2016-03-16 11:31:20 +0200 | |
commit | f803e5b2b997e02f30bf747ce799f42b7aa61c13 (patch) | |
tree | 8c1b92b9d4c3e61fdd55dbe1eff4d7a4b37f9e93 /scripts/stl/hlt | |
parent | 9de939585468e18c6aa57f626530841029bb7e86 (diff) |
FIX: direction for profile
Diffstat (limited to 'scripts/stl/hlt')
-rwxr-xr-x | scripts/stl/hlt/hlt_4vlans.py | 2 | ||||
-rwxr-xr-x | scripts/stl/hlt/hlt_david1.py | 2 | ||||
-rwxr-xr-x | scripts/stl/hlt/hlt_david2.py | 2 | ||||
-rwxr-xr-x | scripts/stl/hlt/hlt_david3.py | 2 | ||||
-rwxr-xr-x | scripts/stl/hlt/hlt_david4.py | 2 | ||||
-rwxr-xr-x | scripts/stl/hlt/hlt_framesize_vm.py | 2 | ||||
-rwxr-xr-x | scripts/stl/hlt/hlt_imix_4rates.py | 2 | ||||
-rwxr-xr-x | scripts/stl/hlt/hlt_imix_default.py | 2 | ||||
-rwxr-xr-x | scripts/stl/hlt/hlt_ip_ranges.py | 2 | ||||
-rwxr-xr-x | scripts/stl/hlt/hlt_ipv6_default.py | 2 | ||||
-rwxr-xr-x | scripts/stl/hlt/hlt_ipv6_ranges.py | 2 | ||||
-rwxr-xr-x | scripts/stl/hlt/hlt_l3_length_vm.py | 2 | ||||
-rwxr-xr-x | scripts/stl/hlt/hlt_mac_ranges.py | 2 | ||||
-rwxr-xr-x | scripts/stl/hlt/hlt_tcp_ranges.py | 2 | ||||
-rwxr-xr-x | scripts/stl/hlt/hlt_udp_inc_dec_len_9k.py | 2 | ||||
-rwxr-xr-x | scripts/stl/hlt/hlt_udp_ports.py | 2 | ||||
-rwxr-xr-x | scripts/stl/hlt/hlt_udp_random_ports.py | 2 | ||||
-rwxr-xr-x | scripts/stl/hlt/hlt_vlan_default.py | 2 | ||||
-rwxr-xr-x | scripts/stl/hlt/hlt_vlans_vm.py | 2 | ||||
-rwxr-xr-x | scripts/stl/hlt/hlt_wentong1.py | 2 | ||||
-rwxr-xr-x | scripts/stl/hlt/hlt_wentong2.py | 2 |
21 files changed, 21 insertions, 21 deletions
diff --git a/scripts/stl/hlt/hlt_4vlans.py b/scripts/stl/hlt/hlt_4vlans.py index f93ffc23..be612e55 100755 --- a/scripts/stl/hlt/hlt_4vlans.py +++ b/scripts/stl/hlt/hlt_4vlans.py @@ -7,7 +7,7 @@ class STLS1(object): Missing values will be filled with defaults ''' - def get_streams (self, direction = 0): + def get_streams (self, direction = 0, **kwargs): return STLHltStream(frame_size = 100, vlan_id = [1, 2, 3, 4], # can be either array or string separated by spaces vlan_protocol_tag_id = '8100 0x8100', # hex with optional prefix '0x' diff --git a/scripts/stl/hlt/hlt_david1.py b/scripts/stl/hlt/hlt_david1.py index 312c8971..bac8a09e 100755 --- a/scripts/stl/hlt/hlt_david1.py +++ b/scripts/stl/hlt/hlt_david1.py @@ -7,7 +7,7 @@ class STLS1(object): Creates 3 streams (imix) Eth/802.1Q/IP/TCP without VM ''' - def get_streams (self, direction = 0): + def get_streams (self, direction = 0, **kwargs): #''' return STLHltStream( #enable_auto_detect_instrumentation = '1', # not supported yet diff --git a/scripts/stl/hlt/hlt_david2.py b/scripts/stl/hlt/hlt_david2.py index af40c2ae..1fc7b84d 100755 --- a/scripts/stl/hlt/hlt_david2.py +++ b/scripts/stl/hlt/hlt_david2.py @@ -7,7 +7,7 @@ class STLS1(object): Creates 3 streams (imix) Eth/802.1Q/IP/TCP without VM ''' - def get_streams (self, direction = 0): + def get_streams (self, direction = 0, **kwargs): return STLHltStream( #enable_auto_detect_instrumentation = '1', # not supported yet ip_dst_addr = '192.168.3.3', diff --git a/scripts/stl/hlt/hlt_david3.py b/scripts/stl/hlt/hlt_david3.py index 7b5442a3..6192a7df 100755 --- a/scripts/stl/hlt/hlt_david3.py +++ b/scripts/stl/hlt/hlt_david3.py @@ -7,7 +7,7 @@ class STLS1(object): Creates Eth/802.1Q/802.1Q/IP/TCP stream ''' - def get_streams (self, direction = 0): + def get_streams (self, direction = 0, **kwargs): return STLHltStream( l3_protocol = 'ipv4', ip_src_addr = '100.1.1.1', diff --git a/scripts/stl/hlt/hlt_david4.py b/scripts/stl/hlt/hlt_david4.py index 2f88b329..9e5d3eab 100755 --- a/scripts/stl/hlt/hlt_david4.py +++ b/scripts/stl/hlt/hlt_david4.py @@ -10,7 +10,7 @@ class STLS1(object): MAC dst will have <mac_dst_count> number of incremental values ''' - def get_streams (self, direction = 0): + def get_streams (self, direction = 0, **kwargs): mac_dst_count = 10 mac_src_count = 10 pkts_per_burst = 10 diff --git a/scripts/stl/hlt/hlt_framesize_vm.py b/scripts/stl/hlt/hlt_framesize_vm.py index 5653e435..54ac41a0 100755 --- a/scripts/stl/hlt/hlt_framesize_vm.py +++ b/scripts/stl/hlt/hlt_framesize_vm.py @@ -6,7 +6,7 @@ class STLS1(object): Two Eth/IP/UDP streams with VM to get different size of packet by frame_size ''' - def get_streams (self, direction = 0): + def get_streams (self, direction = 0, **kwargs): return [STLHltStream(length_mode = 'increment', frame_size_min = 100, frame_size_max = 3000, diff --git a/scripts/stl/hlt/hlt_imix_4rates.py b/scripts/stl/hlt/hlt_imix_4rates.py index 5b55d641..2764866b 100755 --- a/scripts/stl/hlt/hlt_imix_4rates.py +++ b/scripts/stl/hlt/hlt_imix_4rates.py @@ -7,7 +7,7 @@ class STLS1(object): Each stream will get rate_pps * his ratio / sum of ratios ''' - def get_streams (self, direction = 0): + def get_streams (self, direction = 0, **kwargs): return STLHltStream(length_mode = 'imix', rate_pps = 2, l3_imix1_size = 60, l3_imix1_ratio = 4, l3_imix2_size = 400, l3_imix2_ratio = 3, diff --git a/scripts/stl/hlt/hlt_imix_default.py b/scripts/stl/hlt/hlt_imix_default.py index 3871924b..607077b5 100755 --- a/scripts/stl/hlt/hlt_imix_default.py +++ b/scripts/stl/hlt/hlt_imix_default.py @@ -3,7 +3,7 @@ from trex_stl_lib.trex_stl_hltapi import STLHltStream class STLS1(object): - def get_streams (self, direction = 0): + def get_streams (self, direction = 0, **kwargs): return STLHltStream(length_mode = 'imix', rate_pps = 2, l3_protocol = 'ipv4', l4_protocol = 'udp') diff --git a/scripts/stl/hlt/hlt_ip_ranges.py b/scripts/stl/hlt/hlt_ip_ranges.py index 3b6a0407..7679e09e 100755 --- a/scripts/stl/hlt/hlt_ip_ranges.py +++ b/scripts/stl/hlt/hlt_ip_ranges.py @@ -6,7 +6,7 @@ class STLS1(object): Eth/IP/TCP stream with VM to get different ip addresses ''' - def get_streams (self, direction = 0): + def get_streams (self, direction = 0, **kwargs): return STLHltStream(split_by_cores = 'duplicate', l3_protocol = 'ipv4', ip_src_addr = '192.168.1.1', diff --git a/scripts/stl/hlt/hlt_ipv6_default.py b/scripts/stl/hlt/hlt_ipv6_default.py index f90e7157..2f6264d9 100755 --- a/scripts/stl/hlt/hlt_ipv6_default.py +++ b/scripts/stl/hlt/hlt_ipv6_default.py @@ -6,7 +6,7 @@ class STLS1(object): Eth/IPv6/UDP stream without VM, default values ''' - def get_streams (self, direction = 0): + def get_streams (self, direction = 0, **kwargs): return [STLHltStream(l3_protocol = 'ipv6', l3_length = 150, l4_protocol = 'udp', diff --git a/scripts/stl/hlt/hlt_ipv6_ranges.py b/scripts/stl/hlt/hlt_ipv6_ranges.py index f9a83b55..b50cc481 100755 --- a/scripts/stl/hlt/hlt_ipv6_ranges.py +++ b/scripts/stl/hlt/hlt_ipv6_ranges.py @@ -6,7 +6,7 @@ class STLS1(object): Eth/IPv6/UDP stream with VM, to change the ipv6 addr (only 32 lsb) ''' - def get_streams (self, direction = 0): + def get_streams (self, direction = 0, **kwargs): return STLHltStream(l3_protocol = 'ipv6', l3_length = 150, l4_protocol = 'udp', ipv6_src_addr = '1111:2222:3333:4444:5555:6666:7777:8888', ipv6_dst_addr = '1111:1111:1111:1111:1111:1111:1111:1111', diff --git a/scripts/stl/hlt/hlt_l3_length_vm.py b/scripts/stl/hlt/hlt_l3_length_vm.py index 7b04fbec..bf22f120 100755 --- a/scripts/stl/hlt/hlt_l3_length_vm.py +++ b/scripts/stl/hlt/hlt_l3_length_vm.py @@ -6,7 +6,7 @@ class STLS1(object): Two Eth/IP/UDP streams with VM to get different size of packet by l3_length ''' - def get_streams (self, direction = 0): + def get_streams (self, direction = 0, **kwargs): return [STLHltStream(length_mode = 'increment', l3_length_min = 100, l3_length_max = 3000, diff --git a/scripts/stl/hlt/hlt_mac_ranges.py b/scripts/stl/hlt/hlt_mac_ranges.py index e6c4f0a4..2ede1c48 100755 --- a/scripts/stl/hlt/hlt_mac_ranges.py +++ b/scripts/stl/hlt/hlt_mac_ranges.py @@ -6,7 +6,7 @@ class STLS1(object): Eth/IP/UDP stream with VM, to change the MAC addr (only 32 lsb) ''' - def get_streams (self, direction = 0): + def get_streams (self, direction = 0, **kwargs): return STLHltStream(l3_protocol = 'ipv4', l4_protocol = 'udp', mac_src = '10:00:00:00:00:01', mac_dst = '10:00:00:00:01:00', mac_src2 = '11:11:00:00:00:01', mac_dst2 = '11:11:00:00:01:00', diff --git a/scripts/stl/hlt/hlt_tcp_ranges.py b/scripts/stl/hlt/hlt_tcp_ranges.py index c29b707d..e2045333 100755 --- a/scripts/stl/hlt/hlt_tcp_ranges.py +++ b/scripts/stl/hlt/hlt_tcp_ranges.py @@ -6,7 +6,7 @@ class STLS1(object): Eth/IP/TCP stream with VM to get 10 different TCP ports ''' - def get_streams (self, direction = 0): + def get_streams (self, direction = 0, **kwargs): return STLHltStream(l3_protocol = 'ipv4', l4_protocol = 'tcp', tcp_src_port_mode = 'decrement', diff --git a/scripts/stl/hlt/hlt_udp_inc_dec_len_9k.py b/scripts/stl/hlt/hlt_udp_inc_dec_len_9k.py index 10c778e1..711ced3d 100755 --- a/scripts/stl/hlt/hlt_udp_inc_dec_len_9k.py +++ b/scripts/stl/hlt/hlt_udp_inc_dec_len_9k.py @@ -8,7 +8,7 @@ class STLS1(object): Seconds stream will decrease the packet size in reverse way ''' - def get_streams (self, direction = 0): + def get_streams (self, direction = 0, **kwargs): max_size = 9*1024 return [STLHltStream(length_mode = 'increment', frame_size_max = max_size, diff --git a/scripts/stl/hlt/hlt_udp_ports.py b/scripts/stl/hlt/hlt_udp_ports.py index 9e551b94..52b49ad3 100755 --- a/scripts/stl/hlt/hlt_udp_ports.py +++ b/scripts/stl/hlt/hlt_udp_ports.py @@ -7,7 +7,7 @@ class STLS1(object): The ports overlap the max and min at very first packets ''' - def get_streams (self, direction = 0): + def get_streams (self, direction = 0, **kwargs): return STLHltStream(l3_protocol = 'ipv4', l4_protocol = 'udp', udp_src_port_mode = 'decrement', diff --git a/scripts/stl/hlt/hlt_udp_random_ports.py b/scripts/stl/hlt/hlt_udp_random_ports.py index 1ba0227d..8fdde418 100755 --- a/scripts/stl/hlt/hlt_udp_random_ports.py +++ b/scripts/stl/hlt/hlt_udp_random_ports.py @@ -7,7 +7,7 @@ class STLS1(object): Using "consistent_random = True" to have same random ports each test ''' - def get_streams (self, direction = 0): + def get_streams (self, direction = 0, **kwargs): return [STLHltStream(l3_protocol = 'ipv4', l4_protocol = 'udp', udp_src_port_mode = 'random', diff --git a/scripts/stl/hlt/hlt_vlan_default.py b/scripts/stl/hlt/hlt_vlan_default.py index ea5c66d1..86851c99 100755 --- a/scripts/stl/hlt/hlt_vlan_default.py +++ b/scripts/stl/hlt/hlt_vlan_default.py @@ -6,7 +6,7 @@ class STLS1(object): Default Eth/802.1Q/IP/TCP stream without VM ''' - def get_streams (self, direction = 0): + def get_streams (self, direction = 0, **kwargs): return STLHltStream(l2_encap = 'ethernet_ii_vlan', l3_protocol = 'ipv4', l4_protocol = 'tcp', direction = direction) diff --git a/scripts/stl/hlt/hlt_vlans_vm.py b/scripts/stl/hlt/hlt_vlans_vm.py index a2ad1023..70bf1aad 100755 --- a/scripts/stl/hlt/hlt_vlans_vm.py +++ b/scripts/stl/hlt/hlt_vlans_vm.py @@ -7,7 +7,7 @@ class STLS1(object): Missing values will be filled with defaults ''' - def get_streams (self, direction = 0): + def get_streams (self, direction = 0, **kwargs): return STLHltStream(frame_size = 100, vlan_id = '1 2 1000 4 5', # 5 vlans vlan_id_mode = 'increment fixed decrement random', # 5th vlan will be default fixed diff --git a/scripts/stl/hlt/hlt_wentong1.py b/scripts/stl/hlt/hlt_wentong1.py index 6016c73a..4cf949ca 100755 --- a/scripts/stl/hlt/hlt_wentong1.py +++ b/scripts/stl/hlt/hlt_wentong1.py @@ -7,7 +7,7 @@ class STLS1(object): Creates Eth/802.1Q/IP/UDP stream with VM on src IP ''' - def get_streams (self, direction = 0): + def get_streams (self, direction = 0, **kwargs): ipv4_address_step = '0.0.1.0' num_of_sessions_per_spoke = 1000 ip_tgen_hub = '190.1.0.1' diff --git a/scripts/stl/hlt/hlt_wentong2.py b/scripts/stl/hlt/hlt_wentong2.py index 82503343..137e57b9 100755 --- a/scripts/stl/hlt/hlt_wentong2.py +++ b/scripts/stl/hlt/hlt_wentong2.py @@ -7,7 +7,7 @@ class STLS1(object): Creates Eth/802.1Q/IPv6/UDP stream without VM (if num_of_sessions_per_spoke is 1) ''' - def get_streams (self, direction = 0): + def get_streams (self, direction = 0, **kwargs): ipv6_tgen_rtr = '2005:0:1::1' num_of_sessions_per_spoke = 1 # in given example is not passed forward, taking default ipv6_address_step = '0:0:0:1:0:0:0:0' |