TEST restructure

1 files changed, 59 insertions, 18 deletions

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: