Merge branch 'master' of github.com:greearb/lanforge-scripts

This commit is contained in:
Matthew Stidham
2020-12-30 17:01:01 -08:00

View File

@@ -21,10 +21,8 @@ class Test1KClients(LFCliBase):
upstream, upstream,
host="localhost", host="localhost",
port=8080, port=8080,
side_a_min_rate=0, side_a_min_rate= 0,side_a_max_rate= 56000,
side_a_max_rate=56000, side_b_min_rate= 0,side_b_max_rate= 56000,
side_b_min_rate=0,
side_b_max_rate=56000,
num_sta_=200, num_sta_=200,
test_duration="30s", test_duration="30s",
_debug_on=True, _debug_on=True,
@@ -67,7 +65,6 @@ class Test1KClients(LFCliBase):
self.cx_profile.side_a_max_bps = side_a_max_rate self.cx_profile.side_a_max_bps = side_a_max_rate
self.cx_profile.side_b_min_bps = side_b_min_rate self.cx_profile.side_b_min_bps = side_b_min_rate
self.cx_profile.side_b_max_bps = side_b_max_rate self.cx_profile.side_b_max_bps = side_b_max_rate
self.station_profile_map = {} self.station_profile_map = {}
def build(self): def build(self):
@@ -215,20 +212,34 @@ def main():
--sta_per_radio 300 --sta_per_radio 300
--test_duration 3m --test_duration 3m
--a_min 1000 --a_min 1000
--side_b_min 1000 --b_min 1000
--side_a_max 0 --a_max 0
--side_b_max 0 --b_max 0
--debug ''' --debug '''
) )
optional = parser.add_argument_group('optional arguments')
required = parser.add_argument_group('required arguments') required_args=None
required.add_argument("--sta_per_radio",type=int,help="number of stations per radio") for group in parser._action_groups:
optional.add_argument("--test_duration",type=int,help="length of test duration") if group.title == "required arguments":
optional.add_argument("--a_min",type=int,help="length of test duration") required_args=group
optional.add_argument("--b_min",type=int,help="length of test duration") break
optional.add_argument("--b_max",type=int,help="length of test duration")
optional.add_argument("--a_max",type=int,help="length of test duration") if required_args is not None:
optional.add_argument('-u', '--upstream_port',help='non-station port that generates traffic: <resource>.<port>, e.g: 1.eth1',default='1.eth1') required_args.add_argument("--sta_per_radio",type=int,help="number of stations per radio")
optional_args=None
for group in parser._action_groups:
if group.title == "optional arguments":
optional_args=group
break
if optional_args is not None:
optional_args.add_argument('--a_min', help='--a_min bps rate minimum for side_a', default=0)
optional_args.add_argument('--b_min', help='--b_min bps rate minimum for side_b', default=0)
optional_args.add_argument('--a_max', help='--a_min bps rate minimum for side_a', default=256000)
optional_args.add_argument('--b_max', help='--b_min bps rate minimum for side_b', default=256000)
optional_args.add_argument('--test_duration', help='--test_duration sets the duration of the test', default="2m")
optional_args.add_argument('-u', '--upstream_port',help='non-station port that generates traffic: <resource>.<port>, e.g: 1.eth1',default='1.eth1')
args = parser.parse_args() args = parser.parse_args()