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

lanforge_api.py: removes typing subscripts not present in python 3.7.7

Browse Source 
new flag for add_sta_flags

Signed-off-by: Jed Reynolds <jed@bitratchet.com>
This commit is contained in:
Jed Reynolds
2021-11-04 00:10:27 -07:00
parent 59b18ea38f
commit 189da24e6f
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lanforge_client/lanforge_api.py
View File

@@ -106,7 +106,6 @@ def _now_sec() -> int:
return round(time.time() * 1000 * 1000) return round(time.time() * 1000 * 1000)
def default_proxies() -> dict: def default_proxies() -> dict:
return { return {
# 'http': 'http://example.com', # 'http': 'http://example.com',
@@ -206,7 +205,6 @@ def print_diagnostics(url_: str = None,
exit(1) exit(1)
class BaseLFJsonRequest: class BaseLFJsonRequest:
"""----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- """----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- -----
Perform HTTP get/post/put/delete with extensions specific to LANforge JSON Perform HTTP get/post/put/delete with extensions specific to LANforge JSON
@@ -414,10 +412,10 @@ class BaseLFJsonRequest:
connection_timeout_sec: float = None, connection_timeout_sec: float = None,
max_timeout_sec: float = None, max_timeout_sec: float = None,
die_on_error: bool = False, die_on_error: bool = False,
errors_warnings: list[str] = None, errors_warnings: list = None, # p3.9 list[str]
response_json_list: list = None, response_json_list: list = None,
method_: str = 'POST', method_: str = 'POST',
session_id_: str = "") -> Optional[HTTPResponse]: session_id_: str = "") -> Optional: # p3.9 Optional[HTTPResponse]
""" """
:param url: URL to post to :param url: URL to post to
@@ -442,7 +440,7 @@ class BaseLFJsonRequest:
% (self.session_id, self.session_instance.get_session_id())) % (self.session_id, self.session_instance.get_session_id()))
if die_on_error: if die_on_error:
exit(1) exit(1)
responses: list[HTTPResponse] = [] responses: list = [] # p3.9 list[HTTPResponse]
url = self.get_corrected_url(url) url = self.get_corrected_url(url)
self.logger.by_method("url: "+url) self.logger.by_method("url: "+url)
if (post_data is not None) and (post_data is not self.No_Data): if (post_data is not None) and (post_data is not self.No_Data):
@@ -580,7 +578,7 @@ class BaseLFJsonRequest:
max_timeout_sec: float = None, max_timeout_sec: float = None,
errors_warnings: list = None, errors_warnings: list = None,
die_on_error: bool = False, die_on_error: bool = False,
response_json_list: list = None) -> Optional[HTTPResponse]: response_json_list: list = None) -> Optional: # Optional[HTTPResponse]
if not url: if not url:
raise ValueError("json_put requires url") raise ValueError("json_put requires url")
return self.json_post(url=url, return self.json_post(url=url,
@@ -627,7 +625,7 @@ class BaseLFJsonRequest:
debug: bool = False, debug: bool = False,
die_on_error: bool = False, die_on_error: bool = False,
method_: str = 'GET', method_: str = 'GET',
connection_timeout_sec: int = None) -> Optional[HTTPResponse]: connection_timeout_sec: int = None) -> Optional: # Optional[HTTPResponse]
""" """
Makes a HTTP GET request with specified timeout. Makes a HTTP GET request with specified timeout.
:param url: Fully qualified URL to request :param url: Fully qualified URL to request
@@ -658,7 +656,7 @@ class BaseLFJsonRequest:
if connection_timeout_sec: if connection_timeout_sec:
myrequest.timeout = connection_timeout_sec myrequest.timeout = connection_timeout_sec
myresponses: list[HTTPResponse] = [] myresponses: list = [] # list[HTTPResponse]
try: try:
myresponses.append(request.urlopen(myrequest)) myresponses.append(request.urlopen(myrequest))
return myresponses[0] return myresponses[0]
@@ -3184,6 +3182,7 @@ class LFJsonCommand(JsonCommand):
p_8021x_radius = 0x2000000 # Use 802.1x (RADIUS for AP). p_8021x_radius = 0x2000000 # Use 802.1x (RADIUS for AP).
create_admin_down = 0x1000000000 # Station should be created admin-down. create_admin_down = 0x1000000000 # Station should be created admin-down.
custom_conf = 0x20 # Use Custom wpa_supplicant config file. custom_conf = 0x20 # Use Custom wpa_supplicant config file.
disable_obss_scan = 0x400000000000 # Disable OBSS SCAN feature in supplicant.
disable_ofdma = 0x200000000000 # Disable OFDMA mode disable_ofdma = 0x200000000000 # Disable OFDMA mode
disable_twt = 0x100000000000 # Disable TWT mode disable_twt = 0x100000000000 # Disable TWT mode
disable_fast_reauth = 0x200000000 # Disable fast_reauth option for virtual stations. disable_fast_reauth = 0x200000000 # Disable fast_reauth option for virtual stations.