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

lf_tx_power.py: initial commit of dual-band

Browse Source 
cc_module_9800_3504.py : dual-band mode commands
wifi_ctl_9800_3504.py : dual -band mode commands

Signed-off-by: Chuck SmileyRekiere <chuck.smileyrekiere@candelatech.com>
This commit is contained in:
Chuck SmileyRekiere
2022-04-05 23:23:54 -06:00
committed by shivam
parent f40bf63394
commit b47b5dc09b
3 changed files with 259 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
cc_module_9800_3504.py
View File

@@ -276,7 +276,7 @@ class create_controller_series_object:
"manual", "auto",
"enable_network_dual_band_6ghz", "enable_network_dual_band_5ghz", "enable_network_6ghz", "enable_network_5ghz", "enable_network_24ghz",
"enable_operation_status", "11r_logs", "enable_ft_akm_ftpsk", "enable_ftotd_akm_ftpsk",
"config_dual_band_mode"]:
"config_dual_band_mode","dual_band_no_mode_shutdown","dual_band_mode_shutdown"]:
self.command_extend = ["--action", self.action]
self.command.extend(self.command_extend)
@@ -439,6 +439,7 @@ class create_controller_series_object:
summary = self.send_command()
return summary
# TODO clean up action advanced to ap_dot11_summary
def show_ap_dot11_dual_band_6gz_summary(self):
logger.info("show ap dot11 dual-band 6gz summary")
self.band = 'dual_band_6g'
@@ -924,6 +925,38 @@ class create_controller_series_object:
summary = self.send_command()
return summary
# dual-band mode shut down 6ghz
def ap_dot11_dual_band_mode_shutdown_6ghz(self):
self.band = 'dual_band_6g'
self.action = 'dual_band_mode_shutdown'
summary = self.send_command()
logger.info("ap name {ap} dot11 dual-band shutdown slot {slot} band 6ghz {band}".format(ap=self.ap,band=self.band,slot=self.ap_band_slot))
return summary
# dual-band mode shut down 5ghz
def ap_dot11_dual_band_mode_shutdown_5ghz(self):
self.band = 'dual_band_5g'
self.action = 'dual_band_mode_shutdown'
summary = self.send_command()
logger.info("ap name {ap} dot11 dual-band shutdown slot {slot} band 6ghz {band}".format(ap=self.ap,band=self.band,slot=self.ap_band_slot))
return summary
# dual-band mode shut down 6ghz
def ap_dot11_dual_band_no_mode_shutdown_6ghz(self):
self.band = 'dual_band_6g'
self.action = 'dual_band_no_mode_shutdown'
summary = self.send_command()
logger.info("ap name {ap} dot11 dual-band no mode shutdown slot {slot} band 6ghz {band}".format(ap=self.ap,band=self.band,slot=self.ap_band_slot))
return summary
# dual-band mode shut down 5ghz
def ap_dot11_dual_band_mode_shutdown_5ghz(self):
self.band = 'dual_band_5g'
self.action = 'dual_band_no_mode_shutdown'
summary = self.send_command()
logger.info("ap name {ap} dot11 dual-band no mode shutdown slot {slot} band 6ghz {band}".format(ap=self.ap,band=self.band,slot=self.ap_band_slot))
return summary
# dual-band change radio roll 6ghz
def config_ap_dot11_dual_band_to_6ghz(self):
self.band = 'dual_band_6g'

222
lf_tx_power.py
View File

