diff --git a/py-scripts/csv_to_grafana.py b/py-scripts/csv_to_grafana.py index c04134cf..5399d4a9 100755 --- a/py-scripts/csv_to_grafana.py +++ b/py-scripts/csv_to_grafana.py @@ -14,7 +14,7 @@ if 'py-json' not in sys.path: from LANforge.lfcli_base import LFCliBase import json -from influx2 import RecordInflux +from InfluxRequest import RecordInflux from csv_to_influx import CSVtoInflux, influx_add_parser_args from grafana_profile import UseGrafana import random diff --git a/py-scripts/csv_to_influx.py b/py-scripts/csv_to_influx.py new file mode 100755 index 00000000..35c9666f --- /dev/null +++ b/py-scripts/csv_to_influx.py @@ -0,0 +1,59 @@ +#!/usr/bin/env python3 + + +import sys +import os + +if 'py-dashboard' not in sys.path: + sys.path.append(os.path.join(os.path.abspath('..'), 'py-dashboard')) + +from InfluxRequest import * +from cv_test_manager import * +from pathlib import Path +import argparse + + +class CSVtoInflux: + def __init__(self, + influx_host, + influx_port, + influx_org, + influx_token, + influx_bucket, + path): + self.path = path + self.influxdb = RecordInflux(_influx_host=influx_host, + _influx_port=influx_port, + _influx_org=influx_org, + _influx_token=influx_token, + _influx_bucket=influx_bucket) + + def glob(self): + path = Path(self.path) + self.kpi_list = list(path.glob('**/kpi.csv')) + for kpi in self.kpi_list: + self.influxdb.RecordInflux.csv_to_influx(kpi) + + +def main(): + parser = argparse.ArgumentParser() + cv_add_base_parser(parser) + + parser.add_argument('--path', append=True) + + args = parser.parse_args() + + cv_base_adjust_parser(args) + + csvtoinflux = CSVtoInflux(args.influx_host, + args.influx_port, + args.influx_org, + args.influx_token, + args.influx_bucket, + args.path) + + csvtoinflux.glob() + + +if __name__ == "__main__": + main() diff --git a/py-scripts/recordinflux.py b/py-scripts/recordinflux.py index 2e4921e4..cfee0a09 100755 --- a/py-scripts/recordinflux.py +++ b/py-scripts/recordinflux.py @@ -20,6 +20,9 @@ if sys.version_info[0] != 3: if 'py-json' not in sys.path: sys.path.append(os.path.join(os.path.abspath('..'), 'py-json')) +if 'py-dashboard' not in sys.path: + sys.path.append(os.path.join(os.path.abspath('..'), 'py-dashboard')) + from LANforge.lfcli_base import LFCliBase import argparse @@ -58,7 +61,7 @@ def main(): tags = dict() tags['script'] = 'recordinflux' if args.influx_user is None: - from influx2 import RecordInflux + from InfluxRequest import RecordInflux grapher = RecordInflux(_influx_host=args.mgr, _influx_port=args.influx_port, _influx_bucket=args.influx_db, diff --git a/py-scripts/tools/ct_id_102.json b/py-scripts/sandbox/ct_id_102.json similarity index 100% rename from py-scripts/tools/ct_id_102.json rename to py-scripts/sandbox/ct_id_102.json diff --git a/py-scripts/tools/ct_test_lf_check.json b/py-scripts/sandbox/ct_test_lf_check.json similarity index 100% rename from py-scripts/tools/ct_test_lf_check.json rename to py-scripts/sandbox/ct_test_lf_check.json diff --git a/py-scripts/tools/ct_us_001_igg.json b/py-scripts/sandbox/ct_us_001_igg.json similarity index 100% rename from py-scripts/tools/ct_us_001_igg.json rename to py-scripts/sandbox/ct_us_001_igg.json diff --git a/py-scripts/tools/ct_us_001_rig.json b/py-scripts/sandbox/ct_us_001_rig.json similarity index 100% rename from py-scripts/tools/ct_us_001_rig.json rename to py-scripts/sandbox/ct_us_001_rig.json diff --git a/py-scripts/tools/lf_check.json b/py-scripts/scripts_deprecated/lf_check.json similarity index 100% rename from py-scripts/tools/lf_check.json rename to py-scripts/scripts_deprecated/lf_check.json diff --git a/py-scripts/tools/lf_check_ct_us_001.json b/py-scripts/scripts_deprecated/lf_check_ct_us_001.json similarity index 100% rename from py-scripts/tools/lf_check_ct_us_001.json rename to py-scripts/scripts_deprecated/lf_check_ct_us_001.json diff --git a/py-scripts/test_ip_variable_time.py b/py-scripts/test_ip_variable_time.py index 6507dfb5..3eef1e0f 100755 --- a/py-scripts/test_ip_variable_time.py +++ b/py-scripts/test_ip_variable_time.py @@ -35,10 +35,12 @@ if sys.version_info[0] != 3: if 'py-json' not in sys.path: sys.path.append(os.path.join(os.path.abspath('..'), 'py-json')) +if 'py-dashboard' not in sys.path: + sys.path.append(os.path.join(os.path.abspath('..'), 'py-dashboard')) + import argparse from LANforge import LFUtils from realm import Realm -import time import datetime @@ -471,7 +473,7 @@ python3 ./test_ip_variable_time.py # manager = args.influx_mgr if args.influx_org is not None: - from influx2 import RecordInflux + from InfluxRequest import RecordInflux grapher = RecordInflux(_influx_host=args.influx_host, _influx_port=args.influx_port, _influx_org=args.influx_org, diff --git a/py-scripts/test_l3_longevity.py b/py-scripts/test_l3_longevity.py index 0b65d716..7cb0f6be 100755 --- a/py-scripts/test_l3_longevity.py +++ b/py-scripts/test_l3_longevity.py @@ -1366,7 +1366,7 @@ python3 .\\test_l3_longevity.py --test_duration 4m --endp_type \"lf_tcp lf_udp m influxdb = None if args.influx_bucket is not None: - from influx2 import RecordInflux + from InfluxRequest import RecordInflux influxdb = RecordInflux(_influx_host=args.influx_host, _influx_port=args.influx_port, _influx_org=args.influx_org, diff --git a/py-scripts/tools/ct_001_igg.json b/py-scripts/tools/ct_001_igg.json new file mode 100644 index 00000000..87bf3224 --- /dev/null +++ b/py-scripts/tools/ct_001_igg.json @@ -0,0 +1,39 @@ +{ + "ct_igg":{ + "Notes":[ + "This json file is used as an input to the ./lf_check.py file", + "The variables that are all capitalized below are replaced with configuration", + "from the json file. so LF_MGR_IP in the test below is replaced by the json lf_mgr_ip", + "The replacement is loosely coupled so the upper and lower case convention is used", + "to identify replaced strings in the lf_check.py code.", + "this file contains the Influx, Grafana and Ghost configuration", + "Influx, Ghost, and Grafana are up and running on v-centos8s 192.168.100.153" + ] + }, + "test_database":{ + "database_config": "True", + "database_host": "192.168.100.153", + "database_port": "8086", + "database_token": "PwYwrDjUSpLyUa8-0QeJGuf9p6KgPgmTVs0Zz0BZiyele74pNasBMJR-dKiF3LE8Qft5tADHtPSIS0WcVXHc_g==", + "database_org": "Candela", + "database_bucket": "candela", + "database_tag": "testbed CT-US-001", + "test_rig": "CT-US-001" + }, + "test_dashboard":{ + "dashboard_config": "True", + "dashboard_host": "192.168.100.153", + "dashboard_token": "eyJrIjoid1hpM0pwZFRSc3c0bGU2TEpITEVscHh4T0pPMVdZRzEiLCJuIjoiY2h1Y2siLCJpZCI6MX0=" + }, + "test_blog":{ + "blog_config": "True", + "blog_host": "192.168.100.153", + "blog_token": "60df4b0175953f400cd30650:d50e1fabf9a9b5d3d30fe97bc3bf04971d05496a89e92a169a0d72357c81f742", + "blog_authors": "Matthew", + "blog_customer": "candela", + "blog_user_push": "lanforge", + "blog_password_push": "lanforge", + "blog_flag": "--kpi_to_ghost" + } +} + \ No newline at end of file diff --git a/py-scripts/tools/ct_002_igg.json b/py-scripts/tools/ct_002_igg.json new file mode 100644 index 00000000..f2a725e9 --- /dev/null +++ b/py-scripts/tools/ct_002_igg.json @@ -0,0 +1,38 @@ +{ + "ct_igg":{ + "Notes":[ + "This json file is used as an input to the ./lf_check.py file", + "The variables that are all capitalized below are replaced with configuration", + "from the json file. so LF_MGR_IP in the test below is replaced by the json lf_mgr_ip", + "The replacement is loosely coupled so the upper and lower case convention is used", + "to identify replaced strings in the lf_check.py code.", + "this file contains the Influx, Grafana and Ghost configuration", + "Influx, Ghost, and Grafana are up and running on v-centos8s 192.168.100.153" + ] + }, + "test_database":{ + "database_config": "True", + "database_host": "192.168.100.153", + "database_port": "8086", + "database_token": "PwYwrDjUSpLyUa8-0QeJGuf9p6KgPgmTVs0Zz0BZiyele74pNasBMJR-dKiF3LE8Qft5tADHtPSIS0WcVXHc_g==", + "database_org": "Candela", + "database_bucket": "candela", + "database_tag": "testbed CT-US-002", + "test_rig": "CT-US-002" + }, + "test_dashboard":{ + "dashboard_config": "True", + "dashboard_host": "192.168.100.153", + "dashboard_token": "eyJrIjoid1hpM0pwZFRSc3c0bGU2TEpITEVscHh4T0pPMVdZRzEiLCJuIjoiY2h1Y2siLCJpZCI6MX0=" + }, + "test_blog":{ + "blog_config": "True", + "blog_host": "192.168.100.153", + "blog_token": "60df4b0175953f400cd30650:d50e1fabf9a9b5d3d30fe97bc3bf04971d05496a89e92a169a0d72357c81f742", + "blog_authors": "Matthew", + "blog_customer": "candela", + "blog_user_push": "lanforge", + "blog_password_push": "lanforge", + "blog_flag": "--kpi_to_ghost" + } +} \ No newline at end of file diff --git a/py-scripts/tools/ct_004_igg.json b/py-scripts/tools/ct_004_igg.json new file mode 100644 index 00000000..afdfaebe --- /dev/null +++ b/py-scripts/tools/ct_004_igg.json @@ -0,0 +1,39 @@ +{ + "ct_igg":{ + "Notes":[ + "This json file is used as an input to the ./lf_check.py file", + "The variables that are all capitalized below are replaced with configuration", + "from the json file. so LF_MGR_IP in the test below is replaced by the json lf_mgr_ip", + "The replacement is loosely coupled so the upper and lower case convention is used", + "to identify replaced strings in the lf_check.py code.", + "this file contains the Influx, Grafana and Ghost configuration", + "Influx, Ghost, and Grafana are up and running on v-centos8s 192.168.100.153" + ] + }, + "test_database":{ + "database_config": "True", + "database_host": "192.168.100.153", + "database_port": "8086", + "database_token": "PwYwrDjUSpLyUa8-0QeJGuf9p6KgPgmTVs0Zz0BZiyele74pNasBMJR-dKiF3LE8Qft5tADHtPSIS0WcVXHc_g==", + "database_org": "Candela", + "database_bucket": "candela", + "database_tag": "testbed CT-US-004", + "test_rig": "CT-US-004" + }, + "test_dashboard":{ + "dashboard_config": "True", + "dashboard_host": "192.168.100.153", + "dashboard_token": "eyJrIjoid1hpM0pwZFRSc3c0bGU2TEpITEVscHh4T0pPMVdZRzEiLCJuIjoiY2h1Y2siLCJpZCI6MX0=" + }, + "test_blog":{ + "blog_config": "True", + "blog_host": "192.168.100.153", + "blog_token": "60df4b0175953f400cd30650:d50e1fabf9a9b5d3d30fe97bc3bf04971d05496a89e92a169a0d72357c81f742", + "blog_authors": "Matthew", + "blog_customer": "candela", + "blog_user_push": "lanforge", + "blog_password_push": "lanforge", + "blog_flag": "--kpi_to_ghost" + } +} + \ No newline at end of file diff --git a/py-scripts/tools/ct_igg.json b/py-scripts/tools/ct_igg.json index f0ab064d..87bf3224 100644 --- a/py-scripts/tools/ct_igg.json +++ b/py-scripts/tools/ct_igg.json @@ -14,7 +14,7 @@ "database_config": "True", "database_host": "192.168.100.153", "database_port": "8086", - "database_token": "XpHtoEFNEPixL6kXjgR4ct_Wj6ake3z-2qruGELU2sSd0_4Sghw5nv5mmsm005TU-q6S8PhTaqzJ0Nz7_bn3Yg==", + "database_token": "PwYwrDjUSpLyUa8-0QeJGuf9p6KgPgmTVs0Zz0BZiyele74pNasBMJR-dKiF3LE8Qft5tADHtPSIS0WcVXHc_g==", "database_org": "Candela", "database_bucket": "candela", "database_tag": "testbed CT-US-001", diff --git a/py-scripts/tools/ct_us_001.json b/py-scripts/tools/ct_us_001.json index 1006076c..b46be16e 100644 --- a/py-scripts/tools/ct_us_001.json +++ b/py-scripts/tools/ct_us_001.json @@ -12,6 +12,7 @@ "test_parameters":{ "test_bed": "CT-US-001", "test_rig": "CT-US-001", + "database_tag": "testbed CT-US-001", "lf_mgr_ip": "192.168.100.116", "lf_mgr_port": "8080", "dut_set_name": "DUT_NAME ASUSRT-AX88U", @@ -19,15 +20,15 @@ "dut_bssid_2g": "3c:7c:3f:55:4d:60", "dut_bssid_5g": "3c:7c:3f:55:4d:64", "dut_sw": "3.0.0.4.386_44266", - "test_timeout": 300, + "test_timeout": 600, "load_blank_db": false, "load_factory_default_db": true, "load_custom_db": false, "custom_db": "DFLT_ETH1_GEN", - "email_list_production": "konikofi@candelatech.com,greearb@candelatech.com,logan.lipke@candelatech.com,dipti.dhond@candelatech.com,chuck.rekiere@candelatech.com,matthew@candelatech.com,iain.davidson@candelatech.com,jreynolds@candelatech.com", - "host_ip_production": "192.168.100.201", + "email_list_production": "konikofi@candelatech.com,greearb@candelatech.com,erin.grimes@candelatech.com,logan.lipke@candelatech.com,dipti.dhond@candelatech.com,chuck.rekiere@candelatech.com,matthew@candelatech.com,iain.davidson@candelatech.com,jreynolds@candelatech.com", + "host_ip_production": "192.168.100.153", "email_list_test": "chuck.rekiere@candelatech.com", - "host_ip_test": "192.168.100.201", + "host_ip_test": "192.168.100.153", "email_title_txt": "Lanforge QA Testing CT-US-001", "email_txt": "Lanforge QA Testing CT-US-001 " }, diff --git a/py-scripts/tools/ct_us_001_tests.json b/py-scripts/tools/ct_us_001_tests.json index 5aef9223..a226d32f 100644 --- a/py-scripts/tools/ct_us_001_tests.json +++ b/py-scripts/tools/ct_us_001_tests.json @@ -37,83 +37,6 @@ ] } }, - "suite_wc_dp_mt":{ - "CT-US-001_create_chamberview_dut_0":{ - "enabled":"TRUE", - "load_db":"skip", - "command":"create_chamberview_dut.py", - "args":"", - "args_list":[ - " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name DUT_NAME", - " --ssid 'ssid_idx=0 ssid=asus11ax-5 security=WPA2 password=hello123 bssid=DUT_BSSID_5G'", - " --ssid 'ssid_idx=1 ssid=asus11ax-5 security=WPA2 password=hello123 bssid=DUT_BSSID_5G'", - " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" - ] - }, - "CT-US-001_create_chamberview_mt7915e_sta19":{ - "enabled":"TRUE", - "load_db":"skip", - "command":"create_chamberview.py", - "args":"", - "args_list":[ - " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", - " --create_scenario ct-us-001-scenario ", - " --raw_line \"profile_link 1.1 STA-AC 19 'DUT: DUT_NAME Radio-1' NA wiphy7,AUTO -1 NA\" ", - " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\"" - ] - }, - "CT-US-001_wifi_capacity_mt7915e":{ - "enabled":"TRUE", - "timeout":"600", - "load_db":"skip", - "command":"lf_wifi_capacity_test.py", - "args":"", - "args_list":[ - " --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user lanforge --lf_password lanforge --instance_name cicd-wct", - " --upstream 1.1.eth2 --batch_size 1,5,25 --loop_iter 1 --protocol UDP-IPv4 --duration 6000", - " --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'mt7915e'", - " --test_rig TEST_RIG", - " --set DUT_SET_NAME" - ] - }, - "CT-US-001_create_chamberview_mt7915e_sta1":{ - "enabled":"TRUE", - "load_db":"skip", - "command":"create_chamberview.py", - "args":"", - "args_list":[ - " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", - " --create_scenario ct-us-001-scenario ", - " --raw_line \"profile_link 1.1 STA-AC 1 'DUT: DUT_NAME Radio-1' NA wiphy7,AUTO -1 NA\" ", - " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\"" - ] - }, - "CT-US-001_dataplane_ATH10K_mt7915e_sta1":{ - "enabled":"TRUE", - "load_db":"skip", - "command":"lf_dataplane_test.py", - "args":"", - "args_list":[ - " --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user lanforge --lf_password lanforge --instance_name cicd-dpt", - " --config_name test_con --upstream 1.1.eth2 --dut asus_5g --duration 30s --station 1.1.wlan7", - " --download_speed 85% --upload_speed 0 --raw_line 'pkts: 60;88;120;256;512;1024;MTU' ", - " --raw_line 'directions: DUT Transmit' --raw_line 'traffic_types: UDP' --raw_line 'bandw_options: AUTO'", - " --raw_line 'spatial_streams: AUTO' --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'mt7915e' ", - " --test_rig TEST_RIG --set 'DUT_NAME" - ] - }, - "CT-US-001_QA":{ - "enabled":"TRUE", - "timeout":"600", - "load_db":"skip", - "command":"./tools/lf_qa.py", - "args":"", - "args_list":[ - " --path REPORT_PATH --store --png --database ./tools/qa_test_db" - ] - } - - }, "suite_wc_dp_shorter":{ "CT-US-001_create_chamberview_dut_0":{ "enabled":"TRUE", @@ -292,7 +215,9 @@ " --upstream 1.1.eth2 --batch_size 1,5,25 --loop_iter 1 --protocol UDP-IPv4 --duration 6000", " --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'ATH10K(9984)'", " --test_rig TEST_RIG ", - " --set DUT_SET_NAME" + " --set DUT_SET_NAME", + " --test_rig TEST_RIG --influx_host DATABASE_HOST --influx_port DATABASE_PORT --influx_org DATABASE_ORG", + " --influx_token=DATABASE_TOKEN --influx_bucket DATABASE_BUCKET --influx_tag DATABASE_TAG" ] }, "CT-US-001_create_chamberview_ATH10K(9984)_sta1":{ @@ -322,7 +247,9 @@ " --raw_line 'directions: DUT Transmit' --raw_line 'traffic_types: UDP' --raw_line 'bandw_options: AUTO'", " --raw_line 'spatial_streams: AUTO' --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'ATH10K(9984)' ", " --test_rig TEST_RIG", - " --set DUT_SET_NAME" + " --set DUT_SET_NAME", + " --test_rig TEST_RIG --influx_host DATABASE_HOST --influx_port DATABASE_PORT --influx_org DATABASE_ORG", + " --influx_token=DATABASE_TOKEN --influx_bucket DATABASE_BUCKET --influx_tag DATABASE_TAG" ] }, "CT-US-001_create_chamberview_dut_for_AX210":{ @@ -360,7 +287,9 @@ " --upstream 1.1.eth2 --batch_size 1,5,25 --loop_iter 1 --protocol UDP-IPv4 --duration 6000", " --pull_report --local_lf_report_dir REPORT_PATH --stations 1.1.wlan3 --test_tag 'AX210'", " --test_rig TEST_RIG", - " --set DUT_SET_NAME" + " --set DUT_SET_NAME", + " --test_rig TEST_RIG --influx_host DATABASE_HOST --influx_port DATABASE_PORT --influx_org DATABASE_ORG", + " --influx_token=DATABASE_TOKEN --influx_bucket DATABASE_BUCKET --influx_tag DATABASE_TAG" ] }, "CT-US-001_dataplane_wiphy3_AX210_sta1":{ @@ -376,7 +305,9 @@ " --raw_line 'directions: DUT Transmit' --raw_line 'traffic_types: UDP' --raw_line 'bandw_options: AUTO'", " --raw_line 'spatial_streams: AUTO' --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'AX210'", " --test_rig TEST_RIG", - " --set DUT_SET_NAME" + " --set DUT_SET_NAME", + " --test_rig TEST_RIG --influx_host DATABASE_HOST --influx_port DATABASE_PORT --influx_org DATABASE_ORG", + " --influx_token=DATABASE_TOKEN --influx_bucket DATABASE_BUCKET --influx_tag DATABASE_TAG" ] }, "CT-US-001_create_chamberview_dut_for_mt7915e":{ @@ -415,7 +346,9 @@ " --upstream 1.1.eth2 --batch_size 1,5,10,15,19 --loop_iter 1 --protocol UDP-IPv4 --duration 6000", " --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'mt7915e'", " --test_rig TEST_RIG", - " --set DUT_SET_NAME" + " --set DUT_SET_NAME", + " --test_rig TEST_RIG --influx_host DATABASE_HOST --influx_port DATABASE_PORT --influx_org DATABASE_ORG", + " --influx_token=DATABASE_TOKEN --influx_bucket DATABASE_BUCKET --influx_tag DATABASE_TAG" ] }, "CT-US-001_create_chamberview_mt7915e_sta1":{ @@ -443,7 +376,9 @@ " --raw_line 'directions: DUT Transmit' --raw_line 'traffic_types: UDP' --raw_line 'bandw_options: AUTO'", " --raw_line 'spatial_streams: AUTO' --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'mt7915e' ", " --test_rig TEST_RIG", - " --set DUT_SET_NAME" + " --set DUT_SET_NAME", + " --test_rig TEST_RIG --influx_host DATABASE_HOST --influx_port DATABASE_PORT --influx_org DATABASE_ORG", + " --influx_token=DATABASE_TOKEN --influx_bucket DATABASE_BUCKET --influx_tag DATABASE_TAG" ] }, "CT-US-001_create_chamberview_dut_2":{ @@ -486,7 +421,9 @@ " --set 'Throughput vs Pkt Size' 0 --set 'Capacity' 0 --set 'Band-Steering' 0 --set 'Skip 2.4 Ghz Tests' 1", " --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'ATH10K(9984)'", " --test_rig TEST_RIG", - " --set DUT_SET_NAME" + " --set DUT_SET_NAME", + " --test_rig TEST_RIG --influx_host DATABASE_HOST --influx_port DATABASE_PORT --influx_org DATABASE_ORG", + " --influx_token=DATABASE_TOKEN --influx_bucket DATABASE_BUCKET --influx_tag DATABASE_TAG" ] }, "CT-US-001_QA":{ @@ -498,6 +435,15 @@ "args_list":[ " --path REPORT_PATH --store --png --database ./tools/qa_001_test_db" ] + }, + "GHOST":{"enabled":"TRUE","load_db":"skip","command":"ghost_profile.py","args":"", + "args_list":[ + " --ghost_token BLOG_TOKEN --ghost_host BLOG_HOST --authors BLOG_AUTHORS --customer BLOG_CUSTOMER", + " --user_push BLOG_USER_PUSH --password BLOG_PASSWORD_PUSH BLOG_FLAG --grafana_token DASHBOARD_TOKEN", + " --grafana_host DASHBOARD_HOST --grafana_bucket DATABASE_BUCKET --parent_folder REPORT_PATH", + " --influx_host DATABASE_HOST --influx_org DATABASE_ORG --influx_token=DATABASE_TOKEN --influx_bucket DATABASE_BUCKET", + " --influx_tag DATABASE_TAG " + ] } } diff --git a/py-scripts/tools/ct_us_002.json b/py-scripts/tools/ct_us_002.json index 74fe43e1..26911fa7 100644 --- a/py-scripts/tools/ct_us_002.json +++ b/py-scripts/tools/ct_us_002.json @@ -12,20 +12,22 @@ "test_parameters":{ "test_bed": "CT-US-002", "test_rig": "CT-US-002", + "database_tag": "testbed CT-US-002", "lf_mgr_ip": "192.168.100.200", "lf_mgr_port": "8080", "dut_set_name": "DUT_NAME NETGEAR59-5G", "dut_name": "NETGEAR-AX12", + "dut_bssid_2g": "94:a6:7e:54:d4:31", "dut_bssid_5g": "94:a6:7e:54:d4:33", - "test_timeout": 1200, + "test_timeout": 600, "load_blank_db": false, "load_factory_default_db": true, "load_custom_db": false, "custom_db": "DFLT_ETH1_GEN", - "email_list_production": "konikofi@candelatech.com,greearb@candelatech.com,logan.lipke@candelatech.com,dipti.dhond@candelatech.com,chuck.rekiere@candelatech.com,matthew@candelatech.com,iain.davidson@candelatech.com,jreynolds@candelatech.com", - "host_ip_production": "192.168.100.201", + "email_list_production": "konikofi@candelatech.com,greearb@candelatech.com,erin.grimes@candelatech.com,logan.lipke@candelatech.com,dipti.dhond@candelatech.com,chuck.rekiere@candelatech.com,matthew@candelatech.com,iain.davidson@candelatech.com,jreynolds@candelatech.com", + "host_ip_production": "192.168.100.153", "email_list_test": "chuck.rekiere@candelatech.com", - "host_ip_test": "192.168.100.201", + "host_ip_test": "192.168.100.153", "email_title_txt": "Lanforge QA Testing CT-US-002", "email_txt": "Lanforge QA Testing CT-US-002" }, @@ -43,30 +45,6 @@ "col_names": "name,tx_byptes,rx_bytes,dropped", "upstream_port": "1.1.eth2" }, - "test_database":{ - "database_config": "True", - "database_host": "192.168.100.201", - "database_port": "8086", - "database_token": "-u_Wd-L8o992701QF0c5UmqEp7w7Z7YOMaWLxOMgmHfATJGnQbbmYyNxHBR9PgD6taM_tcxqJl6U8DjU1xINFQ==", - "database_org": "Candela", - "database_bucket": "lanforge_qa_testing", - "database_tag": "testbed CT-US-002" - }, - "test_dashboard":{ - "dashboard_config": "True", - "dashboard_host": "192.168.100.201", - "dashboard_token": "eyJrIjoiS1NGRU8xcTVBQW9lUmlTM2dNRFpqNjFqV05MZkM0dzciLCJuIjoibWF0dGhldyIsImlkIjoxfQ==" - }, - "test_blog":{ - "blog_config": "True", - "blog_host": "192.168.100.153", - "blog_token": "60df4b0175953f400cd30650:d50e1fabf9a9b5d3d30fe97bc3bf04971d05496a89e92a169a0d72357c81f742", - "blog_authors": "Matthew", - "blog_customer": "candela", - "blog_user_push": "lanforge", - "blog_password_push": "lanforge", - "blog_flag": "--kpi_to_ghost" - }, "radio_dict":{ "RADIO_0_CFG":{"KEY":"RADIO_0_CFG","RADIO":"wiphy0","STATIONS":"4","SSID":"NETGEAR59-5G","PASSWD":"crispynest798","SECURITY":"wpa2"}, "RADIO_1_CFG":{"KEY":"RADIO_1_CFG","RADIO":"wiphy1","STATIONS":"4","SSID":"NETGEAR59-5G","PASSWD":"crispynest798","SECURITY":"wpa2"} diff --git a/py-scripts/tools/ct_us_002_tests.json b/py-scripts/tools/ct_us_002_tests.json index d6368cbb..001e9963 100644 --- a/py-scripts/tools/ct_us_002_tests.json +++ b/py-scripts/tools/ct_us_002_tests.json @@ -1,5 +1,29 @@ { "test_suites":{ + "suite_l3":{ + "test_l3_longevity":{ + "enabled":"TRUE", + "load_db":"skip", + "command":"test_l3_longevity.py", + "args":"", + "args_list":[ + " --lfmgr LF_MGR_IP --test_duration 60s --polling_interval 15s --upstream_port eth2 ", + " --radio 'radio==wiphy1,stations==4,ssid==NETGEAR59,ssid_pw==crispynest798,security==wpa2' ", + " --endp_type lf_udp --rates_are_totals --side_a_min_bps=20000 --side_b_min_bps=300000000" + ] + }, + "CT-US-001_QA":{ + "enabled":"TRUE", + "timeout":"600", + "load_db":"skip", + "command":"./tools/lf_qa.py", + "args":"", + "args_list":[ + " --path REPORT_PATH --store --png --database ./tools/qa_001_test_db" + ] + } + }, + "suite_two":{ "test_l3_longevity":{"enabled":"TRUE","command":"test_l3_longevity.py","args":"--test_duration 15s --polling_interval 5s --upstream_port UPSTREAM_PORT --radio 'radio==wiphy1,stations==4,ssid==ct523c-vap,ssid_pw==ct523c-vap,security==wpa2' --endp_type lf_udp --rates_are_totals --side_a_min_bps=20000 --side_b_min_bps=300000000"} }, @@ -11,7 +35,7 @@ "args":"", "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name DUT_NAME", - " --ssid 'ssid_idx=0 ssid=NETGEAR59-5G security=WPA2 password=crispynest798 bssid=DUT_BSSID_5G'", + " --ssid 'ssid_idx=0 ssid=NETGEAR59 security=WPA2 password=crispynest798 bssid=DUT_BSSID_2G'", " --ssid 'ssid_idx=1 ssid=NETGEAR59-5G security=WPA2 password=crispynest798 bssid=DUT_BSSID_5G'", " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" ]}, @@ -42,8 +66,19 @@ " --set 'Multi Band Performance' 0 --set 'Stability' 0 --set 'Multi-Station Throughput vs Pkt Size' 0,", " --set 'Throughput vs Pkt Size' 0 --set 'Capacity' 0 --set 'Band-Steering' 0 --set 'Skip 2.4 Ghz Tests' 1", " --pull_report --local_lf_report_dir REPORT_PATH", + " --set DUT_SET_NAME", " --test_rig TEST_RIG --influx_host DATABASE_HOST --influx_port DATABASE_PORT --influx_org DATABASE_ORG", - " --influx_token=DATABASE_TOKEN --influx_bucket DATABASE_BUCKET --influx_tag DATABASE_TAG --set DUT_SET_NAME" + " --influx_token=DATABASE_TOKEN --influx_bucket DATABASE_BUCKET --influx_tag DATABASE_TAG " + ] + }, + "CT-US-001_QA":{ + "enabled":"TRUE", + "timeout":"600", + "load_db":"skip", + "command":"./tools/lf_qa.py", + "args":"", + "args_list":[ + " --path REPORT_PATH --store --png --database ./tools/qa_001_test_db" ] }, "GHOST":{ @@ -68,7 +103,7 @@ "args":"", "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name DUT_NAME", - " --ssid 'ssid_idx=0 ssid=NETGEAR59-5G security=WPA2 password=crispynest798 bssid=DUT_BSSID_5G'", + " --ssid 'ssid_idx=0 ssid=NETGEAR59 security=WPA2 password=crispynest798 bssid=DUT_BSSID_2G'", " --ssid 'ssid_idx=1 ssid=NETGEAR59-5G security=WPA2 password=crispynest798 bssid=DUT_BSSID_5G'", " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" ]}, @@ -94,7 +129,8 @@ " --upstream UPSTREAM_PORT --batch_size 1,5,25 --loop_iter 1 --protocol UDP-IPv4 --duration 6000", " --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'ATH10K(9984)'", " --test_rig TEST_RIG --influx_host DATABASE_HOST --influx_port DATABASE_PORT --influx_org DATABASE_ORG", - " --influx_token=DATABASE_TOKEN --influx_bucket DATABASE_BUCKET --influx_tag DATABASE_TAG --set DUT_SET_NAME" + " --set DUT_SET_NAME ", + " --influx_token=DATABASE_TOKEN --influx_bucket DATABASE_BUCKET --influx_tag DATABASE_TAG " ] }, "CT-US-002_create_chamberview_dut_ATH10K_wan1":{ @@ -131,8 +167,9 @@ " --download_speed 85% --upload_speed 0 --raw_line 'pkts: 60;88;120;256;512;1024;MTU' ", " --raw_line 'directions: DUT Transmit' --raw_line 'traffic_types: UDP' --raw_line 'bandw_options: 20' ", " --raw_line 'spatial_streams: 4' --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'ATH10K(9984)' ", + " --set DUT_SET_NAME", " --test_rig TEST_RIG --influx_host DATABASE_HOST --influx_port DATABASE_PORT --influx_org DATABASE_ORG", - " --influx_token=DATABASE_TOKEN --influx_bucket DATABASE_BUCKET --influx_tag DATABASE_TAG --set DUT_SET_NAME" + " --influx_token=DATABASE_TOKEN --influx_bucket DATABASE_BUCKET --influx_tag DATABASE_TAG " ] }, "CT-US-002_create_chamberview_dut_2":{ @@ -167,8 +204,9 @@ " --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user lanforge --lf_password lanforge --instance_name cicd-wct", " --upstream UPSTREAM_PORT --batch_size 1,5,25 --loop_iter 1 --protocol UDP-IPv4 --duration 6000", " --pull_report --local_lf_report_dir REPORT_PATH --stations 1.1.wlan4 --test_tag 'ATH10K(9984)' ", + " --set DUT_SET_NAME", " --test_rig TEST_RIG --influx_host DATABASE_HOST --influx_port DATABASE_PORT --influx_org DATABASE_ORG", - " --influx_token=DATABASE_TOKEN --influx_bucket DATABASE_BUCKET --influx_tag DATABASE_TAG --set DUT_SET_NAME" + " --influx_token=DATABASE_TOKEN --influx_bucket DATABASE_BUCKET --influx_tag DATABASE_TAG" ] }, "CT-US-002_create_chamberview_dut_AX200_wan1":{ @@ -205,8 +243,9 @@ " --download_speed 85% --upload_speed 0 --raw_line 'pkts: 60;88;120;256;512;1024;MTU' ", " --raw_line 'directions: DUT Transmit' --raw_line 'traffic_types: UDP' --raw_line 'bandw_options: 20'", " --raw_line 'spatial_streams: 4' --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'AX200'", + " --set DUT_SET_NAME", " --test_rig TEST_RIG --influx_host DATABASE_HOST --influx_port DATABASE_PORT --influx_org DATABASE_ORG", - " --influx_token=DATABASE_TOKEN --influx_bucket DATABASE_BUCKET --influx_tag DATABASE_TAG --set DUT_SET_NAME" + " --influx_token=DATABASE_TOKEN --influx_bucket DATABASE_BUCKET --influx_tag DATABASE_TAG " ] }, "CT-US-002_create_chamberview_dut_auto":{ @@ -247,8 +286,19 @@ " --set 'Multi Band Performance' 0 --set 'Stability' 0 --set 'Multi-Station Throughput vs Pkt Size' 0,", " --set 'Throughput vs Pkt Size' 0 --set 'Capacity' 0 --set 'Band-Steering' 0 --set 'Skip 2.4 Ghz Tests' 1", " --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'AX200'", + " --set DUT_SET_NAME", " --test_rig TEST_RIG --influx_host DATABASE_HOST --influx_port DATABASE_PORT --influx_org DATABASE_ORG", - " --influx_token=DATABASE_TOKEN --influx_bucket DATABASE_BUCKET --influx_tag DATABASE_TAG --set DUT_SET_NAME" + " --influx_token=DATABASE_TOKEN --influx_bucket DATABASE_BUCKET --influx_tag DATABASE_TAG" + ] + }, + "CT-US-001_QA":{ + "enabled":"TRUE", + "timeout":"600", + "load_db":"skip", + "command":"./tools/lf_qa.py", + "args":"", + "args_list":[ + " --path REPORT_PATH --store --png --database ./tools/qa_001_test_db" ] }, "GHOST":{"enabled":"TRUE","load_db":"skip","command":"ghost_profile.py","args":"", diff --git a/py-scripts/tools/ct_us_004.json b/py-scripts/tools/ct_us_004.json index f924b5d5..736f5e28 100644 --- a/py-scripts/tools/ct_us_004.json +++ b/py-scripts/tools/ct_us_004.json @@ -45,30 +45,6 @@ "col_names": "name,tx_byptes,rx_bytes,dropped", "upstream_port": "eth2" }, - "test_database":{ - "database_config": "True", - "database_host": "192.168.100.201", - "database_port": "8086", - "database_token": "-u_Wd-L8o992701QF0c5UmqEp7w7Z7YOMaWLxOMgmHfATJGnQbbmYyNxHBR9PgD6taM_tcxqJl6U8DjU1xINFQ==", - "database_org": "Candela", - "database_bucket": "lanforge_qa_testing", - "database_tag": "testbed CT-US-004" - }, - "test_dashboard":{ - "dashboard_config": "True", - "dashboard_host": "192.168.100.201", - "dashboard_token": "eyJrIjoiS1NGRU8xcTVBQW9lUmlTM2dNRFpqNjFqV05MZkM0dzciLCJuIjoibWF0dGhldyIsImlkIjoxfQ==" - }, - "test_blog":{ - "blog_config": "True", - "blog_host": "192.168.100.153", - "blog_token": "60df4b0175953f400cd30650:d50e1fabf9a9b5d3d30fe97bc3bf04971d05496a89e92a169a0d72357c81f742", - "blog_authors": "Matthew", - "blog_customer": "candela", - "blog_user_push": "lanforge", - "blog_password_push": "lanforge", - "blog_flag": "--kpi_to_ghost" - }, "radio_dict":{ "RADIO_0_CFG":{"KEY":"RADIO_0_CFG","RADIO":"wiphy0","STATIONS":"1","SSID":"asus11ax-5","PASSWD":"hello123","SECURITY":"wpa2"}, "RADIO_1_CFG":{"KEY":"RADIO_1_CFG","RADIO":"wiphy1","STATIONS":"1","SSID":"asus11ax-5","PASSWD":"hello123","SECURITY":"wpa2"} diff --git a/py-scripts/tools/lf_check.py b/py-scripts/tools/lf_check.py index 391bcac2..ebaf7d01 100755 --- a/py-scripts/tools/lf_check.py +++ b/py-scripts/tools/lf_check.py @@ -1178,13 +1178,13 @@ http://{blog}:2368""".format(blog=self.blog_host) Copy {command} - """.format(command=command) - ''' + """.format(command=command)''' self.html_results += f""" - {command} + {command} """.format(command=command) + #nocopy ''' self.html_results += f""" {command} @@ -1369,33 +1369,38 @@ Example : print("lanforge_gui_version exception, tests aborted check lanforge ip") exit(1) - #try: - lanforge_radio_json, lanforge_radio_text = check.get_lanforge_radio_information() - lanforge_radio_formatted_str = json.dumps(lanforge_radio_json, indent = 2) - print("lanforge_radio_json: {lanforge_radio_json}".format(lanforge_radio_json=lanforge_radio_formatted_str)) + try: + lanforge_radio_json, lanforge_radio_text = check.get_lanforge_radio_information() + lanforge_radio_formatted_str = json.dumps(lanforge_radio_json, indent = 2) + print("lanforge_radio_json: {lanforge_radio_json}".format(lanforge_radio_json=lanforge_radio_formatted_str)) - # note put into the meta data - lf_radio_df = pd.DataFrame(columns = ['Radio(entity id)','driver','capabilities','firmware version','max_sta','max_vap','max_vifs']) + # note put into the meta data + lf_radio_df = pd.DataFrame(columns = ['Radio','WIFI-Radio Driver','Radio Capabilities','Firmware Version','max_sta','max_vap','max_vifs']) - for key in lanforge_radio_json: - if 'wiphy' in key: - #print("key {}".format(key)) - #print("lanforge_radio_json[{}]: {}".format(key,lanforge_radio_json[key])) - lf_radio_df = lf_radio_df.append( - {'Radio(entity id)':lanforge_radio_json[key]['entity id'], - 'driver':lanforge_radio_json[key]['driver'], - 'capabilities':lanforge_radio_json[key]['capabilities'], - 'firmware version':lanforge_radio_json[key]['firmware version'], - 'max_sta':lanforge_radio_json[key]['max_sta'], - 'max_vap':lanforge_radio_json[key]['max_vap'], - 'max_vifs':lanforge_radio_json[key]['max_vifs']}, ignore_index = True) - #print("lf_radio_df intermediate {lf_radio_df}".format(lf_radio_df=lf_radio_df)) - print("lf_radio_df:: {lf_radio_df}".format(lf_radio_df=lf_radio_df)) + for key in lanforge_radio_json: + if 'wiphy' in key: + #print("key {}".format(key)) + #print("lanforge_radio_json[{}]: {}".format(key,lanforge_radio_json[key])) + driver = lanforge_radio_json[key]['driver'].split('Driver:',maxsplit=1)[-1].split(maxsplit=1)[0] + try: + firmware_version = lanforge_radio_json[key]['firmware version'] + except: + print("5.4.3 radio fw version not in /radiostatus/all") + firmware_version = "5.4.3 N/A" - #except: - # print("get_lanforge_radio_json excption, no radio data") + lf_radio_df = lf_radio_df.append( + {'Radio':lanforge_radio_json[key]['entity id'], + 'WIFI-Radio Driver': driver, + 'Radio Capabilities':lanforge_radio_json[key]['capabilities'], + 'Firmware Version':firmware_version, + 'max_sta':lanforge_radio_json[key]['max_sta'], + 'max_vap':lanforge_radio_json[key]['max_vap'], + 'max_vifs':lanforge_radio_json[key]['max_vifs']}, ignore_index = True) + print("lf_radio_df:: {lf_radio_df}".format(lf_radio_df=lf_radio_df)) - #check.get_radio_status() + except: + lf_radio_df = pd.DataFrame() + print("get_lanforge_radio_json exception, no radio data") # LANforge and scripts config for results lf_test_setup = pd.DataFrame() @@ -1418,15 +1423,15 @@ Example : report.build_table_title() report.set_table_dataframe(lf_test_setup) report.build_table() + report.set_table_title("LANForge Radios") + report.build_table_title() + report.set_table_dataframe(lf_radio_df) + report.build_table() report.set_table_title("LF Check Test Results") report.build_table_title() html_results = check.get_html_results() report.set_custom_html(html_results) report.build_custom() - report.set_table_title("LANForge Radios") - report.build_table_title() - report.set_table_dataframe(lf_radio_df) - report.build_table() report.build_footer() report.copy_js() html_report = report.write_html_with_timestamp()