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

Merge branch 'master' of https://github.com/greearb/lanforge-scripts

Browse Source
This commit is contained in:
Chuck SmileyRekiere
2020-08-04 16:28:59 -06:00
parent 8e585a64cc 761dff87ae
commit 41505f34aa
2 changed files with 31 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
py-json/realm.py
View File

@@ -1306,6 +1306,7 @@ class VAPProfile(LFCliBase):
"ap_name": None,
"flags": 0,
"flags_mask": 0,
"mode": 0,
"ssid": None,
"key": None,
"mac": "xx:xx:xx:xx:*:xx"
@@ -1322,10 +1323,6 @@ class VAPProfile(LFCliBase):
"interest": 0, # (0x2 + 0x4000 + 0x800000) # current, dhcp, down
}
if self.use_ht160:
self.desired_add_vap_flags.append("ht160_enable")
self.desired_add_vap_flags_mask.append("ht160_enable")
def admin_up(self, resource):
set_port_r = LFRequest.LFRequest(self.lfclient_url, "/cli-json/set_port", debug_=self.debug)
req_json = LFUtils.portUpRequest(resource, None, debug_on=self.debug)
@@ -1449,6 +1446,17 @@ class VAPProfile(LFCliBase):
return result
def create(self, resource, radio, channel=None, up_=None, debug=False, suppress_related_commands_=True):
if self.use_ht160:
self.desired_add_vap_flags.append("enable_80211d")
self.desired_add_vap_flags_mask.append("enable_80211d")
self.desired_add_vap_flags.append("80211h_enable")
self.desired_add_vap_flags_mask.append("80211h_enable")
self.desired_add_vap_flags.append("ht160_enable")
self.desired_add_vap_flags_mask.append("ht160_enable")
print("MODE ========= ", self.mode)
jr = self.local_realm.json_get("/radiostatus/1/%s/%s?fields=channel,frequency,country" % (resource, radio), debug_=self.debug)
if jr is None:
raise ValueError("No radio %s.%s found" % (resource, radio))
@@ -1463,7 +1471,7 @@ class VAPProfile(LFCliBase):
"shelf": 1,
"resource": resource,
"radio": radio,
"mode": 0, #"NA", #0 for AUTO or "NA"
"mode": self.mode, #"NA", #0 for AUTO or "NA"
"channel": channel,
"country": country,
"frequency": self.local_realm.channel_freq(channel_=channel)
@@ -1477,7 +1485,8 @@ class VAPProfile(LFCliBase):
elif "create_admin_down" not in self.desired_add_vap_flags:
self.desired_add_vap_flags.append("create_admin_down")
# create stations down, do set_port on them, then set stations up
# create vaps down, do set_port on them, then set vaps up
self.add_vap_data["mode"] = self.mode
self.add_vap_data["flags"] = self.add_named_flags(self.desired_add_vap_flags, add_vap.add_vap_flags)
self.add_vap_data["flags_mask"] = self.add_named_flags(self.desired_add_vap_flags_mask, add_vap.add_vap_flags)
self.add_vap_data["radio"] = radio
@@ -1588,7 +1597,7 @@ class VAPProfile(LFCliBase):
#
class StationProfile:
def __init__(self, lfclient_url, local_realm, ssid="NA", ssid_pass="NA", security="open", number_template_="00000", mode=0, up=True,
dhcp=True, debug_=False):
dhcp=True, debug_=False, use_ht160=False):
self.debug = debug_
self.lfclient_url = lfclient_url
self.ssid = ssid
@@ -1598,6 +1607,7 @@ class StationProfile:
self.dhcp = dhcp
self.security = security
self.local_realm = local_realm
self.use_ht160 = use_ht160
self.COMMANDS = ["add_sta", "set_port"]
self.desired_add_sta_flags = ["wpa2_enable", "80211u_enable", "create_admin_down"]
self.desired_add_sta_flags_mask = ["wpa2_enable", "80211u_enable", "create_admin_down"]
@@ -1818,6 +1828,12 @@ class StationProfile:
# print("Building %s on radio %s.%s" % (num_stations, resource, radio_name))
# except ValueError as e:
# print(e)
if self.use_ht160:
self.desired_add_sta_flags.append("ht160_enable")
self.desired_add_sta_flags_mask.append("ht160_enable")
self.add_sta_data["mode"] = self.mode
if up_ is not None:
self.up = up_

12
py-scripts/test_ipv4_variable_time.py
View File

@@ -22,7 +22,7 @@ class IPV4VariableTime(LFCliBase):
def __init__(self, host, port, ssid, security, password, sta_list, name_prefix, resource=1, radio="wiphy0",
side_a_min_rate=56, side_a_max_rate=0,
side_b_min_rate=56, side_b_max_rate=0,
number_template="00000", test_duration="5m",
number_template="00000", test_duration="5m", use_ht160=False,
_debug_on=False,
_exit_on_error=False,
_exit_on_fail=False):
@@ -49,6 +49,9 @@ class IPV4VariableTime(LFCliBase):
self.station_profile.security = self.security
self.station_profile.number_template_ = self.number_template
self.station_profile.mode = 0
self.station_profile.use_ht160 = use_ht160
if self.station_profile.use_ht160:
self.station_profile.mode = 9
self.cx_profile.host = self.host
self.cx_profile.port = self.port
@@ -161,10 +164,11 @@ def main():
station_list = LFUtils.portNameSeries(prefix_="sta", start_id_=0, end_id_=1, padding_number_=10000)
ip_var_test = IPV4VariableTime(lfjson_host, lfjson_port, number_template="00", sta_list=station_list,
name_prefix="var_time",
ssid="jedway-wpa2-x2048-4-4",
password="jedway-wpa2-x2048-4-4",
ssid="jedway-wpa2-160",
password="jedway-wpa2-160",
resource=1,
security="wpa2", test_duration="5m",
radio="wiphy2",
security="wpa2", test_duration="5m", use_ht160=False,
side_a_min_rate=256000, side_b_min_rate=256000, _debug_on=False)
ip_var_test.cleanup(station_list)