From 09de774dcc1a5abc1c8f3a00fdb039aa3c522f52 Mon Sep 17 00:00:00 2001
From: Manel Caro <mcaro@iseebcn.com>
Date: Wed, 4 Mar 2020 17:46:36 +0100
Subject: SOPA Initial Commit

---
 test-cli/test/tests/qethernet.py | 78 +++++++++++++++++++---------------------
 1 file changed, 36 insertions(+), 42 deletions(-)

(limited to 'test-cli/test/tests/qethernet.py')

diff --git a/test-cli/test/tests/qethernet.py b/test-cli/test/tests/qethernet.py
index 2ac447c..be984f5 100644
--- a/test-cli/test/tests/qethernet.py
+++ b/test-cli/test/tests/qethernet.py
@@ -1,57 +1,51 @@
-from test.helpers.syscmd import SysCommand
 import unittest
-
+import sh
+import ex
 
 class Qethernet(unittest.TestCase):
     __sip = None
-    __raw_out = None
-    __MB_req = None
-    __MB_real = None
-    __BW_real = None
-    __dat_list = None
+    __numbytestx = None
     __bind = None
     __OKBW = None
 
-    def __init__(self, testname, testfunc, sip = None, OKBW=100, bind=None):
+    def __init__(self, testname, testfunc, varlist):
         super(Qethernet, self).__init__(testfunc)
-        if sip is not None:
-            self.__sip = sip
-        if sip is not None:
-            self.__bind = bind
-        self.__MB_req = '10'
-        self.__OKBW=OKBW
+        if "sip" in varlist:
+            self.__sip = varlist["sip"]
+        else:
+            raise Exception('sip param inside Qethernet have been be defined')
+        if "bind" in varlist:
+            self.__bind = varlist["bind"]
+        else:
+            self.__bind = None
+        if "OKBW" in varlist:
+            self.__OKBW = varlist["OKBW"]
+        else:
+            raise Exception('OKBW param inside Qethernet must be defined')
+        self.__numbytestx = "10M"
         self._testMethodDoc = testname
 
     def execute(self):
-        print
+        # execute iperf command against the server
         if self.__bind is None:
-            str_cmd = "iperf -c {} -x CMSV -n {}M".format(self.__sip, self.__MB_req)
+            p = sh.iperf("-c", self.__sip, "-x", "CMSV", "-n", self.__numbytestx, "-f", "m")
         else:
-            str_cmd = "iperf -c {} -x CMSV -n {}M -B {}".format(self.__sip, self.__MB_req, self.__bind)
-        iperf_command = SysCommand("iperf", str_cmd)
-        if iperf_command.execute() == 0:
-            self.__raw_out = iperf_command.getOutput()
-            if self.__raw_out == "":
-                return -1
-            lines = iperf_command.getOutput().splitlines()
-            dat = lines[1]
-            dat = dat.decode('ascii')
-            dat_list = dat.split( )
-            for d in dat_list:
-                a = dat_list.pop(0)
-                if a == "sec":
-                    break
-            self.__MB_real = dat_list[0]
-            self.__BW_real = dat_list[2]
-            self.__dat_list = dat_list
-            #print(self.__MB_real)
-            #print(self.__BW_real)
-            self.failUnless(float(self.__BW_real)>float(self.__OKBW)*0.9,"failed: speed is lower than spected. Speed(MB/s)" + str(self.__BW_real))
+            p = sh.iperf("-c", self.__sip, "-x", "CMSV", "-n", self.__numbytestx, "-f", "m", "-B", self.__bind)
+        #check if it was executed succesfully
+        if p.exit_code == 0:
+            if p.stdout == "":
+                self.fail("failed: error executing iperf command")
+            # analyze output string
+            # split by lines    
+            lines = p.stdout.splitlines()
+            # get first line
+            dat = lines[1].decode('ascii')
+            # search for the BW value
+            a = re.search("\d+(\.\d)? Mbits/sec",dat)
+            b = a.group().split( )
+            BWreal = b[0]
+
+            # check if BW is in the expected range
+            self.failUnless(float(BWreal)>float(self.__OKBW)*0.9,"failed: speed is lower than spected. Speed(MB/s)" + str(BWreal))
         else:
             self.fail("failed: could not complete iperf command")
-
-    def get_Total_MB(self):
-        return self.__MB_real;
-
-    def get_Total_BW(self):
-        return self.__MB_real;
-- 
cgit v1.1


