From 6166a9cc72032b66d281c50fbefca59a2268a511 Mon Sep 17 00:00:00 2001
From: Matthew Stidham <stidmatt@protonmail.com>
Date: Wed, 17 Mar 2021 18:32:25 -0700
Subject: [PATCH] Fix fileio and qvlan errors

Signed-off-by: Matthew Stidham <stidmatt@protonmail.com>
---
 py-json/fio_endp_profile.py   |  2 +-
 py-scripts/regression_test.sh | 10 +++++-----
 py-scripts/test_fileio.py     |  6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/py-json/fio_endp_profile.py b/py-json/fio_endp_profile.py
index 17279121..e9495a78 100644
--- a/py-json/fio_endp_profile.py
+++ b/py-json/fio_endp_profile.py
@@ -12,7 +12,7 @@ class FIOEndpProfile(LFCliBase):
     """
 
     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.fs_type = "fe_nfsv4"
         self.min_rw_size = 128 * 1024
diff --git a/py-scripts/regression_test.sh b/py-scripts/regression_test.sh
index 267216f6..080892c2 100755
--- a/py-scripts/regression_test.sh
+++ b/py-scripts/regression_test.sh
@@ -13,10 +13,10 @@ fi
 HOMEPATH=$(realpath ~)
 
 if [[ ${#1} -gt 0 ]]; then
-  if [[ ${#2} -gt 0 ]]; then
-    SSID_USED=$1
-    PASSWD_USED=$2
-    SECURITY=$3
+  SSID_USED=$1
+  PASSWD_USED=$2
+  SECURITY=$3
+  if [[ ${#4} -gt 0 ]]; then
     MGR=$4
     # FILENAME=$5 # this appears unused
   elif [ -f "$1" ]; then
@@ -163,7 +163,7 @@ else
       "./create_macvlan.py --radio wiphy1 --macvlan_parent eth1 --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_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 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"
diff --git a/py-scripts/test_fileio.py b/py-scripts/test_fileio.py
index bd0dc1e0..80e6b21d 100755
--- a/py-scripts/test_fileio.py
+++ b/py-scripts/test_fileio.py
@@ -35,6 +35,7 @@ import realm
 import time
 import datetime
 import pprint
+import os
 
 
 class FileIOTest(LFCliBase):
@@ -713,8 +714,8 @@ Generic command layout:
     else:
         dhcp = True
     if 'nfs' in args.fs_type:
-        if [[ $(mount -l | grep nfs) ]]; then
-            pass
+        if len(os.popen('mount -l | grep nfs').read()) > 0:
+            print('Success')
         else:
             raise ValueError("No nfs share is mounted")
     else:
@@ -730,7 +731,6 @@ Generic command layout:
                          test_duration=args.test_duration,
                          upstream_port=args.upstream_port,
                          _debug_on=args.debug,
-
                          macvlan_parent=args.macvlan_parent,
                          use_macvlans=args.use_macvlans,
                          first_mvlan_ip=args.first_mvlan_ip,