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

vr_profile2: Remove invalid comparisons

Browse Source 
Signed-off-by: Matthew Stidham <stidmatt@gmail.com>
This commit is contained in:
Matthew Stidham
2021-11-16 11:08:12 -08:00
parent b2a9200511
commit 357459f3a9
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
py-json/vr_profile2.py
View File

@@ -74,7 +74,7 @@ class VRProfile(BaseProfile):
def vr_eid_to_url(self, eid_str=None, debug=False): def vr_eid_to_url(self, eid_str=None, debug=False):
debug |= self.debug debug |= self.debug
if (eid_str is None) or ("" == eid_str) or (eid_str.index(".") < 1): if (eid_str is None) or (eid_str == "") or (eid_str.index(".") < 1):
raise ValueError("vr_eid_to_url cannot read eid[%s]" % eid_str) raise ValueError("vr_eid_to_url cannot read eid[%s]" % eid_str)
hunks = eid_str.split(".") hunks = eid_str.split(".")
if len(hunks) > 3: if len(hunks) > 3:
@@ -111,7 +111,7 @@ class VRProfile(BaseProfile):
resource=1, resource=1,
debug=False): debug=False):
debug |= self.debug debug |= self.debug
if (resource is None) or (resource == 0) or ("" == resource): if (resource is None) or (resource == 0) or (resource == ""):
raise ValueError("resource needs to be a number greater than 1") raise ValueError("resource needs to be a number greater than 1")
router_map = self.router_list(resource=resource, debug=debug) router_map = self.router_list(resource=resource, debug=debug)
@@ -334,9 +334,9 @@ class VRProfile(BaseProfile):
:return: True if area is inside listed virtual router(s) :return: True if area is inside listed virtual router(s)
""" """
debug |= self.debug debug |= self.debug
if (resource is None) or (resource == 0) or ("" == resource): if (resource is None) or (resource == 0) or (resource == ""):
raise ValueError("resource needs to be a number greater than 1") raise ValueError("resource needs to be a number greater than 1")
if (vrcx_rect is None) or type(vrcx_rect ) or ("" == resource): if (vrcx_rect is None) or type(vrcx_rect) or (resource == ""):
raise ValueError("resource needs to be a number greater than 1") raise ValueError("resource needs to be a number greater than 1")
router_list = self.router_list(resource=resource, debug=debug) router_list = self.router_list(resource=resource, debug=debug)
#router_list = self.json_get("/vr/1/%s/%s?fields=eid,x,y,height,width") #router_list = self.json_get("/vr/1/%s/%s?fields=eid,x,y,height,width")