diff --git a/cicd/testbed_poll.pl b/cicd/testbed_poll.pl index 2fc77a4fe..11fe3b0a4 100755 --- a/cicd/testbed_poll.pl +++ b/cicd/testbed_poll.pl @@ -190,7 +190,7 @@ for ($i = 0; $i<@lines; $i++) { # Next steps here are to put the OpenWrt file on the LANforge system my $tb_info = do_system("cat TESTBED_INFO.txt"); my $tb_dir = ""; - if ($tb_info =~ /TESTBED_DIR=(.*)/g) { + if ($tb_info =~ /TESTBED_DIR=(.*)/) { $tb_dir = $1; } @@ -199,7 +199,7 @@ for ($i = 0; $i<@lines; $i++) { my $serial = ""; my $cloud_sdk = ""; - if ($env =~ /LFMANAGER=(.*)/g) { + if ($env =~ /LFMANAGER=(.*)/) { $lfmgr = $1; } else { @@ -208,15 +208,17 @@ for ($i = 0; $i<@lines; $i++) { exit(1); } - if ($env =~ /USE_CLOUD_SDK=(\S+)/g) { + if ($env =~ /USE_CLOUD_SDK=(\S+)/) { $cloud_sdk = $1; print("NOTE: Using cloud controller: $cloud_sdk\n"); } else { print("NOTE: NOT Using cloud controller\n"); } + #print("env: $env"); + #exit(0); - if ($env =~ /AP_SERIAL=(.*)/g) { + if ($env =~ /AP_SERIAL=(.*)/) { $serial = $1; } else { @@ -228,10 +230,10 @@ for ($i = 0; $i<@lines; $i++) { my $gmanager = $lfmgr; my $scenario = "tip-auto"; # matches basic_regression.bash - if ($env =~ /GMANAGER=(.*)/g) { + if ($env =~ /GMANAGER=(.*)/) { $gmanager = $1; } - if ($env =~ /GMPORT=(.*)/g) { + if ($env =~ /GMPORT=(.*)/) { $gmport = $1; } @@ -296,8 +298,8 @@ for ($i = 0; $i<@lines; $i++) { } else { print_note("Initialize AP, enable OpenVsync since this testbed is using Cloud-Controler: $cloud_sdk."); - $ap_out = do_system("../../lanforge/lanforge-scripts/openwrt_ctl.py $owt_log --scheme serial --tty $serial --action cmd --value \"service opensync ensable\""); - print ("Disable openvsync:\n$ap_out\n"); + $ap_out = do_system("../../lanforge/lanforge-scripts/openwrt_ctl.py $owt_log --scheme serial --tty $serial --action cmd --value \"service opensync enable\""); + print ("Enable openvsync:\n$ap_out\n"); } # Re-apply overlay diff --git a/testbeds/ferndale-basic-01/OpenWrt-overlay/etc/config/wireless b/testbeds/ferndale-basic-01/OpenWrt-overlay/etc/config/wireless index e0553b028..49398647e 100644 --- a/testbeds/ferndale-basic-01/OpenWrt-overlay/etc/config/wireless +++ b/testbeds/ferndale-basic-01/OpenWrt-overlay/etc/config/wireless @@ -1,46 +1,57 @@ - config wifi-device 'radio0' - option type 'mac80211' - option hwmode '11a' - option path 'soc/40000000.pci/pci0000:00/0000:00:00.0/0000:01:00.0' - option htmode 'VHT80' - option disabled '0' - option channel '149' + option type 'mac80211' + option hwmode '11a' + option path 'soc/40000000.pci/pci0000:00/0000:00:00.0/0000:01:00.0' + option htmode 'VHT80' + option disabled '0' + option channel '149' config wifi-iface 'default_radio0' - option device 'radio0' - option network 'lan' - option mode 'ap' - option encryption 'none' - option ssid 'OpenWrt-5hi' + option device 'radio0' + option network 'lan' + option mode 'ap' + option disabled '0' + option ssid 'Default-SSID-5gu' + option hidden '0' + option key '12345678' + option encryption 'psk-mixed' + option isolate '1' config wifi-device 'radio1' - option type 'mac80211' - option hwmode '11g' - option path 'platform/soc/a000000.wifi' - option htmode 'HT20' - option disabled '0' - option channel '1' + option type 'mac80211' + option hwmode '11g' + option path 'platform/soc/a000000.wifi' + option htmode 'HT20' + option disabled '0' + option channel '6' config wifi-iface 'default_radio1' - option device 'radio1' - option network 'lan' - option mode 'ap' - option encryption 'none' - option ssid 'OpenWrt-2' + option device 'radio1' + option network 'lan' + option mode 'ap' + option disabled '0' + option ssid 'Default-SSID-2g' + option hidden '0' + option key '12345678' + option encryption 'psk-mixed' + option isolate '1' config wifi-device 'radio2' - option type 'mac80211' - option hwmode '11a' - option path 'platform/soc/a800000.wifi' - option htmode 'VHT80' - option disabled '0' - option channel '36' + option type 'mac80211' + option hwmode '11a' + option path 'platform/soc/a800000.wifi' + option htmode 'VHT80' + option disabled '0' + option channel '36' config wifi-iface 'default_radio2' - option device 'radio2' - option network 'lan' - option mode 'ap' - option encryption 'none' - option ssid 'OpenWrt-5lo' + option device 'radio2' + option network 'lan' + option mode 'ap' + option ssid 'Default-SSID-5gl' + option key '12345678' + option encryption 'psk-mixed' + option isolate '1' + option hidden '0' + option disabled '0' diff --git a/testbeds/ferndale-basic-01/test_bed_cfg.bash b/testbeds/ferndale-basic-01/test_bed_cfg.bash index df9109ff7..76144e45d 100644 --- a/testbeds/ferndale-basic-01/test_bed_cfg.bash +++ b/testbeds/ferndale-basic-01/test_bed_cfg.bash @@ -33,16 +33,16 @@ STABILITY_DURATION=${STABILITY_DURATION:-600} TEST_RIG_ID=${TEST_RIG_ID:-Ferndale-01-Basic} # DUT configuration -#DUT_FLAGS=${DUT_FLAGS:-0x22} # AP, WPA-PSK -DUT_FLAGS=${DUT_FLAGS:-0x2} # AP, Open +DUT_FLAGS=${DUT_FLAGS:-0x22} # AP, WPA-PSK +#DUT_FLAGS=${DUT_FLAGS:-0x2} # AP, Open DUT_FLAGS_MASK=${DUT_FLAGS_MASK:-0xFFFF} DUT_SW_VER=${DUT_SW_VER:-OpenWrt-Stock} DUT_HW_VER=Linksys-EA8300 DUT_MODEL=Linksys-EA8300 DUT_SERIAL=${DUT_SERIAL:-NA} -DUT_SSID1=${DUT_SSID1:-OpenWrt-2} -DUT_SSID2=${DUT_SSID2:-OpenWrt-5lo} -DUT_SSID3=${DUT_SSID3:-OpenWrt-5hi} +DUT_SSID1=${DUT_SSID1:-Default-SSID-2g} +DUT_SSID2=${DUT_SSID2:-Default-SSID-5gl} +DUT_SSID3=${DUT_SSID3:-Default-SSID-5gu} DUT_PASSWD1=${DUT_PASSWD1:-12345678} DUT_PASSWD2=${DUT_PASSWD2:-12345678} DUT_PASSWD3=${DUT_PASSWD3:-12345678} @@ -58,4 +58,4 @@ export DUT_FLAGS DUT_FLAGS_MASK DUT_SW_VER DUT_HW_VER DUT_MODEL export DUT_SERIAL DUT_SSID1 DUT_SSID2 DUT_SSID3 export DUT_PASSWD1 DUT_PASSWD2 DUT_PASSWD3 export DUT_BSSID1 DUT_BSSID2 DUT_BSSID3 - +export USE_CLOUD_SDK