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

l3_cxprofile.py changed to is None were used == , updated exceptions

Browse Source 
Signed-off-by: Chuck SmileyRekiere <chuck.smileyrekiere@candelatech.com>
This commit is contained in:
Chuck SmileyRekiere
2021-10-27 15:41:47 -06:00
parent 0fe949e5f7
commit c15d0cbf0a
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
py-json/l3_cxprofile.py
View File

@@ -7,7 +7,6 @@ import pandas as pd
import time import time
import datetime import datetime
sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../")))
lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base")
@@ -16,7 +15,6 @@ pandas_extensions = importlib.import_module("py-json.LANforge.pandas_extensions"
port_probe = importlib.import_module("py-json.port_probe") port_probe = importlib.import_module("py-json.port_probe")
ProbePort = port_probe.ProbePort ProbePort = port_probe.ProbePort
class L3CXProfile(LFCliBase): class L3CXProfile(LFCliBase):
def __init__(self, def __init__(self,
lfclient_host, lfclient_host,
@@ -131,16 +129,17 @@ class L3CXProfile(LFCliBase):
debug=False): debug=False):
try: try:
duration_sec = self.parse_time(duration_sec).seconds duration_sec = self.parse_time(duration_sec).seconds
except: except BaseException:
if (duration_sec is None) or (duration_sec <= 1): if (duration_sec is None) or (duration_sec <= 1):
raise ValueError("L3CXProfile::monitor wants duration_sec > 1 second") raise ValueError("L3CXProfile::monitor wants duration_sec > 1 second")
if (duration_sec <= monitor_interval_ms): if (duration_sec <= monitor_interval_ms):
raise ValueError("L3CXProfile::monitor wants duration_sec > monitor_interval") raise ValueError("L3CXProfile::monitor wants duration_sec > monitor_interval")
if report_file == None: if report_file is None:
raise ValueError("Monitor requires an output file to be defined") raise ValueError("Monitor requires an output file to be defined")
if systeminfopath == None: if systeminfopath is None:
raise ValueError("Monitor requires a system info path to be defined") raise ValueError("Monitor requires a system info path to be defined")
if created_cx == None: if created_cx is None:
raise ValueError("Monitor needs a list of Layer 3 connections") raise ValueError("Monitor needs a list of Layer 3 connections")
if (monitor_interval_ms is None) or (monitor_interval_ms < 1): if (monitor_interval_ms is None) or (monitor_interval_ms < 1):
raise ValueError("L3CXProfile::monitor wants monitor_interval >= 1 second") raise ValueError("L3CXProfile::monitor wants monitor_interval >= 1 second")
@@ -254,7 +253,7 @@ class L3CXProfile(LFCliBase):
layer3_alias.append(port) layer3_alias.append(port)
try: try:
layer3['alias'] = layer3_alias layer3['alias'] = layer3_alias
except: except BaseException:
print("The Stations or Connection on LANforge did not match expected, \ print("The Stations or Connection on LANforge did not match expected, \
Check if LANForge initial state correct or delete/cleanup corrects") Check if LANForge initial state correct or delete/cleanup corrects")
exit(1) exit(1)
@@ -500,7 +499,7 @@ class L3CXProfile(LFCliBase):
self.local_realm.json_post(url, data, debug_=debug_, self.local_realm.json_post(url, data, debug_=debug_,
suppress_related_commands_=suppress_related_commands) suppress_related_commands_=suppress_related_commands)
if tos != None: if tos is not None:
self.local_realm.set_endp_tos(endp_a_name, tos) self.local_realm.set_endp_tos(endp_a_name, tos)
self.local_realm.set_endp_tos(endp_b_name, tos) self.local_realm.set_endp_tos(endp_b_name, tos)