From a615dac03a9ea7897bf3947ba8d31278b2cea121 Mon Sep 17 00:00:00 2001
From: Hector Fernandez <hector@iatec.biz>
Date: Thu, 5 Mar 2020 16:29:31 +0100
Subject: Modify tests.

---
 test-cli/test/tests/qethernet.py | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

(limited to 'test-cli/test/tests/qethernet.py')

diff --git a/test-cli/test/tests/qethernet.py b/test-cli/test/tests/qethernet.py
index be984f5..22d796c 100644
--- a/test-cli/test/tests/qethernet.py
+++ b/test-cli/test/tests/qethernet.py
@@ -1,12 +1,14 @@
 import unittest
 import sh
-import ex
+import re
+
 
 class Qethernet(unittest.TestCase):
     __sip = None
     __numbytestx = None
     __bind = None
     __OKBW = None
+    __port = None
 
     def __init__(self, testname, testfunc, varlist):
         super(Qethernet, self).__init__(testfunc)
@@ -22,16 +24,21 @@ class Qethernet(unittest.TestCase):
             self.__OKBW = varlist["OKBW"]
         else:
             raise Exception('OKBW param inside Qethernet must be defined')
+        if "port" in varlist:
+            self.__port = varlist["port"]
+        else:
+            raise Exception('port param inside Qethernet must be defined')
         self.__numbytestx = "10M"
         self._testMethodDoc = testname
 
     def execute(self):
         # execute iperf command against the server
         if self.__bind is None:
-            p = sh.iperf("-c", self.__sip, "-x", "CMSV", "-n", self.__numbytestx, "-f", "m")
+            p = sh.iperf("-c", self.__sip, "-x", "CMSV", "-n", self.__numbytestx, "-f", "m", "-p", self.__port)
         else:
-            p = sh.iperf("-c", self.__sip, "-x", "CMSV", "-n", self.__numbytestx, "-f", "m", "-B", self.__bind)
-        #check if it was executed succesfully
+            p = sh.iperf("-c", self.__sip, "-x", "CMSV", "-n", self.__numbytestx, "-f", "m", "-p", self.__port, "-B",
+                         self.__bind)
+        # check if it was executed succesfully
         if p.exit_code == 0:
             if p.stdout == "":
                 self.fail("failed: error executing iperf command")
@@ -41,11 +48,12 @@ class Qethernet(unittest.TestCase):
             # get first line
             dat = lines[1].decode('ascii')
             # search for the BW value
-            a = re.search("\d+(\.\d)? Mbits/sec",dat)
-            b = a.group().split( )
-            BWreal = b[0]
+            a = re.search("\d+(\.\d)? Mbits/sec", dat)
+            b = a.group().split()
+            bwreal = b[0]
 
             # check if BW is in the expected range
-            self.failUnless(float(BWreal)>float(self.__OKBW)*0.9,"failed: speed is lower than spected. Speed(MB/s)" + str(BWreal))
+            self.failUnless(float(bwreal) > float(self.__OKBW) * 0.9,
+                            "failed: speed is lower than spected. Speed(MB/s)" + str(bwreal))
         else:
             self.fail("failed: could not complete iperf command")
-- 
cgit v1.1


From 98d40cecc9818360984188755e455aa53933aab0 Mon Sep 17 00:00:00 2001
From: Hector Fernandez <hector@iatec.biz>
Date: Fri, 6 Mar 2020 09:38:18 +0100
Subject: changed parameter names of tests

---
 test-cli/test/tests/qethernet.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'test-cli/test/tests/qethernet.py')

diff --git a/test-cli/test/tests/qethernet.py b/test-cli/test/tests/qethernet.py
index 22d796c..adee67f 100644
--- a/test-cli/test/tests/qethernet.py
+++ b/test-cli/test/tests/qethernet.py
@@ -4,26 +4,26 @@ import re
 
 
 class Qethernet(unittest.TestCase):
-    __sip = None
+    __serverip = None
     __numbytestx = None
     __bind = None
-    __OKBW = None
+    __bwexpected = None
     __port = None
 
     def __init__(self, testname, testfunc, varlist):
         super(Qethernet, self).__init__(testfunc)
-        if "sip" in varlist:
-            self.__sip = varlist["sip"]
+        if "serverip" in varlist:
+            self.__serverip = varlist["serverip"]
         else:
             raise Exception('sip param inside Qethernet have been be defined')
         if "bind" in varlist:
             self.__bind = varlist["bind"]
         else:
             self.__bind = None
