X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Frobot_output_parser.py;h=b9ad8f8aa9912f39124a42815e458cf6b861db99;hp=d5e9b88597e889487689398ecfcaf6515209afa5;hb=a70972124d9774c60e6b1d2d8c43662f71ff35ae;hpb=6eda6928faa746c7e012827296f17fc364cde1b3

diff --git a/resources/tools/robot_output_parser.py b/resources/tools/robot_output_parser.py
index d5e9b88597..b9ad8f8aa9 100755
--- a/resources/tools/robot_output_parser.py
+++ b/resources/tools/robot_output_parser.py
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 """Script parses the data taken by robot framework (output.xml) and dumps
-intereted values into XML output file."""
+interested values into XML output file."""
 
 import argparse
 import re
@@ -27,13 +27,15 @@ from robot.api import ExecutionResult, ResultVisitor
 class ExecutionChecker(ResultVisitor):
     """Iterates through test cases."""
 
-    tc_regexp = re.compile(ur'^TC\d+:\s((\d+)B|IMIX_v4_1)[\D\d]+\s(\d)'\
-        '(thread|threads)\\s(\\d)(core|cores)\\s(\\d)(rxq|rxqs)')
+    tc_regexp = re.compile(ur'^tc\d+-((\d+)B|IMIX)-(\d)t(\d)c-(.*)')
     rate_regexp = re.compile(ur'^[\D\d]*FINAL_RATE:\s(\d+\.\d+)[\D\d]*')
     lat_regexp = re.compile(ur'^[\D\d]*'\
-        'LAT_\\d+%NDR:\\s\\[\'(\\d+\\/\\d+\\/\\d+)\',\\s\'(\\d+\\/\\d+\\/\\d+)\'\\]\\s\n'\
-        'LAT_\\d+%NDR:\\s\\[\'(\\d+\\/\\d+\\/\\d+)\',\\s\'(\\d+\\/\\d+\\/\\d+)\'\\]\\s\n'\
-        'LAT_\\d+%NDR:\\s\\[\'(\\d+\\/\\d+\\/\\d+)\',\\s\'(\\d+\\/\\d+\\/\\d+)\'\\]')
+        ur'LAT_\d+%NDR:\s\[\'(-?\d+\/-?\d+\/-?\d+)\','\
+        ur'\s\'(-?\d+\/-?\d+\/-?\d+)\'\]\s\n'\
+        ur'LAT_\d+%NDR:\s\[\'(-?\d+\/-?\d+\/-?\d+)\','\
+        ur'\s\'(-?\d+\/-?\d+\/-?\d+)\'\]\s\n'\
+        ur'LAT_\d+%NDR:\s\[\'(-?\d+\/-?\d+\/-?\d+)\','\
+        ur'\s\'(-?\d+\/-?\d+\/-?\d+)\'\]')
 
     def __init__(self, args):
         self.root = ET.Element('build',
@@ -86,23 +88,49 @@ class ExecutionChecker(ResultVisitor):
         :type test: Test
         :return: Nothing.
         """
-        if any("PERFTEST_LONG" in tag for tag in test.tags):
+        if any("NDRPDRDISC" in tag for tag in test.tags):
             if test.status == 'PASS':
                 tags = []
                 for tag in test.tags:
                     tags.append(tag)
-                test_elem = ET.SubElement(self.root,
-                                          "S"+test.parent.name.replace(" ", ""))
+
+                test_elem = ET.SubElement(
+                    self.root, "S" + test.parent.name.replace(" ", ""))
                 test_elem.attrib['name'] = test.parent.name
-                test_elem.attrib['framesize'] = str(re.search(\
-                    self.tc_regexp, test.name).group(2))
-                test_elem.attrib['workerthreads'] = str(re.search(\
+                test_elem.attrib['framesize'] = str(re.search(
+                    self.tc_regexp, test.name).group(1))
+                test_elem.attrib['threads'] = str(re.search(
                     self.tc_regexp, test.name).group(3))
-                test_elem.attrib['workerspernic'] = str(re.search(\
-                    self.tc_regexp, test.name).group(7))
+                test_elem.attrib['cores'] = str(re.search(
+                    self.tc_regexp, test.name).group(4))
+                if any("NDRDISC" in tag for tag in test.tags):
+                    try:
+                        test_elem.attrib['lat_100'] = str(re.search(
+                            self.lat_regexp, test.message).group(1)) + '/' +\
+                            str(re.search(self.lat_regexp, test.message).
+                                group(2))
+                    except AttributeError:
+                        test_elem.attrib['lat_100'] = "-1/-1/-1/-1/-1/-1"
+                    try:
+                        test_elem.attrib['lat_50'] = str(re.search(
+                            self.lat_regexp, test.message).group(3)) + '/' +\
+                            str(re.search(self.lat_regexp, test.message).
+                                group(4))
+                    except AttributeError:
+                        test_elem.attrib['lat_50'] = "-1/-1/-1/-1/-1/-1"
+                    try:
+                        test_elem.attrib['lat_10'] = str(re.search(
+                            self.lat_regexp, test.message).group(5)) + '/' +\
+                            str(re.search(self.lat_regexp, test.message).
+                                group(6))
+                    except AttributeError:
+                        test_elem.attrib['lat_10'] = "-1/-1/-1/-1/-1/-1"
                 test_elem.attrib['tags'] = ', '.join(tags)
-                test_elem.text = str(re.search(\
-                    self.rate_regexp, test.message).group(1))
+                try:
+                    test_elem.text = str(re.search(
+                        self.rate_regexp, test.message).group(1))
+                except AttributeError:
+                    test_elem.text = "-1"
 
     def end_test(self, test):
         """Called when test ends.
@@ -139,7 +167,7 @@ def print_error(msg):
     :return: nothing
     """
 
-    sys.stderr.write(msg+'\n')
+    sys.stderr.write(msg + '\n')
 
 
 def parse_args():
@@ -150,13 +178,18 @@ def parse_args():
     """
 
     parser = argparse.ArgumentParser()
-    parser.add_argument("-i", "--input", required=True,
+    parser.add_argument("-i", "--input",
+                        required=True,
                         type=argparse.FileType('r'),
                         help="Robot XML log file")
-    parser.add_argument("-o", "--output", required=True,
+    parser.add_argument("-o", "--output",
+                        required=True,
                         type=argparse.FileType('w'),
                         help="XML output file")
-    parser.add_argument("-v", "--vdevice", required=True,
+    parser.add_argument("-v", "--vdevice",
+                        required=False,
+                        default="",
+                        type=str,
                         help="VPP version")
 
     return parser.parse_args()