@@ -364,6 +364,8 @@ def main():
# AP configuration
parser.add_argument("-a", "--ap", type=str, help="[AP configuration] select AP ", required=True)
parser.add_argument("--ap_slot", type=str, dest="ap_slot", help="[AP configuration] --ap_slot 3 , 9800 AP slot , use show ap summary", required=True)
parser.add_argument("--ap_dual_band_slot_6g", type=str, help="[AP configuration] --ap_dual_band_slot_6g 3 , 9800 AP dual-band slot , for 6g dual-band use show ap dot11 dual-band summary", default='2')
parser.add_argument("--ap_dual_band_slot_5g", type=str, help="[AP configuration] --ap_dual_band_slot_5g 1 , 9800 AP dual-band slot , for 5g dual-band use show ap dot11 dual-band summary", default='2')
parser.add_argument("--ap_band_slot_6g", type=str, help="[AP configuration] --ap_band_slot_6g 3 , 9800 AP band slot , use show ap dot11 6ghz summary", default='2')
parser.add_argument("--ap_band_slot_5g", type=str, help="[AP configuration] --ap_band_slot_5g 1 , 9800 AP band slot , use show ap dot11 5ghz summary", default='1')
parser.add_argument("--ap_band_slot_24g", type=str, help="[AP configuration] --ap_band_slot_24g 0 , 9800 AP band slot , use show ap dot11 24ghz summary", default='0')
@@ -870,7 +872,7 @@ def main():
if (args.radio is None):
logg.info("WARNING --create needs a radio")
exit_test(workbook)
if (args.band == '6g'):
if (args.band == '6g' or args.band == 'dual_band_6g'):
if (args.vht160):
logg.info("creating station with VHT160 set: {} on radio {}".format(args.station, args.radio))
logg.info("cwd lf_associate_ap.pl: {dir}".format(dir=os.getcwd()))
@@ -1028,7 +1030,7 @@ def main():
# TODO make txpower file into object ,
if args.tx_power_adjust_6E:
txpowers = args.txpower.split()
if args.band == '6g':
if args.band == '6g' or args.band == 'dual_band_6g':
if bw == '20':
if '8' in txpowers:
txpowers.remove('8')
@@ -1063,11 +1065,25 @@ def main():
# 9800 series need to "Configure radio for manual channel assignment"
logg.info("9800 Configure radio for manual channel assignment")
cs.wlan_shutdown()
cs.ap_dot11_6ghz_shutdown()
if args.band == 'dual_band_6g':
cs.ap_dot11_dual_band_6ghz_shutdown()
elif args.band == 'dual_band_5g':
cs.ap_dot11_dual_band_5ghz_shutdown()
elif args.band == '6g':
cs.ap_dot11_6ghz_shutdown()
# There is only 3 slots on 6g and dualband
cs.ap_dot11_5ghz_shutdown()
cs.ap_dot11_24ghz_shutdown()
# manual
cs.ap_dot11_6ghz_radio_role_manual_client_serving()
if args.band == 'dual_band_6g':
cs.ap_dot11_dual_band_6ghz_radio_role_manual_client_serving()
elif args.band == 'dual_band_5g':
cs.ap_dot11_dual_band_5ghz_radio_role_manual_client_serving()
elif args.band == '6g':
cs.ap_dot11_6ghz_radio_role_manual_client_serving()
cs.ap_dot11_5ghz_radio_role_manual_client_serving()
cs.ap_dot11_24ghz_radio_role_manual_client_serving()
@@ -1080,8 +1096,12 @@ def main():
if (tx != "NA"):
logg.info("9800/3504 test_parameters: set txPower: {tx_power}".format(tx_power=tx))
cs.tx_power = tx
# TODO add 24ghz and 6ghz
if args.band == '6g':
if args.band == 'dual_band_6g':
cs.config_dot11_dual_band_6ghz_tx_power()
elif args.band == 'dual_band_5g':
cs.config_dot11_dual_band_5ghz_tx_power()
elif args.band == '6g':
cs.config_dot11_6ghz_tx_power()
elif args.band == '5g':
cs.config_dot11_5ghz_tx_power()
@@ -1092,7 +1112,11 @@ def main():
if (ch != "NA"):
logg.info("9800/3504 test_parameters set channel: {}".format(ch))
cs.channel = ch
if args.band == '6g':
if args.band == 'dual_band_6g':
cs.config_dot11_dual_band_6ghz_channel()
elif args.band == 'dual_band_5g':
cs.config_dot11_dual_band_5ghz_channel()
elif args.band == '6g':
cs.config_dot11_6ghz_channel()
elif args.band == '5g':
cs.config_dot11_5ghz_channel()
@@ -1102,7 +1126,11 @@ def main():
if (bw != "NA"):
logg.info("9800/3504 test_parameters bandwidth: set : {}".format(bw))
cs.bandwidth = bw
if args.band == '6g':
if args.band == 'dual_band_6g':
cs.config_dot11_dual_band_6ghz_channel_width()
elif args.band == 'dual_band_5g':
cs.config_dot11_dual_band_5ghz_channel_width()
elif args.band == '6g':
cs.config_dot11_6ghz_channel_width()
elif args.band == '5g':
cs.config_dot11_5ghz_channel_width()
@@ -1126,7 +1154,11 @@ def main():
# delete the wlan if already exists
pss = cs.show_wlan_summary()
logg.info(pss)
if args.band == '6g':
if args.band == 'dual_band_6g':
cs.show_ap_dot11_dual_band_6gz_summary
elif args.band == 'dual_band_5g':
cs.show_ap_dot11_dual_band_5gz_summary
elif args.band == '6g':
cs.show_ap_dot11_6gz_summary
elif args.band == '5g':
cs.show_ap_dot11_5gz_summary
@@ -1172,8 +1204,23 @@ def main():
cs.config_enable_wlan_send_no_shutdown()
# enable transmission for the entier 802.11z network
# the wlan may not care about dual_band
# enable_network_6ghz or enable_network_5ghz or enable_network_24ghz
if args.band == '6g':
if args.band == 'dual_band_6g':
# enable 6g wlan
pss = cs.config_no_ap_dot11_dual_band_6ghz_shutdown()
logg.info(pss)
# enable 6g operation status
pss = cs.config_ap_no_dot11_6ghz_shutdown()
logg.info(pss)
elif args.band == 'dual_band_5g':
# enable 5g wlan
pss = cs.config_no_ap_dot11_dual_band_5ghz_shutdown()
logg.info(pss)
# enable 5g operation status
pss = cs.config_ap_no_dot11_5ghz_shutdown()
logg.info(pss)
elif args.band == '6g':
# enable 6g wlan
pss = cs.config_no_ap_dot11_6ghz_shutdown()
logg.info(pss)
@@ -1181,7 +1228,7 @@ def main():
pss = cs.config_ap_no_dot11_6ghz_shutdown()
logg.info(pss)
# 6g needs to see the 5g bands
elif args.band == '5g' or args.band == '6g':
elif args.band == '5g' or args.band == '6g' or args.band == 'dual_band_6g':
# enable 5g wlan
pss = cs.config_no_ap_dot11_5ghz_shutdown()
logg.info(pss)
@@ -1205,8 +1252,18 @@ def main():
logg.info("9800 read controller dBm")
loop_count += 1
time.sleep(1)
# TODO configuration for 24g, 6g
if args.band == '6g':
if args.band == 'dual_band_6g':
pss = cs.show_ap_dot11_dual_band_6gz_summary()
logg.info("show ap dot11 dual-band (6ghz) summary")
logg.info("ap: {ap} ap_band_slot_6g: {slot} ".format(ap=args.ap, slot=args.ap_band_slot_6g))
logg.info(pss)
elif args.band == 'dual_band_5g':
pss = cs.show_ap_dot11_dual_band_5gz_summary()
logg.info("show ap dot11 dual-band (5ghz) summary")
logg.info("ap: {ap} ap_band_slot_5g: {slot} ".format(ap=args.ap, slot=args.ap_band_slot_5g))
logg.info(pss)
elif args.band == '6g':
pss = cs.show_ap_dot11_6gz_summary()
logg.info("show ap dot11 6ghz summary")
logg.info("ap: {ap} ap_band_slot_6g: {slot} ".format(ap=args.ap, slot=args.ap_band_slot_6g))
@@ -1236,7 +1293,11 @@ def main():
if (searchap):
logg.info("##### line #####")
logg.info(line)
if args.band == '6g':
if args.band == 'dual_band_6g':
logg.info("ap : {ap} ap_dual_band_slot_6g: {slot}".format(ap=args.ap, slot=args.ap_dual_band_slot_6g))
elif args.band == 'dual_band_5g':
logg.info("ap : {ap} ap_dual_band_slot_5g: {slot}".format(ap=args.ap, slot=args.ap_dual_band_slot_5g))
elif args.band == '6g':
logg.info("ap : {ap} ap_band_slot_6g: {slot}".format(ap=args.ap, slot=args.ap_band_slot_6g))
elif args.band == '5g':
logg.info("ap : {ap} ap_band_slot_5g: {slot}".format(ap=args.ap, slot=args.ap_band_slot_5g))
@@ -1250,7 +1311,13 @@ def main():
logg.info(m)
ap_band_slot = None
if (m is not None):
if args.band == '6g':
if args.band == 'dual_band_6g':
logg.info("checking of dual-band slot for 6g {band_slot} present in the show ap dot11 dual-band summary".format(band_slot=args.ap_dual_band_slot_6g))
ap_band_slot = args.ap_band_slot_6g
elif args.band == 'dual_band_5g':
logg.info("checking of dual-band slot for 5g {band_slot} present in the show ap dot11 dual-band summary".format(band_slot=args.ap_dual_band_slot_5g))
ap_band_slot = args.ap_band_slot_5g
elif args.band == '6g':
logg.info("checking of band slot 6g {band_slot} present in the show ap dot11 6ghz summary".format(band_slot=args.ap_band_slot_6g))
ap_band_slot = args.ap_band_slot_6g
elif args.band == '5g':
@@ -1423,7 +1490,12 @@ def main():
time.sleep(1)
if args.series == "9800":
if args.band == '6g':
# being explicite as
if args.band == 'dual_band_6g':
pss = cs.show_ap_dot11_dual_band_6gz_summary()
elif args.band == 'dual_band_5g':
pss = cs.show_ap_dot11_dual_band_5gz_summary()
elif args.band == '6g':
pss = cs.show_ap_dot11_6gz_summary()
elif args.band == '5g':
pss = cs.show_ap_dot11_5gz_summary()
@@ -2243,9 +2315,17 @@ def main():
# keep the state of the controller
if(args.keep_state):
# TODO may have to check the AP type or AP series
logg.info("9800/3504 flag --keep_state True thus leaving controller is last test configuration")
pss = cs.show_ap_dot11_6gz_summary()
logg.info(pss)
if args.band == 'dual_band_6g':
pss = cs.show_ap_dot11_dual_band_6gz_summary()
logg.info(pss)
elif args.band == 'dual_band_5g':
pss = cs.show_ap_dot11_dual_band_5gz_summary()
logg.info(pss)
elif args.band == '6g':
pss = cs.show_ap_dot11_6gz_summary()
logg.info(pss)
pss = cs.show_ap_dot11_5gz_summary()
logg.info(pss)
pss = cs.show_ap_dot11_24gz_summary()
@@ -2263,43 +2343,86 @@ def main():
pss = cs.config_no_wlan()
logg.info(pss)
# Enable wlan networks
pss = cs.ap_dot11_6ghz_shutdown()
logg.info(pss)
# Disable wlan networks to try to restore to original configuration
if args.band == 'dual_band_6g':
pss = cs.ap_dot11_dual_band_6ghz_shutdown()
logg.info(pss)
elif args.band == 'dual_band_5g':
pss = cs.ap_dot11_dual_band_5ghz_shutdown()
logg.info(pss)
# Assume on non dual-band AP 9136 , yet 6164 does not support 6g
# TODO pass in AP model
else:
pss = cs.ap_dot11_6ghz_shutdown()
logg.info(pss)
pss = cs.ap_dot11_5ghz_shutdown()
logg.info(pss)
pss = cs.ap_dot11_24ghz_shutdown()
logg.info(pss)
pss = cs.config_dot11_6ghz_tx_power()
logg.info(pss)
pss = cs.config_dot11_5ghz_tx_power()
logg.info(pss)
if args.band == 'dual_band_6g':
pss = cs.config_dot11_dual_band_6ghz_tx_power()
logg.info(pss)
elif args.band == 'dual_band_5g':
pss = cs.config_dot11_dual_band_5ghz_tx_power()
logg.info(pss)
elif args.band == '6g':
pss = cs.config_dot11_6ghz_tx_power()
logg.info(pss)
elif args.band == '5g':
pss = cs.config_dot11_5ghz_tx_power()
logg.info(pss)
# NSS is set on the station earlier...
if (ch != "NA"):
if args.band == '6g':
if args.band == 'dual_band_6g':
pss = cs.config_dot11_dual_band_6ghz_channel()
elif args.band == 'dual_band_5g':
pss = cs.config_dot11_dual_band_5ghz_channel()
elif args.band == '6g':
pss = cs.config_dot11_6ghz_channel()
elif args.band == '5g':
pss = cs.config_dot11_5ghz_channel()
elif args.band == '24g':
pss = cs.config_dot11_24ghz_channel()
logg.info(pss)
if (bw != "NA"):
if args.band == '6g':
if args.band == 'dual_band_6g':
pss = cs.config_dot11_dual_band_6ghz_channel_width()
elif args.band == 'dual_band_5g':
pss = cs.config_dot11_dual_band_5ghz_channel_width()
elif args.band == '6g':
pss = cs.config_dot11_6ghz_channel_width()
elif args.band == '5g':
pss = cs.config_dot11_5ghz_channel_width()
logg.info(pss)
if args.series == "9800":
pss = cs.config_no_ap_dot11_6ghz_shutdown()
logg.info(pss)
if args.band == 'dual_band_6g':
pss = cs.config_no_ap_dot11_dual_band_6ghz_shutdown()
logg.info(pss)
elif args.band == 'dual_band_5g':
pss = cs.config_no_ap_dot11_dual_band_5ghz_shutdown()
logg.info(pss)
elif args.band == '6g':
pss = cs.config_no_ap_dot11_6ghz_shutdown()
logg.info(pss)
pss = cs.config_no_ap_dot11_5ghz_shutdown()
logg.info(pss)
pss = cs.config_no_ap_dot11_24ghz_shutdown()
logg.info(pss)
pss = cs.ap_dot11_6ghz_radio_role_auto()
logg.info(pss)
if args.band == 'dual_band_6g':
pss = cs.ap_dot11_dual_band_6ghz_radio_role_auto()
logg.info(pss)
elif args.band == 'dual_band_5g':
pss = cs.ap_dot11_dual_band_5ghz_radio_role_auto()
logg.info(pss)
elif args.band == '6g':
pss = cs.ap_dot11_6ghz_radio_role_auto()
logg.info(pss)
pss = cs.ap_dot11_5ghz_radio_role_auto()
logg.info(pss)
@@ -2309,28 +2432,53 @@ def main():
pss = cs.config_no_ap_dot11_24ghz_shutdown()
logg.info(pss)
if args.band == 'dual_band_6g':
pss = cs.config_no_ap_dot11_dual_band_6ghz_shutdown() # enable_network dual_band 6ghz
logg.info(pss)
if args.band == 'dual_band_5g':
pss = cs.config_no_ap_dot11_dual_band_5ghz_shutdown() # enable_network dual_band 6ghz
logg.info(pss)
if args.band == '6g':
pss = cs.config_no_ap_dot11_6ghz_shutdown() # enable_network 5ghz
pss = cs.config_no_ap_dot11_6ghz_shutdown() # enable_network 6ghz
logg.info(pss)
if args.band == '5g':
pss = cs.config_no_ap_dot11_5ghz_shutdown() # enable_network 5ghz
logg.info(pss)
if args.band == '24g':
pss = cs.config_no_ap_dot11_24ghz_shutdown() # enable_network 5ghz
pss = cs.config_no_ap_dot11_24ghz_shutdown() # enable_network 24ghz
logg.info(pss)
# try enabling all bands
if args.enable_all_bands:
pss = cs.config_no_ap_dot11_6ghz_shutdown() # enable_network 5ghz
logg.info(pss)
if args.band == 'dual_band_6g':
pss = cs.config_no_ap_dot11_dual_band_6ghz_shutdown() # enable_network dual_band 6ghz
logg.info(pss)
if args.band == 'dual_band_5g':
pss = cs.config_no_ap_dot11_dual_band_5ghz_shutdown() # enable_network dual_band 6ghz
logg.info(pss)
if args.band == '6g':
pss = cs.config_no_ap_dot11_6ghz_shutdown() # enable_network 6ghz
logg.info(pss)
pss = cs.config_no_ap_dot11_5ghz_shutdown() # enable_network 5ghz
logg.info(pss)
pss = cs.config_no_ap_dot11_24ghz_shutdown() # enable_network 5ghz
logg.info(pss)
# Show controller status
# TODO show valid / short status
pss = cs.show_ap_dot11_6gz_summary()
# Note
if args.band == 'dual_band_6g':
pss = cs.show_ap_dot11_dual_band_6gz_summary()
logg.info(pss)
if args.band == 'dual_band_5g':
pss = cs.show_ap_dot11_dual_band_5gz_summary()
logg.info(pss)
if args.band == '6g':
pss = cs.show_ap_dot11_6gz_summary()
logg.info(pss)
pss = cs.show_ap_dot11_5gz_summary()
logg.info(pss)
pss = cs.show_ap_dot11_24gz_summary()
logg.info(pss)
# Generate Report