-        if "OKBW" in varlist:
-            self.__OKBW = varlist["OKBW"]
+        if "bwexpected" in varlist:
+            self.__bwexpected = varlist["bwexpected"]
         else:
-            raise Exception('OKBW param inside Qethernet must be defined')
+            raise Exception('bwexpected param inside Qethernet must be defined')
         if "port" in varlist:
             self.__port = varlist["port"]
         else:
@@ -34,9 +34,9 @@ class Qethernet(unittest.TestCase):
     def execute(self):
         # execute iperf command against the server
         if self.__bind is None:
-            p = sh.iperf("-c", self.__sip, "-x", "CMSV", "-n", self.__numbytestx, "-f", "m", "-p", self.__port)
+            p = sh.iperf("-c", self.__serverip, "-x", "CMSV", "-n", self.__numbytestx, "-f", "m", "-p", self.__port)
         else:
-            p = sh.iperf("-c", self.__sip, "-x", "CMSV", "-n", self.__numbytestx, "-f", "m", "-p", self.__port, "-B",
+            p = sh.iperf("-c", self.__serverip, "-x", "CMSV", "-n", self.__numbytestx, "-f", "m", "-p", self.__port, "-B",
                          self.__bind)
         # check if it was executed succesfully
         if p.exit_code == 0:
@@ -53,7 +53,7 @@ class Qethernet(unittest.TestCase):
             bwreal = b[0]
 
             # check if BW is in the expected range
-            self.failUnless(float(bwreal) > float(self.__OKBW) * 0.9,
+            self.failUnless(float(bwreal) > float(self.__bwexpected) * 0.9,
                             "failed: speed is lower than spected. Speed(MB/s)" + str(bwreal))
         else:
             self.fail("failed: could not complete iperf command")
-- 
cgit v1.1


From 9f07a57d89a927aa9b172c1bf20c7ab563658c73 Mon Sep 17 00:00:00 2001
From: Hector Fernandez <hector@iatec.biz>
Date: Fri, 6 Mar 2020 12:46:27 +0100
Subject: Fixed multiple errors.

---
 test-cli/test/tests/qethernet.py | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'test-cli/test/tests/qethernet.py')

diff --git a/test-cli/test/tests/qethernet.py b/test-cli/test/tests/qethernet.py
index adee67f..1d4c9bc 100644
--- a/test-cli/test/tests/qethernet.py
+++ b/test-cli/test/tests/qethernet.py
@@ -9,8 +9,11 @@ class Qethernet(unittest.TestCase):
     __bind = None
     __bwexpected = None
     __port = None
+    params = None
 
+    #varlist content: serverip, bwexpected, port, (optional)bind
     def __init__(self, testname, testfunc, varlist):
+        self.params = varlist
         super(Qethernet, self).__init__(testfunc)
         if "serverip" in varlist:
             self.__serverip = varlist["serverip"]
-- 
cgit v1.1


From f86887baef80509460da0bff8f48b2900a627282 Mon Sep 17 00:00:00 2001
From: Hector Fernandez <hector@iatec.biz>
Date: Mon, 13 Apr 2020 09:49:51 +0200
Subject: Added new DB functions. Added Qrreader.py file.

---
 test-cli/test/tests/qethernet.py | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'test-cli/test/tests/qethernet.py')

diff --git a/test-cli/test/tests/qethernet.py b/test-cli/test/tests/qethernet.py
index 1d4c9bc..027931c 100644
--- a/test-cli/test/tests/qethernet.py
+++ b/test-cli/test/tests/qethernet.py
@@ -19,10 +19,6 @@ class Qethernet(unittest.TestCase):
             self.__serverip = varlist["serverip"]
         else:
             raise Exception('sip param inside Qethernet have been be defined')
-        if "bind" in varlist:
-            self.__bind = varlist["bind"]
-        else:
-            self.__bind = None
         if "bwexpected" in varlist:
             self.__bwexpected = varlist["bwexpected"]
         else:
@@ -36,11 +32,8 @@ class Qethernet(unittest.TestCase):
 
     def execute(self):
         # execute iperf command against the server
