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

sta_connect: Improve logic

Browse Source 
Replace if XXX is None with if not XXX because we want to fail if the variable is blank or 0
Signed-off-by: Matthew Stidham <stidmatt@gmail.com>
This commit is contained in:
Matthew Stidham
2021-12-16 08:38:43 -08:00
parent 849deb89c2
commit 1cf362be8a
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
py-scripts/sta_connect.py
View File

@@ -81,16 +81,16 @@ class StaConnect(Realm):
self.desired_add_sta_flags_mask = ["wpa2_enable", "80211u_enable", "create_admin_down"]
def get_station_url(self, sta_name_=None):
if sta_name_ is None:
if not sta_name_:
raise ValueError("get_station_url wants a station name")
if self.sta_url_map is None:
if not self.sta_url_map:
self.sta_url_map = {}
for sta_name in self.station_names:
self.sta_url_map[sta_name] = "port/1/%s/%s" % (self.resource, sta_name)
return self.sta_url_map[sta_name_]
def get_upstream_url(self):
if self.upstream_url is None:
if not self.upstream_url:
self.upstream_url = "port/1/%s/%s" % (self.upstream_resource, self.upstream_port)
return self.upstream_url
@@ -109,7 +109,7 @@ class StaConnect(Realm):
def num_associated(self, bssid):
counter = 0
# print("there are %d results" % len(self.station_results))
if (self.station_results is None) or (len(self.station_results) < 1):
if not self.station_results or (len(self.station_results) < 1):
self.get_failed_result_list()
for eid, record in self.station_results.items():
# print("-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ")
@@ -145,17 +145,16 @@ class StaConnect(Realm):
@staticmethod
def add_named_flags(desired_list, command_ref):
if desired_list is None:
if not desired_list:
raise ValueError("addNamedFlags wants a list of desired flag names")
if len(desired_list) < 1:
print("addNamedFlags: empty desired list")
return 0
if (command_ref is None) or (len(command_ref) < 1):
raise ValueError("addNamedFlags: empty desired list")
if not command_ref or (len(command_ref) < 1):
raise ValueError("addNamedFlags wants a maps of flag values")
result = 0
for name in desired_list:
if (name is None) or (name == ""):
if not name:
continue
if name not in command_ref:
raise ValueError("flag %s not in map" % name)