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

realm.py: Improve rm_port and port_exists debugging

Browse Source 
Signed-off-by: Matthew Stidham <stidmatt@gmail.com>
This commit is contained in:
Matthew Stidham
2021-11-16 18:47:07 -08:00
parent ad0d80dab1
commit 60d547a7ec
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
py-json/realm.py
View File

@@ -224,14 +224,15 @@ class Realm(LFCliBase):
port_list=sta_list, port_list=sta_list,
debug=debug_) debug=debug_)
def rm_port(self, port_eid, check_exists=True, debug_=False): def rm_port(self, port_eid, check_exists=True, debug_=None):
if port_eid is None: if port_eid is None:
raise ValueError("realm.rm_port: want a port eid like 1.1.eth1") raise ValueError("realm.rm_port: want a port eid like 1.1.eth1")
debug_ |= self.debug if debug_ is None:
debug_ = self.debug
req_url = "/cli-json/rm_vlan" req_url = "/cli-json/rm_vlan"
eid = self.name_to_eid(port_eid) eid = self.name_to_eid(port_eid)
if check_exists: if check_exists:
if not self.port_exists(port_eid): if not self.port_exists(port_eid, debug=debug_):
return False return False
data = { data = {
@@ -239,13 +240,16 @@ class Realm(LFCliBase):
"resource": eid[1], "resource": eid[1],
"port": eid[2] "port": eid[2]
} }
rsp = self.json_post(req_url, data, debug_=debug_) self.json_post(req_url, data, debug_=debug_)
return True return True
def port_exists(self, port_eid): def port_exists(self, port_eid, debug=None):
if debug is None:
debug = self.debug
eid = self.name_to_eid(port_eid) eid = self.name_to_eid(port_eid)
current_stations = self.json_get("/port/%s/%s/%s?fields=alias" % (eid[0], eid[1], eid[2])) current_stations = self.json_get("/port/%s/%s/%s?fields=alias" % (eid[0], eid[1], eid[2]),
if not current_stations is None: debug_=debug)
if current_stations is not None:
return True return True
return False return False