-        if self.__bind is None:
-            p = sh.iperf("-c", self.__serverip, "-x", "CMSV", "-n", self.__numbytestx, "-f", "m", "-p", self.__port)
-        else:
-            p = sh.iperf("-c", self.__serverip, "-x", "CMSV", "-n", self.__numbytestx, "-f", "m", "-p", self.__port, "-B",
-                         self.__bind)
+        p = sh.iperf("-c", self.__serverip, "-x", "CMSV", "-n", self.__numbytestx, "-f", "m", "-p", self.__port)
+
         # check if it was executed succesfully
         if p.exit_code == 0:
             if p.stdout == "":
-- 
cgit v1.1


From 6a680137694233008005415e22cf889b85baa292 Mon Sep 17 00:00:00 2001
From: Hector Fernandez <hector@iatec.biz>
Date: Thu, 16 Apr 2020 17:09:19 +0200
Subject: First release

---
 test-cli/test/tests/qethernet.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'test-cli/test/tests/qethernet.py')

diff --git a/test-cli/test/tests/qethernet.py b/test-cli/test/tests/qethernet.py
index 027931c..2246029 100644
--- a/test-cli/test/tests/qethernet.py
+++ b/test-cli/test/tests/qethernet.py
@@ -6,12 +6,11 @@ import re
 class Qethernet(unittest.TestCase):
     __serverip = None
     __numbytestx = None
-    __bind = None
     __bwexpected = None
     __port = None
     params = None
 
-    #varlist content: serverip, bwexpected, port, (optional)bind
+    # varlist content: serverip, bwexpected, port
     def __init__(self, testname, testfunc, varlist):
         self.params = varlist
         super(Qethernet, self).__init__(testfunc)
@@ -32,7 +31,11 @@ class Qethernet(unittest.TestCase):
 
     def execute(self):
         # execute iperf command against the server
-        p = sh.iperf("-c", self.__serverip, "-x", "CMSV", "-n", self.__numbytestx, "-f", "m", "-p", self.__port)
+        try:
+            p = sh.iperf("-c", self.__serverip, "-x", "CMSV", "-n", self.__numbytestx, "-f", "m", "-p", self.__port,
+                         _timeout=20)
+        except sh.TimeoutException:
+            self.fail("failed: iperf timeout reached")
 
         # check if it was executed succesfully
         if p.exit_code == 0:
-- 
cgit v1.1


From 09b3bb38fc7305c9b47c29bc90ebc9c636827307 Mon Sep 17 00:00:00 2001
From: Hector Fernandez <hector@iatec.biz>
Date: Wed, 17 Jun 2020 09:44:56 +0200
Subject: SOPA0000: Added support for saving results (strings or files) in the
 DB. It also saves a final DMESG file.

---
 test-cli/test/tests/qethernet.py | 38 ++++++++++++++++++++++++++------------
 1 file changed, 26 insertions(+), 12 deletions(-)

(limited to 'test-cli/test/tests/qethernet.py')

diff --git a/test-cli/test/tests/qethernet.py b/test-cli/test/tests/qethernet.py
index 2246029..da085d8 100644
--- a/test-cli/test/tests/qethernet.py
+++ b/test-cli/test/tests/qethernet.py
@@ -1,6 +1,7 @@
 import unittest
 import sh
 import re
+import json
 
 
 class Qethernet(unittest.TestCase):
@@ -9,11 +10,16 @@ class Qethernet(unittest.TestCase):
     __bwexpected = None
     __port = None
     params = None
+    __bwreal = None
 
     # varlist content: serverip, bwexpected, port
     def __init__(self, testname, testfunc, varlist):
+        # save the parameters list
         self.params = varlist
+        # configure the function to be executed when the test runs. "testfunc" is a name of a method inside this
+        # class, that in this situation, it can only be "execute".
         super(Qethernet, self).__init__(testfunc)
+        # validate and get the parameters
         if "serverip" in varlist:
             self.__serverip = varlist["serverip"]
         else:
@@ -32,8 +38,8 @@ class Qethernet(unittest.TestCase):
     def execute(self):
         # execute iperf command against the server
         try:
-            p = sh.iperf("-c", self.__serverip, "-x", "CMSV", "-n", self.__numbytestx, "-f", "m", "-p", self.__port,
-                         _timeout=20)
+            p = sh.iperf3("-c", self.__serverip, "-n", self.__numbytestx, "-f", "m", "-p", self.__port, "-J",
+                          _timeout=20)
         except sh.TimeoutException:
             self.fail("failed: iperf timeout reached")
 
@@ -42,17 +48,25 @@ class Qethernet(unittest.TestCase):
             if p.stdout == "":
                 self.fail("failed: error executing iperf command")
             # analyze output string
