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

realm.py: refactorings/improvements:

Browse Source 
- changes super() refs to self
- adds debug output
- find_ports_like now has way to specify desired fields, single resource and debug
This commit is contained in:
Jed Reynolds
2020-06-04 22:54:33 -07:00
parent ae014c3eeb
commit fe5006edeb
1 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
py-json/realm.py
View File

@@ -11,11 +11,10 @@ from LANforge import lfcli_base
from LANforge.lfcli_base import LFCliBase from LANforge.lfcli_base import LFCliBase
class Realm(LFCliBase): class Realm(LFCliBase):
def __init__(self, lfclient_host="localhost", lfclient_port=8080, debug=False): def __init__(self, lfclient_host="localhost", lfclient_port=8080, debug=True):
super().__init__(lfclient_host, lfclient_port, debug, _halt_on_error=True) super().__init__(lfclient_host, lfclient_port, debug, _halt_on_error=True)
self.lfclient_url = "http://%s:%s" % (lfclient_host, lfclient_port) self.lfclient_url = "http://%s:%s" % (lfclient_host, lfclient_port)
super().check_connect() self.check_connect()
# Returns json response from webpage of all layer 3 cross connects # Returns json response from webpage of all layer 3 cross connects
def cx_list(self): def cx_list(self):
@@ -83,30 +82,40 @@ class Realm(LFCliBase):
LFUtils.removePort(hunks[0], hunks[1], self.lfclient_url) LFUtils.removePort(hunks[0], hunks[1], self.lfclient_url)
# Searches for ports that match a given pattern and returns a list of names # Searches for ports that match a given pattern and returns a list of names
def find_ports_like(self, pattern=""): def find_ports_like(self, pattern="", _fields="_links,alias,device,port+type", resource=0, debug_=False):
response = super().json_get("/port/list?fields=_links,alias,device,port+type") if resource == 0:
alias_map = LFUtils.portListToAliasMap(response) url = "/port/1/list?fields=%s" % _fields
#pprint(alias_map) else:
url = "/port/1/%s/list?fields=%s" % (resource, _fields)
response = self.json_get(url)
if debug_:
print("###### find_ports_like r:%s, u:%s #################" % (resource, url))
pprint(response)
alias_map = LFUtils.portListToAliasMap(response, debug_=debug_)
if debug_:
pprint(alias_map)
prelim_map = {} prelim_map = {}
matched_map = {} matched_map = {}
for name,record in alias_map.items(): for name,record in alias_map.items():
try: try:
#print("- prelim - - - - - - - - - - - - - - - - - - -") if debug_:
#pprint(record) print("- prelim - - - - - - - - - - - - - - - - - - -")
pprint(record)
if (record["port type"] == "WIFI-STA"): if (record["port type"] == "WIFI-STA"):
prelim_map[name] = record prelim_map[name] = record
except Exception as x: except Exception as x:
super().error(x) self.error(x)
prefix = "" prefix = ""
try: try:
if pattern.find("+") > 0: if pattern.find("+") > 0:
match = re.search(r"^([^+]+)[+]$", pattern) match = re.search(r"^([^+]+)[+]$", pattern)
if match.group(1): if match.group(1):
#print("name:", port_name, " Group 1: ",match.group(1))
prefix = match.group(1) prefix = match.group(1)
for port_eid,record in prelim_map.items(): for port_eid,record in prelim_map.items():
if debug_:
print("name:", port_eid, " Group 1: ",match.group(1))
if port_eid.find(prefix) >= 0: if port_eid.find(prefix) >= 0:
matched_map[port_eid] = record matched_map[port_eid] = record
@@ -114,7 +123,8 @@ class Realm(LFCliBase):
match = re.search(r"^([^\*]+)[\*]$", pattern) match = re.search(r"^([^\*]+)[\*]$", pattern)
if match.group(1): if match.group(1):
prefix = match.group(1) prefix = match.group(1)
#print("group 1: ",prefix) if debug_:
print("group 1: ",prefix)
for port_eid,record in prelim_map.items(): for port_eid,record in prelim_map.items():
if port_eid.find(prefix) >= 0: if port_eid.find(prefix) >= 0:
matched_map[port_eid] = record matched_map[port_eid] = record
@@ -122,9 +132,10 @@ class Realm(LFCliBase):
elif pattern.find("[") > 0: elif pattern.find("[") > 0:
match = re.search(r"^([^\[]+)\[(\d+)\.\.(\d+)\]$", pattern) match = re.search(r"^([^\[]+)\[(\d+)\.\.(\d+)\]$", pattern)
if match.group(0): if match.group(0):
#print("[group1]: ", match.group(1)) if debug_:
#print("[group2]: ", match.group(2)) print("[group1]: ", match.group(1))
#print("[group3]: ", match.group(3)) print("[group2]: ", match.group(2))
print("[group3]: ", match.group(3))
prefix = match.group(1) prefix = match.group(1)
for port_eid,record in prelim_map.items(): for port_eid,record in prelim_map.items():
if port_eid.find(prefix) >= 0: if port_eid.find(prefix) >= 0:
@@ -133,7 +144,7 @@ class Realm(LFCliBase):
#print("%s: suffix[%s] between %s:%s" % (port_name, port_name, match.group(2), match.group(3)) #print("%s: suffix[%s] between %s:%s" % (port_name, port_name, match.group(2), match.group(3))
matched_map[port_eid] = record matched_map[port_eid] = record
except ValueError as e: except ValueError as e:
super().error(e) self.error(e)
return matched_map return matched_map
@@ -142,7 +153,7 @@ class Realm(LFCliBase):
return station_prof return station_prof
def new_cx_profile(self): def new_cx_profile(self):
cx_prof = CXProfile(self.lfclient_url, debug=self.debugOn) cx_prof = CXProfile(lfclient_host=self.lfjson_host, lfclient_port=self.lfjson_port, debug=self.debugOn)
return cx_prof return cx_prof
class CXProfile: class CXProfile:
@@ -281,7 +292,7 @@ class StationProfile:
if (param_name is None) or (param_name == ""): if (param_name is None) or (param_name == ""):
return return
if command_name not in self.COMMANDS: if command_name not in self.COMMANDS:
super().error("Command name name [%s] not defined in %s" % (command_name, self.COMMANDS)) self.error("Command name name [%s] not defined in %s" % (command_name, self.COMMANDS))
return return
if command_name == "add_sta": if command_name == "add_sta":
self.add_sta_data[param_name] = param_value self.add_sta_data[param_name] = param_value