Ixia Live Results

This patch collects Ixia live results and copy the results file from
generator machine to local server
1. Traffic Item Statistics are collected during traffic running
2. Results file is copied from traffic generator machine to local server
3. Fixed pylint errors and made b2b test running working
4. Replacing sleeping times with traffic state verifications

JIRA: VSPERF-609
Signed-off-by: Ancuta Enache <ancuta.enache@keysight.com>
Change-Id: I351c3a5435a71acfd1b6bc85bc6c0731d2529cd8

1 files changed, 56 insertions, 20 deletions

diff --git a/tools/pkt_gen/ixnet/ixnet.py b/tools/pkt_gen/ixnet/ixnet.py
index 87fb2c65..93d9bb47 100755
--- a/tools/pkt_gen/ixnet/ixnet.py
+++ b/tools/pkt_gen/ixnet/ixnet.py
@@ -83,6 +83,7 @@ import logging
 import os
 import re
 import csv
+import random
 
 from collections import OrderedDict
 from tools.pkt_gen import trafficgen
@@ -129,7 +130,7 @@ def _build_set_cmds(values, prefix='dict set'):
 
         if isinstance(value, list):
             value = '{{{}}}'.format(' '.join(str(x) for x in value))
-            yield ' '.join([prefix, 'set', key, value]).strip()
+            yield ' '.join([prefix, key, value]).strip()
             continue
 
         # tcl doesn't recognise the strings "True" or "False", only "1"
@@ -176,10 +177,9 @@ class IxNet(trafficgen.ITrafficGenerator):
         :returns: Output of command, where applicable.
         """
         self._logger.debug('%s%s', trafficgen.CMD_PREFIX, cmd)
-
         output = self._tclsh.eval(cmd)
 
-        return output.split()
+        return output
 
     def configure(self):
         """Configure system for IxNetwork.
@@ -199,6 +199,8 @@ class IxNet(trafficgen.ITrafficGenerator):
             'port2': settings.getValue('TRAFFICGEN_IXIA_PORT2'),
             'output_dir':
                 settings.getValue('TRAFFICGEN_IXNET_TESTER_RESULT_DIR'),
+            'frame_size_list':
+                settings.getValue('TRAFFICGEN_PKT_SIZES'),
         }
 
         self._logger.debug('IXIA configuration configuration : %s', self._cfg)
@@ -256,11 +258,12 @@ class IxNet(trafficgen.ITrafficGenerator):
                 'An error occured when connecting to IxNetwork machine...')
             raise RuntimeError('Ixia failed to initialise.')
 
-        self.run_tcl('startRfc2544Test $config $traffic')
+        results_path = self.run_tcl('startRfc2544Test $config $traffic')
         if output:
             self._logger.critical(
                 'Failed to start continuous traffic test')
             raise RuntimeError('Continuous traffic test failed to start.')
