dataplane fix

Signed-off-by: shivamcandela <shivam.thakur@candelatech.com>
This commit is contained in:
shivamcandela
2021-07-15 13:16:48 +05:30
parent 0ef021e116
commit 07f9b9e0db

View File

@@ -10,7 +10,7 @@ Note: To Run this script gui should be opened with
This script is used to automate running Dataplane tests. You This script is used to automate running Dataplane tests. You
may need to view a Dataplane test configured through the GUI to understand may need to view a Dataplane test configured through the GUI to understand
the options and how best to input data. the options and how best to input data.
./lf_dataplane_test.py --mgr localhost --port 8080 --lf_user lanforge --lf_password lanforge \ ./lf_dataplane_test.py --mgr localhost --port 8080 --lf_user lanforge --lf_password lanforge \
--instance_name dataplane-instance --config_name test_con --upstream 1.1.eth2 \ --instance_name dataplane-instance --config_name test_con --upstream 1.1.eth2 \
--dut linksys-8450 --duration 15s --station 1.1.sta01500 \ --dut linksys-8450 --duration 15s --station 1.1.sta01500 \
@@ -40,7 +40,7 @@ port_sorting: 0
kpi_id: Dataplane Pkt-Size kpi_id: Dataplane Pkt-Size
notes0: ec5211 in bridge mode, wpa2 auth. notes0: ec5211 in bridge mode, wpa2 auth.
bg: 0xE0ECF8 bg: 0xE0ECF8
test_rig: test_rig:
show_scan: 1 show_scan: 1
auto_helper: 0 auto_helper: 0
skip_2: 0 skip_2: 0
@@ -88,7 +88,7 @@ show_1m: 1
pause_iter: 0 pause_iter: 0
outer_loop_atten: 0 outer_loop_atten: 0
show_realtime: 1 show_realtime: 1
operator: operator:
mconn: 1 mconn: 1
mpkt: 1000 mpkt: 1000
tos: 0 tos: 0
@@ -225,7 +225,7 @@ def main():
IMPORTANT: Start lanforge with socket 3990 : ./lfclient.bash -cli-socket 3990 IMPORTANT: Start lanforge with socket 3990 : ./lfclient.bash -cli-socket 3990
lfclient.bash is located in the LANforgeGUI_X.X.X directory lfclient.bash is located in the LANforgeGUI_X.X.X directory
On local or remote system: ./lfclient.bash -cli-socket 3990 -s LF_MGR On local or remote system: ./lfclient.bash -cli-socket 3990 -s LF_MGR
On local system the -s LF_MGR will be local_host if not provided On local system the -s LF_MGR will be local_host if not provided
@@ -245,7 +245,7 @@ def main():
--influx_bucket ben \ --influx_bucket ben \
--influx_tag testbed Ferndale-01 --influx_tag testbed Ferndale-01
Example 2: Example 2:
./lf_dataplane_test.py --json <name>.json ./lf_dataplane_test.py --json <name>.json
@@ -267,7 +267,7 @@ def main():
"upload_speed":"0", "upload_speed":"0",
"raw_line": ["pkts: Custom;60;MTU", "cust_pkt_sz: 88 1200", "directions: DUT Transmit", "traffic_types: UDP", "bandw_options: 20", "spatial_streams: 1"] "raw_line": ["pkts: Custom;60;MTU", "cust_pkt_sz: 88 1200", "directions: DUT Transmit", "traffic_types: UDP", "bandw_options: 20", "spatial_streams: 1"]
} }
Sample <name>.json between using eth1 and station 1.1.sta0002 Sample <name>.json between using eth1 and station 1.1.sta0002
{ {
"mgr":"192.168.0.101", "mgr":"192.168.0.101",
@@ -291,7 +291,8 @@ def main():
cv_add_base_parser(parser) # see cv_test_manager.py cv_add_base_parser(parser) # see cv_test_manager.py
parser.add_argument('--json', help="--json <config.json> json input file", default="") parser.add_argument('--json', help="--json <config.json> json input file", default="")
parser.add_argument('--influx_json', help="--influx_json <influx_config.json> influx config json input file", default="") parser.add_argument('--influx_json', help="--influx_json <influx_config.json> influx config json input file",
default="")
parser.add_argument("-u", "--upstream", type=str, default="", parser.add_argument("-u", "--upstream", type=str, default="",
help="Upstream port for wifi capacity test ex. 1.1.eth2") help="Upstream port for wifi capacity test ex. 1.1.eth2")
parser.add_argument("--station", type=str, default="", parser.add_argument("--station", type=str, default="",
@@ -307,10 +308,11 @@ def main():
help="Specify duration of each traffic run") help="Specify duration of each traffic run")
parser.add_argument("--graph_groups", help="File to save graph_groups to", default=None) parser.add_argument("--graph_groups", help="File to save graph_groups to", default=None)
parser.add_argument("--report_dir", default="") parser.add_argument("--report_dir", default="")
parser.add_argument("--local_lf_report_dir", help="--local_lf_report_dir <where to pull reports to> default '' put where dataplane script run from",default="") parser.add_argument("--local_lf_report_dir",
help="--local_lf_report_dir <where to pull reports to> default '' put where dataplane script run from",
default="")
parser.add_argument("--debug", default=False) parser.add_argument("--debug", default=False)
args = parser.parse_args() args = parser.parse_args()
# use json config file # use json config file
@@ -320,7 +322,7 @@ def main():
json_data = json.load(json_config) json_data = json.load(json_config)
except: except:
print("Error reading {}".format(args.json)) print("Error reading {}".format(args.json))
# json configuation takes presidence to command line # json configuation takes presidence to command line
if "mgr" in json_data: if "mgr" in json_data:
args.mgr = json_data["mgr"] args.mgr = json_data["mgr"]
if "port" in json_data: if "port" in json_data:
@@ -353,7 +355,6 @@ def main():
json_data_tmp = [[x] for x in json_data["raw_line"]] json_data_tmp = [[x] for x in json_data["raw_line"]]
args.raw_line = json_data_tmp args.raw_line = json_data_tmp
# use influx json config file # use influx json config file
if args.influx_json != "": if args.influx_json != "":
try: try:
@@ -361,7 +362,7 @@ def main():
influx_json_data = json.load(influx_json_config) influx_json_data = json.load(influx_json_config)
except: except:
print("Error reading {}".format(args.influx_json)) print("Error reading {}".format(args.influx_json))
# json configuation takes presidence to command line # json configuation takes presidence to command line
# influx DB configuration # influx DB configuration
if "influx_host" in influx_json_data: if "influx_host" in influx_json_data:
args.influx_host = influx_json_data["influx_host"] args.influx_host = influx_json_data["influx_host"]
@@ -376,27 +377,27 @@ def main():
cv_base_adjust_parser(args) cv_base_adjust_parser(args)
CV_Test = DataplaneTest(lf_host = args.mgr, CV_Test = DataplaneTest(lf_host=args.mgr,
lf_port = args.port, lf_port=args.port,
lf_user = args.lf_user, lf_user=args.lf_user,
lf_password = args.lf_password, lf_password=args.lf_password,
instance_name = args.instance_name, instance_name=args.instance_name,
config_name = args.config_name, config_name=args.config_name,
upstream = args.upstream, upstream=args.upstream,
pull_report = args.pull_report, pull_report=args.pull_report,
local_lf_report_dir = args.local_lf_report_dir, local_lf_report_dir=args.local_lf_report_dir,
load_old_cfg = args.load_old_cfg, load_old_cfg=args.load_old_cfg,
download_speed = args.download_speed, download_speed=args.download_speed,
upload_speed = args.upload_speed, upload_speed=args.upload_speed,
duration = args.duration, duration=args.duration,
dut = args.dut, dut=args.dut,
station = args.station, station=args.station,
enables = args.enable, enables=args.enable,
disables = args.disable, disables=args.disable,
raw_lines = args.raw_line, raw_lines=args.raw_line,
raw_lines_file = args.raw_lines_file, raw_lines_file=args.raw_lines_file,
sets = args.set, sets=args.set,
graph_groups = args.graph_groups, graph_groups=args.graph_groups,
test_rig=args.test_rig, test_rig=args.test_rig,
debug=args.debug debug=args.debug
) )