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

Fix fileio and qvlan errors

Browse Source 
Signed-off-by: Matthew Stidham <stidmatt@protonmail.com>
This commit is contained in:
Matthew Stidham
2021-03-17 18:32:25 -07:00
parent e4cd74190a
commit 6166a9cc72
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
py-json/fio_endp_profile.py
View File

@@ -12,7 +12,7 @@ class FIOEndpProfile(LFCliBase):
""" """
def __init__(self, lfclient_host, lfclient_port, local_realm, io_direction="write", debug_=False): def __init__(self, lfclient_host, lfclient_port, local_realm, io_direction="write", debug_=False):
super().__init__(lfclient_host, lfclient_port, debug_, _halt_on_error=True) super().__init__(lfclient_host, lfclient_port, debug_)
self.local_realm = local_realm self.local_realm = local_realm
self.fs_type = "fe_nfsv4" self.fs_type = "fe_nfsv4"
self.min_rw_size = 128 * 1024 self.min_rw_size = 128 * 1024

4
py-scripts/regression_test.sh
View File

@@ -13,10 +13,10 @@ fi
HOMEPATH=$(realpath ~) HOMEPATH=$(realpath ~)
if [[ ${#1} -gt 0 ]]; then if [[ ${#1} -gt 0 ]]; then
if [[ ${#2} -gt 0 ]]; then
SSID_USED=$1 SSID_USED=$1
PASSWD_USED=$2 PASSWD_USED=$2
SECURITY=$3 SECURITY=$3
if [[ ${#4} -gt 0 ]]; then
MGR=$4 MGR=$4
# FILENAME=$5 # this appears unused # FILENAME=$5 # this appears unused
elif [ -f "$1" ]; then elif [ -f "$1" ]; then
@@ -163,7 +163,7 @@ else
"./create_macvlan.py --radio wiphy1 --macvlan_parent eth1 --debug" "./create_macvlan.py --radio wiphy1 --macvlan_parent eth1 --debug"
"./create_station.py --radio wiphy1 --ssid $SSID_USED --passwd $PASSWD_USED --security $SECURITY --debug" "./create_station.py --radio wiphy1 --ssid $SSID_USED --passwd $PASSWD_USED --security $SECURITY --debug"
"./create_vap.py --radio wiphy1 --ssid $SSID_USED --passwd $PASSWD_USED --security $SECURITY --debug" "./create_vap.py --radio wiphy1 --ssid $SSID_USED --passwd $PASSWD_USED --security $SECURITY --debug"
"./create_qvlan.py --radio wiphy1 " "./create_qvlan.py --radio wiphy1 --qvlan_parent eth1"
"./wlan_capacity_calculator.py -sta 11abg -t Voice -p 48 -m 106 -e WEP -q Yes -b 1 2 5.5 11 -pre Long -s N/A -co G.711 -r Yes -c Yes" "./wlan_capacity_calculator.py -sta 11abg -t Voice -p 48 -m 106 -e WEP -q Yes -b 1 2 5.5 11 -pre Long -s N/A -co G.711 -r Yes -c Yes"
"./wlan_capacity_calculator.py -sta 11n -t Voice -d 17 -ch 40 -gu 800 -high 9 -e WEP -q Yes -ip 5 -mc 42 -b 6 9 12 24 -m 1538 -co G.729 -pl Greenfield -cw 15 -r Yes -c Yes" "./wlan_capacity_calculator.py -sta 11n -t Voice -d 17 -ch 40 -gu 800 -high 9 -e WEP -q Yes -ip 5 -mc 42 -b 6 9 12 24 -m 1538 -co G.729 -pl Greenfield -cw 15 -r Yes -c Yes"
"./wlan_capacity_calculator.py -sta 11ac -t Voice -d 9 -spa 3 -ch 20 -gu 800 -high 1 -e TKIP -q Yes -ip 3 -mc 0 -b 6 12 24 54 -m 1518 -co Greenfield -cw 15 -rc Yes" "./wlan_capacity_calculator.py -sta 11ac -t Voice -d 9 -spa 3 -ch 20 -gu 800 -high 1 -e TKIP -q Yes -ip 3 -mc 0 -b 6 12 24 54 -m 1518 -co Greenfield -cw 15 -rc Yes"

6
py-scripts/test_fileio.py
View File

@@ -35,6 +35,7 @@ import realm
import time import time
import datetime import datetime
import pprint import pprint
import os
class FileIOTest(LFCliBase): class FileIOTest(LFCliBase):
@@ -713,8 +714,8 @@ Generic command layout:
else: else:
dhcp = True dhcp = True
if 'nfs' in args.fs_type: if 'nfs' in args.fs_type:
if [[ $(mount -l | grep nfs) ]]; then if len(os.popen('mount -l | grep nfs').read()) > 0:
pass print('Success')
else: else:
raise ValueError("No nfs share is mounted") raise ValueError("No nfs share is mounted")
else: else:
@@ -730,7 +731,6 @@ Generic command layout:
test_duration=args.test_duration, test_duration=args.test_duration,
upstream_port=args.upstream_port, upstream_port=args.upstream_port,
_debug_on=args.debug, _debug_on=args.debug,
macvlan_parent=args.macvlan_parent, macvlan_parent=args.macvlan_parent,
use_macvlans=args.use_macvlans, use_macvlans=args.use_macvlans,
first_mvlan_ip=args.first_mvlan_ip, first_mvlan_ip=args.first_mvlan_ip,