scottk/wlan-lanforge-scripts
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-lanforge-scripts.git synced 2025-11-02 19:58:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Better stdout redirection, added communication between scripts and bash script

Browse Source
This commit is contained in:
Dipti
2020-11-30 16:29:02 -08:00
parent c6b36f06fa
commit 49999987da
5 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
py-scripts/example_wep_connection.py
View File

@@ -52,6 +52,8 @@ class IPv4Test(LFCliBase):
self.station_profile.set_command_flag("set_port", "rpt_timer", 1) self.station_profile.set_command_flag("set_port", "rpt_timer", 1)
self.station_profile.create(radio=self.radio, sta_names_=self.sta_list, debug=self.debug) self.station_profile.create(radio=self.radio, sta_names_=self.sta_list, debug=self.debug)
self._pass("PASS: Station build finished") self._pass("PASS: Station build finished")
print("Test passed.")
exit(0)
def cleanup(self, sta_list): def cleanup(self, sta_list):
self.station_profile.cleanup(sta_list) self.station_profile.cleanup(sta_list)

3
py-scripts/example_wpa2_connection.py
View File

@@ -52,6 +52,7 @@ class IPv4Test(LFCliBase):
self.station_profile.set_command_flag("set_port", "rpt_timer", 1) self.station_profile.set_command_flag("set_port", "rpt_timer", 1)
self.station_profile.create(radio=self.radio, sta_names_=self.sta_list, debug=self.debug) self.station_profile.create(radio=self.radio, sta_names_=self.sta_list, debug=self.debug)
self._pass("PASS: Station build finished") self._pass("PASS: Station build finished")
exit(0)
def cleanup(self, sta_list): def cleanup(self, sta_list):
self.station_profile.cleanup(sta_list) self.station_profile.cleanup(sta_list)
@@ -71,7 +72,7 @@ def main():
''', ''',
description='''\ description='''\
example_wpa_connection.py example_wpa2_connection.py
-------------------- --------------------
Generic command example: Generic command example:

1
py-scripts/example_wpa3_connection.py
View File

@@ -52,6 +52,7 @@ class IPv4Test(LFCliBase):
self.station_profile.set_command_flag("set_port", "rpt_timer", 1) self.station_profile.set_command_flag("set_port", "rpt_timer", 1)
self.station_profile.create(radio=self.radio, sta_names_=self.sta_list, debug=self.debug) self.station_profile.create(radio=self.radio, sta_names_=self.sta_list, debug=self.debug)
self._pass("PASS: Station build finished") self._pass("PASS: Station build finished")
exit(0)
def cleanup(self, sta_list): def cleanup(self, sta_list):
self.station_profile.cleanup(sta_list) self.station_profile.cleanup(sta_list)

1
py-scripts/example_wpa_connection.py
View File

@@ -54,6 +54,7 @@ class IPv4Test(LFCliBase):
self.station_profile.admin_up() self.station_profile.admin_up()
self._pass("PASS: Station build finished") self._pass("PASS: Station build finished")
exit(0)
def cleanup(self, sta_list): def cleanup(self, sta_list):
self.station_profile.cleanup(sta_list) self.station_profile.cleanup(sta_list)

26
py-scripts/test_all_scripts.sh
View File