-            # split by lines    
-            lines = p.stdout.splitlines()
-            # get first line
-            dat = lines[1].decode('ascii')
-            # search for the BW value
-            a = re.search("\d+(\.\d)? Mbits/sec", dat)
-            b = a.group().split()
-            bwreal = b[0]
+            data = json.loads(p.stdout.decode('ascii'))
+            self.__bwreal = float(data['end']['sum_received']['bits_per_second'])/1024/1024
+            # save result file
+            with open('/tmp/ethernet-iperf.json', 'w') as outfile:
+                json.dump(data, outfile)
 
             # check if BW is in the expected range
-            self.failUnless(float(bwreal) > float(self.__bwexpected) * 0.9,
-                            "failed: speed is lower than spected. Speed(MB/s)" + str(bwreal))
+            self.failUnless(self.__bwreal > float(self.__bwexpected) * 0.9,
+                            "failed: speed is lower than spected. Speed(Mbits/s)" + str(self.__bwreal))
         else:
             self.fail("failed: could not complete iperf command")
+
+    def getresults(self):
+        # resultlist is a python list of python dictionaries
+        resultlist = [
+            {
+                "desc": "iperf3 output",
+                "data": "/tmp/ethernet-iperf.json",
+                "type": "file"
+            }
+        ]
+        return resultlist
-- 
cgit v1.1


From 736ddcfe6dc3b5edbab6773f1c6687f6597fa7a3 Mon Sep 17 00:00:00 2001
From: Hector Fernandez <hector@iatec.biz>
Date: Wed, 17 Jun 2020 10:50:02 +0200
Subject: SOPA0000: Beatified JSON files generated by tests which use iperf3.

---
 test-cli/test/tests/qethernet.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'test-cli/test/tests/qethernet.py')

diff --git a/test-cli/test/tests/qethernet.py b/test-cli/test/tests/qethernet.py
index da085d8..d7354bf 100644
--- a/test-cli/test/tests/qethernet.py
+++ b/test-cli/test/tests/qethernet.py
@@ -52,7 +52,7 @@ class Qethernet(unittest.TestCase):
             self.__bwreal = float(data['end']['sum_received']['bits_per_second'])/1024/1024
             # save result file
             with open('/tmp/ethernet-iperf.json', 'w') as outfile:
