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

lfutils: let wait_until_ports_admin_up handle multiple resources.

Browse Source 
Default to treat station list as list of EIDS, and use it's
shelf/resource info instead of using resource 1 by default.
Caller may still use resource_id=X if they wish too, and it
will work as it did previously.

Add loop timeout (default is 300 tries with 1-sec sleep, so 5+
minutes).  This keeps the method from spinning forever if port
cannot come up.

Signed-off-by: Ben Greear <greearb@candelatech.com>
This commit is contained in:
Ben Greear
2021-12-25 15:19:50 -08:00
committed by shivam
parent 5ea8ff21a7
commit cd6e6b18b2
1 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
py-json/LANforge/LFUtils.py
View File

@@ -180,6 +180,7 @@ def portUpRequest(resource_id, port_name, debug_on=False):
return port_up_request(resource_id, port_name, debug_on) return port_up_request(resource_id, port_name, debug_on)
# port_name cannot be in eid syntax in this method at this time.
def port_up_request(resource_id, port_name, debug_on=False): def port_up_request(resource_id, port_name, debug_on=False):
""" """
See http://localhost:8080/help/set_port See http://localhost:8080/help/set_port
@@ -464,22 +465,36 @@ def wait_until_ports_admin_down(resource_id=1, base_url="http://localhost:8080",
return None return None
def waitUntilPortsAdminUp(resource_id=1, base_url="http://localhost:8080", port_list=()): def waitUntilPortsAdminUp(resource_id=0, base_url="http://localhost:8080", port_list=()):
return wait_until_ports_admin_up(resource_id=resource_id, base_url=base_url, port_list=port_list) return wait_until_ports_admin_up(resource_id=resource_id, base_url=base_url, port_list=port_list)
def wait_until_ports_admin_up(resource_id=1, base_url="http://localhost:8080", port_list=(), debug_=False): def wait_until_ports_admin_up(resource_id=0, base_url="http://localhost:8080", port_list=(), debug_=False, timeout=300):
print("Waiting until ports appear admin-up...") if debug_:
print("Waiting until %s ports appear admin-up..." %(len(port_list)))
down_stations = port_list.copy() down_stations = port_list.copy()
sleep(1) port_url = "/port"
port_url = "/port/1" loops = 0
# url = /%s/%s?fields=device,down" % (resource_id, port_name) # url = /%s/%s?fields=device,down" % (resource_id, port_name)
while len(down_stations) > 0: while len(down_stations) > 0:
if (loops > timeout):
print("WARNING: Not all ports went admin up within %s+ seconds" %(timeout))
return None
down_stations = [] down_stations = []
for port_name in port_list: for port_name in port_list:
uri = "%s/%s/%s?fields=device,down" % (port_url, resource_id, port_name) eid = name_to_eid(port_name)
rid = resource_id
if (rid == 0): # TODO: this allows user to pass in resource_id, but probably should remove resource_id entirely.
rid = eid[1] # use resource-id from the eid instead.
uri = "%s/%s/%s/%s?fields=device,down" % (port_url, eid[0], rid, eid[2])
lf_r = LFRequest.LFRequest(base_url, uri, debug_=debug_) lf_r = LFRequest.LFRequest(base_url, uri, debug_=debug_)
json_response = lf_r.getAsJson() json_response = lf_r.getAsJson()
if debug_:
print("uri: %s response:\n%s" %(uri, json_response))
if json_response is None: if json_response is None:
if debug_: if debug_:
print("port %s appeared" % port_name) print("port %s appeared" % port_name)
@@ -487,8 +502,18 @@ def wait_until_ports_admin_up(resource_id=1, base_url="http://localhost:8080", p
if "interface" in json_response: if "interface" in json_response:
json_response = json_response['interface'] json_response = json_response['interface']
if json_response['down'] == "true": if json_response['down'] == "true":
if debug_:
print("waiting for port: %s to go admin up." %(port_name))
down_stations.append(port_name) down_stations.append(port_name)
else:
if debug_:
print("port %s is admin up" %(port_name))
if len(down_stations) > 0:
sleep(1) sleep(1)
loops += 1
return None return None