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

realm l3cxprofile and regression fixes

Browse Source
This commit is contained in:
Matthew Stidham
2021-02-01 16:06:07 -08:00
parent f62ee82e77
commit c98abcd7be
3 changed files with 39 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
py-json/realm.py
View File

@@ -839,8 +839,8 @@ class BaseProfile:
self.exit_on_error = False
self.debug = debug or local_realm.debug
def json_get(self, target):
return self.parent_realm.json_get(target)
def json_get(self, _req_url, debug_=False):
return self.parent_realm.json_get(_req_url, debug_=False)
def json_post(self, req_url=None, data=None, debug_=False, suppress_related_commands_=None):
return self.parent_realm.json_post(_req_url=req_url,
@@ -848,8 +848,8 @@ class BaseProfile:
suppress_related_commands_=suppress_related_commands_,
debug_=debug_)
def parse_time(self, target):
return self.parent_realm.parse_time(target)
def parse_time(self, time_string):
return self.parent_realm.parse_time(time_string)
def stopping_cx(self, name):
return self.parent_realm.stop_cx(name)
@@ -857,26 +857,23 @@ class BaseProfile:
def cleanup_cxe_prefix(self, prefix):
return self.parent_realm.cleanup_cxe_prefix(prefix)
def rm_cx(self, target):
return self.parent_realm.rm_cx(target)
def rm_cx(self, cx_name):
return self.parent_realm.rm_cx(cx_name)
def rm_endp(self, ename):
self.parent_realm.rm_endp(ename)
def rm_endp(self, ename, debug_=False, suppress_related_commands_=True):
self.parent_realm.rm_endp(ename, debug_=False, suppress_related_commands_=True)
def created_cx(self, target):
return self.parent_realm.created_cx(target)
def name_to_eid(self, eid):
return self.parent_realm.name_to_eid(eid)
def name_to_eid(self, target):
return self.parent_realm.name_to_eid(target)
def set_endp_tos(self, ename, _tos, debug_=False, suppress_related_commands_=True):
return self.parent_realm.set_endp_tos(ename, _tos, debug_=False, suppress_related_commands_=True)
def set_endp_tos(self, target):
return self.parent_realm.set_endp_tos(target)
def wait_until_endps_appear(self, these_endp, debug=False):
return self.parent_realm.wait_until_endps_appear(these_endp, debug=False)
def wait_until_endps_appear(self, target, debug=False):
return self.parent_realm.wait_until_endps_appear(target, debug=False)
def wait_until_cxs_appear(self, target, debug=False):
return self.parent_realm.wait_until_cxs_appear(target, debug=False)
def wait_until_cxs_appear(self, these_cx, debug=False):
return self.parent_realm.wait_until_cxs_appear(these_cx, debug=False)
class MULTICASTProfile(LFCliBase):

1
py-scripts/regression_test.sh
View File

@@ -140,6 +140,7 @@ function html_generator() {
.scriptdetails {
font-size: 10px;
}
</style>
</head>
<body>
<h1>Test All Scripts Results</h1>

44
py-scripts/test_ipv4_variable_time.py
View File

@@ -24,32 +24,32 @@ if 'py-json' not in sys.path:
import argparse
from LANforge.lfcli_base import LFCliBase
from LANforge import LFUtils
import realm
from realm import Realm
import time
import datetime
from realm import TestGroupProfile
class IPV4VariableTime(LFCliBase):
class IPV4VariableTime(Realm):
def __init__(self,
ssid, security, password, sta_list, name_prefix, upstream, radio,
host="localhost", port=8080, mode = 0, ap=None,
ssid=None,
security=None,
password=None,
sta_list=[],
name_prefix=None,
upstream=None,
radio=None,
host="localhost",
port=8080,
mode = 0,
ap=None,
side_a_min_rate=56, side_a_max_rate=0,
side_b_min_rate=56, side_b_max_rate=0,
number_template="00000", test_duration="5m", use_ht160=False,
_debug_on=False,
_exit_on_error=False,
_exit_on_fail=False):
super().__init__(host, port,
_local_realm = realm.Realm(lfclient_host=host,
lfclient_port=port,
debug_=_debug_on,
halt_on_error_=_exit_on_error),
_debug=_debug_on,
_halt_on_error=_exit_on_error,
_exit_on_fail=_exit_on_fail),
self.l3cxprofile = realm.L3CXProfile(lfclient_host=host,
lfclient_port=port,
local_realm=self.local_realm)
super().__init__(lfclient_host=host,
lfclient_port=port),
self.l3cxprofile = self.new_l3_cx_profile()
self.upstream = upstream
self.host = host
self.port = port
@@ -64,8 +64,8 @@ class IPV4VariableTime(LFCliBase):
self.debug = _debug_on
self.name_prefix = name_prefix
self.test_duration = test_duration
self.station_profile = self.local_realm.new_station_profile()
self.cx_profile = self.local_realm.new_l3_cx_profile()
self.station_profile = self.new_station_profile()
self.cx_profile = self.new_l3_cx_profile()
self.station_profile.lfclient_url = self.lfclient_url
self.station_profile.ssid = self.ssid
self.station_profile.ssid_pass = self.password
@@ -93,7 +93,7 @@ class IPV4VariableTime(LFCliBase):
#to-do- check here if upstream port got IP
temp_stas = self.station_profile.station_names.copy()
if self.local_realm.wait_for_ip(temp_stas):
if self.wait_for_ip(temp_stas):
self._pass("All stations got IPs")
else:
self._fail("Stations failed to get IPs")
@@ -108,7 +108,7 @@ class IPV4VariableTime(LFCliBase):
def pre_cleanup(self):
self.cx_profile.cleanup_prefix()
for sta in self.sta_list:
self.local_realm.rm_port(sta, check_exists=True)
self.rm_port(sta, check_exists=True)
def cleanup(self):
self.cx_profile.cleanup()
@@ -332,7 +332,7 @@ python3 ./test_ipv4_variable_time.py
ip_var_test.start(False, False)
try:
layer3connections=','.join([[*x.keys()][0] for x in ip_var_test.local_realm.json_get('endp')['endpoint']])
layer3connections=','.join([[*x.keys()][0] for x in ip_var_test.json_get('endp')['endpoint']])
except:
raise ValueError('Try setting the upstream port flag if your device does not have an eth1 port')
if args.col_names is not None:
@@ -348,7 +348,7 @@ python3 ./test_ipv4_variable_time.py
print(col_names)
ip_var_test.l3cxprofile.monitor(col_names=col_names,
report_file=report_f,
duration_sec=ip_var_test.local_realm.parse_time(args.test_duration).total_seconds(),
duration_sec=ip_var_test.parse_time(args.test_duration).total_seconds(),
created_cx= layer3connections,
output_format=output,
compared_report=compared_rept,