-                json.dump(data, outfile)
+                json.dump(data, outfile, indent=4)
 
             # check if BW is in the expected range
             self.failUnless(self.__bwreal > float(self.__bwexpected) * 0.9,
-- 
cgit v1.1


From db3b1e45c47a1ef23c1ad67114a09cbec0976681 Mon Sep 17 00:00:00 2001
From: Hector Fernandez <hector@iatec.biz>
Date: Thu, 25 Jun 2020 11:45:31 +0200
Subject: Solved bugs. Adapted to DB changes.

---
 test-cli/test/tests/qethernet.py | 47 ++++++++++++++++++++++++++++++----------
 1 file changed, 36 insertions(+), 11 deletions(-)

(limited to 'test-cli/test/tests/qethernet.py')

diff --git a/test-cli/test/tests/qethernet.py b/test-cli/test/tests/qethernet.py
index d7354bf..878c0a0 100644
--- a/test-cli/test/tests/qethernet.py
+++ b/test-cli/test/tests/qethernet.py
@@ -11,6 +11,7 @@ class Qethernet(unittest.TestCase):
     __port = None
     params = None
     __bwreal = None
+    __resultlist = None  # resultlist is a python list of python dictionaries
 
     # varlist content: serverip, bwexpected, port
     def __init__(self, testname, testfunc, varlist):
@@ -34,6 +35,7 @@ class Qethernet(unittest.TestCase):
             raise Exception('port param inside Qethernet must be defined')
         self.__numbytestx = "10M"
         self._testMethodDoc = testname
+        self.__resultlist = []
 
     def execute(self):
         # execute iperf command against the server
@@ -53,20 +55,43 @@ class Qethernet(unittest.TestCase):
             # save result file
             with open('/tmp/ethernet-iperf.json', 'w') as outfile:
                 json.dump(data, outfile, indent=4)
+            self.__resultlist.append(
+                {
+                    "desc": "iperf3 output",
+                    "data": "/tmp/ethernet-iperf.json",
+                    "type": "file"
+                }
+            )
 
             # check if BW is in the expected range
-            self.failUnless(self.__bwreal > float(self.__bwexpected) * 0.9,
-                            "failed: speed is lower than spected. Speed(Mbits/s)" + str(self.__bwreal))
+            if self.__bwreal < float(self.__bwexpected):
+                self.__resultlist.append(
+                    {
+                        "desc": "Test result",
+                        "data": "FAILED: speed is lower than spected. Speed(Mbits/s): " + str(self.__bwreal),
+                        "type": "string"
+                    }
+                )
+                self.fail("failed: speed is lower than spected. Speed(Mbits/s): " + str(self.__bwreal))
         else:
-            self.fail("failed: could not complete iperf command")
+            self.__resultlist.append(
+                {
+                    "desc": "Test result",
+                    "data": "FAILED: could not complete iperf command.",
+                    "type": "string"
+                }
+            )
+            self.fail("failed: could not complete iperf command.")
 
-    def getresults(self):
-        # resultlist is a python list of python dictionaries
-        resultlist = [
+        # Test successful
+        self.__resultlist.append(
             {
-                "desc": "iperf3 output",
-                "data": "/tmp/ethernet-iperf.json",
-                "type": "file"
+                "desc": "Test result",
+                "data": "OK",
+                "type": "string"
             }
-        ]
-        return resultlist
+        )
+
+    def getresults(self):
+
+        return self.__resultlist
-- 
cgit v1.1


From 34df86b37d6838b115e65e5f3a332344afeb86b8 Mon Sep 17 00:00:00 2001
From: Hector Fernandez <hector@iatec.biz>
Date: Wed, 1 Jul 2020 10:45:34 +0200
Subject: Changes to adapt to new way to save results in DB. Created audio
 test. Added protections against unexpected status in DB.

---
 test-cli/test/tests/qethernet.py | 37 ++++++++-----------------------------
 1 file changed, 8 insertions(+), 29 deletions(-)

(limited to 'test-cli/test/tests/qethernet.py')

diff --git a/test-cli/test/tests/qethernet.py b/test-cli/test/tests/qethernet.py
index 878c0a0..3b2f197 100644
--- a/test-cli/test/tests/qethernet.py
+++ b/test-cli/test/tests/qethernet.py
@@ -1,6 +1,5 @@
 import unittest
 import sh
-import re
 import json
 
 
@@ -53,45 +52,25 @@ class Qethernet(unittest.TestCase):
             data = json.loads(p.stdout.decode('ascii'))
             self.__bwreal = float(data['end']['sum_received']['bits_per_second'])/1024/1024
             # save result file
-            with open('/tmp/ethernet-iperf.json', 'w') as outfile:
+            with open('/tmp/station/ethernet-iperf3.json', 'w') as outfile:
                 json.dump(data, outfile, indent=4)
+            outfile.close()
             self.__resultlist.append(
                 {
-                    "desc": "iperf3 output",
-                    "data": "/tmp/ethernet-iperf.json",
-                    "type": "file"
+                    "description": "iperf3 output",
+                    "filepath": "/tmp/station/ethernet-iperf3.json",
+                    "mimetype": "application/json"
                 }
             )
 
             # check if BW is in the expected range
             if self.__bwreal < float(self.__bwexpected):
-                self.__resultlist.append(
-                    {
-                        "desc": "Test result",
-                        "data": "FAILED: speed is lower than spected. Speed(Mbits/s): " + str(self.__bwreal),
-                        "type": "string"
-                    }
-                )
                 self.fail("failed: speed is lower than spected. Speed(Mbits/s): " + str(self.__bwreal))
         else:
-            self.__resultlist.append(
-                {
-                    "desc": "Test result",
-                    "data": "FAILED: could not complete iperf command.",
-                    "type": "string"
-                }
-            )
             self.fail("failed: could not complete iperf command.")
 
-        # Test successful
-        self.__resultlist.append(
-            {
-                "desc": "Test result",
-                "data": "OK",
-                "type": "string"
-            }
-        )
-
     def getresults(self):
-
         return self.__resultlist
+
+    def gettextresult(self):
+        return ""
-- 
cgit v1.1


From 1d51a80b57cc8c80c78d67c85290503997060e9e Mon Sep 17 00:00:00 2001
From: Hector Fernandez <hector@iatec.biz>
Date: Mon, 6 Jul 2020 17:22:17 +0200
Subject: Modified paths of ram and nfs temporary folders.

---
 test-cli/test/tests/qethernet.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'test-cli/test/tests/qethernet.py')