+        return results_path
 
     def stop_cont_traffic(self):
         """See ITrafficGenerator for description
@@ -271,9 +274,12 @@ class IxNet(trafficgen.ITrafficGenerator):
                                 lossrate=0.0):
         """See ITrafficGenerator for description
         """
-        self.start_rfc2544_throughput(traffic, tests, duration, lossrate)
-
-        return self.wait_rfc2544_throughput()
+        results_file = self.start_rfc2544_throughput(traffic, tests, duration, lossrate)
+        run_result = self.wait_rfc2544_throughput()
+        dest_file_name = 'Traffic_Item_Statistics_' + str(random.randrange(1, 100)) + '.csv'
+        self.copy_results_file(results_file,
+                               os.path.join(settings.getValue('RESULTS_PATH'), dest_file_name))
+        return run_result
 
     def start_rfc2544_throughput(self, traffic=None, tests=1, duration=20,
                                  lossrate=0.0):
@@ -313,12 +319,14 @@ class IxNet(trafficgen.ITrafficGenerator):
                 'An error occured when connecting to IxNetwork machine...')
             raise RuntimeError('Ixia failed to initialise.')
 
-        self.run_tcl('startRfc2544Test $config $traffic')
+        results_file = self.run_tcl('startRfc2544Test $config $traffic')
         if output:
             self._logger.critical(
                 'Failed to start RFC2544 test')
             raise RuntimeError('RFC2544 test failed to start.')
 
+        return results_file
+
     def wait_rfc2544_throughput(self):
         """See ITrafficGenerator for description
         """
@@ -397,12 +405,34 @@ class IxNet(trafficgen.ITrafficGenerator):
             return results
 
         output = self.run_tcl('waitForRfc2544Test')
-
         # the run_tcl function will return a list with one element. We extract
         # that one element (a string representation of an IXIA-specific Tcl
         # datatype), parse it to find the path of the results file then parse
         # the results file
-        return parse_ixnet_rfc_results(parse_result_string(output[0]))
+        test_result = parse_ixnet_rfc_results(parse_result_string(output))
+        return test_result
+
+    def copy_results_file(self, source_file=None, dest_file=None):
+        """Copy a file from a source address to destination
+        """
+        dest_dict = {}
+        source_dict = {}
+        srcfile = ''
+        if isinstance(source_file, list):
+            for i in source_file:
+                srcfile = srcfile + ' ' + i
+        else:
+            srcfile = source_file
+
+        source = (srcfile.replace("\\", "/")).strip()
+        source_dict['source_file'] = {'source_file': '\"{}\"'.format(source)}
+        dest_dict['dest_file'] = {'dest_file': '{}'.format(dest_file)}
+        for cmd in _build_set_cmds(source_dict):
+            self.run_tcl(cmd)
+        for cmd in _build_set_cmds(dest_dict):
+            self.run_tcl(cmd)
+        self.run_tcl('copyFileResults $source_file $dest_file')
+        return dest_dict['dest_file']
 
     def send_rfc2544_back2back(self, traffic=None, tests=1, duration=2,
                                lossrate=0.0):
@@ -411,9 +441,12 @@ class IxNet(trafficgen.ITrafficGenerator):
         # NOTE 2 seconds is the recommended duration for a back 2 back
         # test in RFC2544. 50 trials is the recommended number from the
         # RFC also.
-        self.start_rfc2544_back2back(traffic, tests, duration, lossrate)
-
-        return self.wait_rfc2544_back2back()
+        b2b_results_file = self.start_rfc2544_back2back(traffic, tests, duration, lossrate)
+        b2b_run_result = self.wait_rfc2544_back2back()
+        dest_file_name = 'Traffic_Item_Statistics_' + str(random.randrange(1, 100)) + '.csv'
+        self.copy_results_file(b2b_results_file,
+                               os.path.join(settings.getValue('RESULTS_PATH'), dest_file_name))
+        return b2b_run_result
 
     def start_rfc2544_back2back(self, traffic=None, tests=1, duration=2,
                                 lossrate=0.0):
@@ -453,15 +486,18 @@ class IxNet(trafficgen.ITrafficGenerator):
                 'An error occured when connecting to IxNetwork machine...')
             raise RuntimeError('Ixia failed to initialise.')
 
-        self.run_tcl('startRfc2544Test $config $traffic')
+        results_file = self.run_tcl('startRfc2544Test $config $traffic')
         if output:
             self._logger.critical(
                 'Failed to start RFC2544 test')
             raise RuntimeError('RFC2544 test failed to start.')
 
+        return results_file
+
     def wait_rfc2544_back2back(self):
         """Wait for results.
         """
+
         def parse_result_string(results):
             """Get path to results file from output
 
@@ -487,7 +523,7 @@ class IxNet(trafficgen.ITrafficGenerator):
             # transform path into something useful
 
             path = result_path.group(1).replace('\\', '/')
-            path = os.path.join(path, 'iteration.csv')
+            path = os.path.join(path, 'AggregateResults.csv')
             path = path.replace(
                 settings.getValue('TRAFFICGEN_IXNET_TESTER_RESULT_DIR'),
                 settings.getValue('TRAFFICGEN_IXNET_DUT_RESULT_DIR'))
@@ -511,11 +547,11 @@ class IxNet(trafficgen.ITrafficGenerator):
                 for row in reader:
                     # if back2back count higher than previously found, store it
                     # Note: row[N] here refers to the Nth column of a row
-                    if float(row[14]) <= self._params['config']['lossrate']:
-                        if int(row[12]) > \
+                    if float(row[10]) <= self._params['config']['lossrate']:
+                        if int(float(row[8])) > \
                          int(results[ResultsConstants.B2B_FRAMES]):
-                            results[ResultsConstants.B2B_FRAMES] = int(row[12])
-                            results[ResultsConstants.B2B_FRAME_LOSS_PERCENT] = float(row[14])
+                            results[ResultsConstants.B2B_FRAMES] = int(float(row[8]))
+                            results[ResultsConstants.B2B_FRAME_LOSS_PERCENT] = float(row[10])
 
             return results
 
@@ -526,7 +562,7 @@ class IxNet(trafficgen.ITrafficGenerator):
         # datatype), parse it to find the path of the results file then parse
         # the results file
 
-        return parse_ixnet_rfc_results(parse_result_string(output[0]))
+        return parse_ixnet_rfc_results(parse_result_string(output))
 
     def send_burst_traffic(self, traffic=None, duration=20):
         return NotImplementedError('IxNet does not implement send_burst_traffic')