43
wifi_ctl_9800_3504.py
View File

@@ -1247,7 +1247,44 @@ def main():
command = "config 802.11b enable network"
# This will configure the dual band mode
# This will shut down the dual band
# for dual-band 6g
# ap name CM66 dot11 dual-band shutdown
# ap name CM66 dot11 dual-band slot 2 band 6ghz
# ap name CM66 no dot11 dual-band shutdown
# for dual-band 5g
# ap name CM66 dot11 dual-band shutdown
# ap name CM66 dot11 dual-band slot 2 band 5ghz
# ap name CM66 no dot11 dual-band shutdown
# shutdown dual-band mode
if (args.action == "dual_band_mode_shutdown" and (args.ap is None or args.ap_band_slot is None)):
raise Exception("action requires AP name and ap band slot")
if (args.action == "dual_band_mode_shutdown"):
logg.info("command: ap name %s dot11 dual-band shutdown , slot %s : %s " % (args.ap, band, args.ap_band_slot, band))
if args.series == "9800":
if band == "dual_band_6g":
command = "ap name %s dot11 dual-band shutdown" % (args.ap)
elif band == "dual_band_5g":
command = "ap name %s dot11 dual-band shutdown" % (args.ap)
# shutdown dual-band mode
if (args.action == "dual_band_no_mode_shutdown" and (args.ap is None or args.ap_band_slot is None)):
raise Exception("action requires AP name and ap band slot")
if (args.action == "dual_band_no_mode_shutdown"):
logg.info("command: ap name %s no dot11 dual-band shutdown , slot %s : %s " % (args.ap, band, args.ap_band_slot, band))
if args.series == "9800":
if band == "dual_band_6g":
command = "ap name %s no dot11 dual-band shutdown" % (args.ap)
elif band == "dual_band_5g":
command = "ap name %s no dot11 dual-band shutdown" % (args.ap)
# configure the dual band mode
if (args.action == "config_dual_band_mode" and (args.ap is None or args.ap_band_slot is None)):
raise Exception("action requires AP name and ap band slot")
if (args.action == "config_dual_band_mode"):
@@ -1255,9 +1292,9 @@ def main():
if args.series == "9800":
if band == "dual_band_6g":
command = "ap name %s no dot11 dual-band slot %s band 6ghz" % (args.ap, args.ap_band_slot)
command = "ap name %s dot11 dual-band slot %s band 6ghz" % (args.ap, args.ap_band_slot)
elif band == "dual_band_5g":
command = "ap name %s no dot11 dual-band slot %s band 5ghz" % (args.ap, args.ap_band_slot)
command = "ap name %s dot11 dual-band slot %s band 5ghz" % (args.ap, args.ap_band_slot)
# This will take the operation status down