diff --git a/test-cli/test/tests/qethernet.py b/test-cli/test/tests/qethernet.py
index 3b2f197..d38de34 100644
--- a/test-cli/test/tests/qethernet.py
+++ b/test-cli/test/tests/qethernet.py
@@ -52,13 +52,13 @@ class Qethernet(unittest.TestCase):
             data = json.loads(p.stdout.decode('ascii'))
             self.__bwreal = float(data['end']['sum_received']['bits_per_second'])/1024/1024
             # save result file
-            with open('/tmp/station/ethernet-iperf3.json', 'w') as outfile:
+            with open('/mnt/station_ramdisk/ethernet-iperf3.json', 'w') as outfile:
                 json.dump(data, outfile, indent=4)
             outfile.close()
             self.__resultlist.append(
                 {
                     "description": "iperf3 output",
-                    "filepath": "/tmp/station/ethernet-iperf3.json",
+                    "filepath": "/mnt/station_ramdisk/ethernet-iperf3.json",
                     "mimetype": "application/json"
                 }
             )
-- 
cgit v1.1


From 47827e40f71696e04ad805296dedc44a03451db3 Mon Sep 17 00:00:00 2001
From: Hector Fernandez <hector@iatec.biz>
Date: Mon, 6 Jul 2020 17:51:09 +0200
Subject: In case iperf3 server is busy, clients wait and retry.

---
 test-cli/test/tests/qethernet.py | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'test-cli/test/tests/qethernet.py')

diff --git a/test-cli/test/tests/qethernet.py b/test-cli/test/tests/qethernet.py
index d38de34..81acef1 100644
--- a/test-cli/test/tests/qethernet.py
+++ b/test-cli/test/tests/qethernet.py
@@ -1,6 +1,7 @@
 import unittest
 import sh
 import json
+import time
 
 
 class Qethernet(unittest.TestCase):
@@ -11,6 +12,7 @@ class Qethernet(unittest.TestCase):
     params = None
     __bwreal = None
     __resultlist = None  # resultlist is a python list of python dictionaries
+    timebetweenattempts = 5
 
     # varlist content: serverip, bwexpected, port
     def __init__(self, testname, testfunc, varlist):
@@ -37,12 +39,17 @@ class Qethernet(unittest.TestCase):
         self.__resultlist = []
 
     def execute(self):
-        # execute iperf command against the server
-        try:
-            p = sh.iperf3("-c", self.__serverip, "-n", self.__numbytestx, "-f", "m", "-p", self.__port, "-J",
-                          _timeout=20)
-        except sh.TimeoutException:
-            self.fail("failed: iperf timeout reached")
+        # execute iperf command against the server, but it implements attempts in case the server is busy
+        iperfdone = False
+        while not iperfdone:
+            try:
+                p = sh.iperf3("-c", self.__serverip, "-n", self.__numbytestx, "-f", "m", "-p", self.__port, "-J",
+                              _timeout=20)
+                iperfdone = True
+            except sh.TimeoutException:
+                self.fail("failed: iperf timeout reached")
+            except sh.ErrorReturnCode:
+                time.sleep(self.timebetweenattempts)
 
         # check if it was executed succesfully
         if p.exit_code == 0:
-- 
cgit v1.1


From d46bce422fd03cd57d1ba336361da17d6efb48db Mon Sep 17 00:00:00 2001
From: Manel Caro <mcaro@iseebcn.com>
Date: Fri, 31 Jul 2020 02:07:37 +0200
Subject: TEST restructure

---
 test-cli/test/tests/qethernet.py | 77 ++++++++++++++++++++++++++++++----------
 1 file changed, 59 insertions(+), 18 deletions(-)

(limited to 'test-cli/test/tests/qethernet.py')

diff --git a/test-cli/test/tests/qethernet.py b/test-cli/test/tests/qethernet.py
index 81acef1..7d081a1 100644
--- a/test-cli/test/tests/qethernet.py
+++ b/test-cli/test/tests/qethernet.py
@@ -2,7 +2,11 @@ import unittest
 import sh
 import json
 import time
-
+import uuid
+import iperf3
+import netifaces
+from test.helpers.utils import save_json_to_disk
+from test.helpers.utils import station2Port
 
 class Qethernet(unittest.TestCase):
     __serverip = None