@@ -4,8 +4,8 @@
# OPTION TWO: ./test_all_scripts.sh 4 5 : this command runs py-script commands (in testCommands array) that include the py-script options beginning with 4 and 5 (inclusive) in case function ret_case_num. # OPTION TWO: ./test_all_scripts.sh 4 5 : this command runs py-script commands (in testCommands array) that include the py-script options beginning with 4 and 5 (inclusive) in case function ret_case_num.
#Variables #Variables
NUM_STA=4 NUM_STA=4
SSID_USED="jedway-wpa2-x2048-4-1" SSID_USED="jedway-wpa2-x2048-5-3"
PASSWD_USED="jedway-wpa2-x2048-4-1" PASSWD_USED="jedway-wpa2-x2048-5-3"
RADIO_USED="wiphy1" RADIO_USED="wiphy1"
SECURITY="wpa2" SECURITY="wpa2"
CURR_TEST_NAME="BLANK" CURR_TEST_NAME="BLANK"
@@ -17,7 +17,7 @@ testCommands=("./example_wpa_connection.py --num_stations $NUM_STA --ssid jedway
"./example_wpa2_connection.py --num_stations $NUM_STA --ssid jedway-r8000-36 --passwd jedway-r8000-36 --radio $RADIO_USED --security wpa2" "./example_wpa2_connection.py --num_stations $NUM_STA --ssid jedway-r8000-36 --passwd jedway-r8000-36 --radio $RADIO_USED --security wpa2"
"./example_wep_connection.py --num_stations $NUM_STA --ssid jedway-wep-48 --passwd jedway-wep-48 --radio $RADIO_USED --security wep" "./example_wep_connection.py --num_stations $NUM_STA --ssid jedway-wep-48 --passwd jedway-wep-48 --radio $RADIO_USED --security wep"
"./example_wpa3_connection.py --num_stations $NUM_STA --ssid jedway-wpa3-1 --passwd jedway-wpa3-1 --radio $RADIO_USED --security wpa3" "./example_wpa3_connection.py --num_stations $NUM_STA --ssid jedway-wpa3-1 --passwd jedway-wpa3-1 --radio $RADIO_USED --security wpa3"
"./test_ipv4_connection.py --radio $RADIO_USED --num_stations $NUM_STA --ssid $SSID_USED --passwd $PASSWD_USED --security $SECURITY --debug --upstream_port eth1" "./test_ipv4_connection.py --radio wiphy2 --num_stations $NUM_STA --ssid $SSID_USED --passwd $PASSWD_USED --security $SECURITY --debug --upstream_port eth1"
"./test_generic.py --mgr localhost --mgr_port 4122 --radio $RADIO_USED --ssid SSID_USED --passwd $PASSWD_USED --num_stations $NUM_STA --type lfping --dest 10.40.0.1 --security $SECURITY" "./test_generic.py --mgr localhost --mgr_port 4122 --radio $RADIO_USED --ssid SSID_USED --passwd $PASSWD_USED --num_stations $NUM_STA --type lfping --dest 10.40.0.1 --security $SECURITY"
"./test_generic.py --mgr localhost --mgr_port 4122 --radio $RADIO_USED --ssid $SSID_USED --passwd $PASSWD_USED --num_stations $NUM_STA --type speedtest --speedtest_min_up 20 --speedtest_min_dl 20 --speedtest_max_ping 150 --security $SECURITY" "./test_generic.py --mgr localhost --mgr_port 4122 --radio $RADIO_USED --ssid $SSID_USED --passwd $PASSWD_USED --num_stations $NUM_STA --type speedtest --speedtest_min_up 20 --speedtest_min_dl 20 --speedtest_max_ping 150 --security $SECURITY"
"./test_ipv4_l4_urls_per_ten.py --upstream_port eth1 --radio $RADIO_USED --num_stations $NUM_STA --security $SECURITY --ssid $SSID_USED --passwd $PASSWD_USED --num_tests 1 --requests_per_ten 600 --target_per_ten 600" "./test_ipv4_l4_urls_per_ten.py --upstream_port eth1 --radio $RADIO_USED --num_stations $NUM_STA --security $SECURITY --ssid $SSID_USED --passwd $PASSWD_USED --num_tests 1 --requests_per_ten 600 --target_per_ten 600"
@@ -47,12 +47,12 @@ function ret_case_num(){
esac esac
} }
function blank_db() { function blank_db() {
echo "Loading blank scenario..." echo "Loading blank scenario..." |& tee -a ~/test_all_output_file.txt
./scenario.py --load BLANK ./scenario.py --load BLANK |& tee -a ~/test_all_output_file.txt
#check_blank.py #check_blank.py
} }
function echo_print(){ function echo_print(){
echo "Beginning $CURR_TEST_NAME test..." echo "Beginning $CURR_TEST_NAME test..." |& tee -a ~/test_all_output_file.txt
} }
function run_test(){ function run_test(){
for i in "${testCommands[@]}"; do for i in "${testCommands[@]}"; do
@@ -64,12 +64,12 @@ function run_test(){
fi fi
if [[ $CURR_TEST_NUM -gt $START_NUM ]] || [[ $CURR_TEST_NUM -eq $START_NUM ]]; then if [[ $CURR_TEST_NUM -gt $START_NUM ]] || [[ $CURR_TEST_NUM -eq $START_NUM ]]; then
echo_print echo_print
# eval $i > /home/Documents/txtfile eval $i | tee -a ~/test_all_output_file.txt
# if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
# echo $CURR_TEST_NAME fail echo $CURR_TEST_NAME failure
# fi else
#tail -10 /home/Documents/txtfile echo $CURR_TEST_NAME success
#eval $i fi
if [[ "${CURR_TEST_NAME}" = @(example_wpa_connection|example_wpa2_connection|example_wpa3_connection|example_wep_connection) ]]; then if [[ "${CURR_TEST_NAME}" = @(example_wpa_connection|example_wpa2_connection|example_wpa3_connection|example_wep_connection) ]]; then
blank_db blank_db
fi fi
@@ -84,7 +84,7 @@ function check_args(){
STOP_NUM=$2 STOP_NUM=$2
fi fi
} }
true > ~/test_all_output_file.txt
check_args $1 $2 check_args $1 $2
run_test run_test
#test generic and fileio are for macvlans #test generic and fileio are for macvlans
#all tests should return 0 for success and !0 for fail --almost complete