@@ -16,29 +20,66 @@ class Qethernet(unittest.TestCase):
 
     # varlist content: serverip, bwexpected, port
     def __init__(self, testname, testfunc, varlist):
-        # save the parameters list
         self.params = varlist
-        # configure the function to be executed when the test runs. "testfunc" is a name of a method inside this
-        # class, that in this situation, it can only be "execute".
         super(Qethernet, self).__init__(testfunc)
-        # validate and get the parameters
-        if "serverip" in varlist:
-            self.__serverip = varlist["serverip"]
-        else:
-            raise Exception('sip param inside Qethernet have been be defined')
-        if "bwexpected" in varlist:
-            self.__bwexpected = varlist["bwexpected"]
-        else:
-            raise Exception('bwexpected param inside Qethernet must be defined')
-        if "port" in varlist:
-            self.__port = varlist["port"]
-        else:
-            raise Exception('port param inside Qethernet must be defined')
-        self.__numbytestx = "10M"
         self._testMethodDoc = testname
+        self.__xmlObj = varlist["xml"]
+        self.__QEthName = varlist.get('name', 'qeth')
+        self.__loops = varlist.get('loops', self.__xmlObj.getKeyVal(self.__QEthName, "loops", "1"))
+        self.__port = varlist.get('port', self.__xmlObj.getKeyVal(self.__QEthName, "port", "5000"))
+        self.__bw = varlist.get('bwexpected', self.__xmlObj.getKeyVal(self.__QEthName, "bwexpected", "40.0"))
+        self.__serverip = varlist.get('serverip', self.__xmlObj.getKeyVal(self.__QEthName, "serverip", "localhost"))
+        self.__duration = varlist.get('duration', self.__xmlObj.getKeyVal(self.__QEthName, "duration", "10"))
+        self.__interface = varlist.get('interface', self.__xmlObj.getKeyVal(self.__QEthName, "interface", "eth0"))
+        self.__toPath = varlist.get('to', self.__xmlObj.getKeyVal(self.__QEthName, "to", "/mnt/station_ramdisk"))
+        self.__retriesCount = varlist.get('retries', self.__xmlObj.getKeyVal(self.__QEthName, "retries", "5"))
+        self.__waitRetryTime = varlist.get('wait_retry', self.__xmlObj.getKeyVal(self.__QEthName, "wait_retry", "10"))
+        self.__wifi_res_file = varlist.get('eth_res_file', self.__xmlObj.getKeyVal(self.__QEthName, "eth_res_file", "eth_test_{}.json"))
+        self.__wifi_st_file = varlist.get('eth_st_file', self.__xmlObj.getKeyVal(self.__QEthName, "eth_st_file", "eth_st_{}.json"))
+        self.__file_uuid = uuid.uuid4()
+        self.__wifi_res_file = self.__wifi_res_file.format(self.__file_uuid)
+        self.__wifi_st_file = self.__wifi_st_file.format(self.__file_uuid)
+
         self.__resultlist = []
 
+    def checkInterface(self, reqInterface):
+        ifaces = netifaces.interfaces()
+        for t in ifaces:
+            if t == reqInterface:
+                return True
+        return False
+
     def execute(self):
+        self.__resultlist = []
+        # check interfaces
+        if not self.checkInterface(self.__interface):
+            self.fail('Interface not found: {}'.format(self.__interface))
+
+        # Start Iperf
+        client = iperf3.Client()
+        client.duration = int(self.__duration)
+        client.server_hostname = self.__serverip
+        client.port = station2Port(self.__port)
+        count = int(self.__retriesCount)
+        while count > 0:
+            result = client.run()
+            if result.error == None:
+                if result.received_Mbps >= float(self.__bw) and result.sent_Mbps >= float(self.__bw):
+                    save_json_to_disk(filePath='{}/{}'.format(self.__toPath, self.__wifi_res_file),
+                          description='eth {} iperf3'.format(self.__interface),
+                          mime='application/json',
+                          json_data=result.json,
+                          result=self.__resultlist)
+                    return
+                else:
+                    self.fail('bw fail: rx:{} tx:{}'.format(result.received_Mbps, result.sent_Mbps))
+            else:
+                count = count - 1
+                time.sleep(int(self.__waitRetryTime))
+
+        self.fail('qEth (max tries) Execution error: {}'.format(result.error))
+
+    def execute2(self):
         # execute iperf command against the server, but it implements attempts in case the server is busy
         iperfdone = False
         while not iperfdone:
-- 
cgit v1.1