CSIT-1204: Make new TC names backward compatible (trending)

Change-Id: I48976a21ed022f0f8d840903db4d2415be9365cd
Signed-off-by: Tibor Frank <tifrank@cisco.com>

diff --git a/docs/report/vpp_performance_tests/http_server_performance/index.rst b/docs/report/vpp_performance_tests/http_server_performance/index.rst
index 8954b74..6d40f1f 100644 (file)
--- a/docs/report/vpp_performance_tests/http_server_performance/index.rst
+++ b/docs/report/vpp_performance_tests/http_server_performance/index.rst
@@ -23,6 +23,9 @@ have the same value, only a horizontal line is plotted.
     performance jobs`_, ii) archived FD.io jobs test result `output files
     <../../_static/archive/>`_.
 
+    CSIT source code for the test cases used for plots can be found in
+    `CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/tcp?h=rls1807>`_.
+
 Connections per second
 ----------------------
 
@@ -39,23 +42,6 @@ Connections per second
             \label{fig:http-server-performance-cps}
     \end{figure}
 
-*Figure 1. VPP HTTP Server Performance - Connections per Second*
-
-CSIT source code for the test cases used for above plots can be found in CSIT
-git repository:
-
-.. only:: html
-
-   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/tcp && grep -HE '(1t1c|2t2c|4t4c)-ethip4tcphttp-httpserver-cps' *
-      :shell:
-
-.. only:: latex
-
-   .. code-block:: bash
-
-      $ cd tests/vpp/perf/tcp
-      $ grep -HE '(1t1c|2t2c|4t4c)-ethip4tcphttp-httpserver-cps' *
-
 Requests per second
 -------------------
 
@@ -71,20 +57,3 @@ Requests per second
             \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{http-server-performance-rps}
             \label{fig:http-server-performance-rps}
     \end{figure}
-
-*Figure 2. VPP HTTP Server Performance - Requests per Second*
-
-CSIT source code for the test cases used for above plots can be found in CSIT
-git repository:
-
-.. only:: html
-
-   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/tcp && grep -HE '(1t1c|2t2c|4t4c)-ethip4tcphttp-httpserver-rps' *
-      :shell:
-
-.. only:: latex
-
-   .. code-block:: bash
-
-      $ cd tests/vpp/perf/tcp
-      $ grep -HE '(1t1c|2t2c|4t4c)-ethip4tcphttp-httpserver-rps' *

diff --git a/resources/tools/presentation/generator_CPTA.py b/resources/tools/presentation/generator_CPTA.py
index 99fc821..7279ea3 100644 (file)
--- a/resources/tools/presentation/generator_CPTA.py
+++ b/resources/tools/presentation/generator_CPTA.py
@@ -323,7 +323,7 @@ def _generate_all_charts(spec, input_data):
                 test_data,
                 job_name=job_name,
                 build_info=build_info,
-                name='-'.join(test_name.split('-')[3:-1]),
+                name='-'.join(test_name.split('-')[2:-1]),
                 color=COLORS[index])
             traces.extend(trace)
             res.append(rslt)

diff --git a/resources/tools/presentation/generator_tables.py b/resources/tools/presentation/generator_tables.py
index d42c734..5c38c1e 100644 (file)
--- a/resources/tools/presentation/generator_tables.py
+++ b/resources/tools/presentation/generator_tables.py
@@ -718,8 +718,7 @@ def table_performance_trending_dashboard(table, input_data):
                     continue
                 if tbl_dict.get(tst_name, None) is None:
                     name = "{0}-{1}".format(tst_data["parent"].split("-")[0],
-                                            "-".join(tst_data["name"].
-                                                     split("-")[1:]))
+                                            tst_data["name"])
                     tbl_dict[tst_name] = {"name": name,
                                           "data": OrderedDict()}
                 try:
@@ -987,8 +986,7 @@ def table_failed_tests(table, input_data):
                     continue
                 if tbl_dict.get(tst_name, None) is None:
                     name = "{0}-{1}".format(tst_data["parent"].split("-")[0],
-                                            "-".join(tst_data["name"].
-                                                     split("-")[1:]))
+                                            tst_data["name"])
                     tbl_dict[tst_name] = {"name": name,
                                           "data": OrderedDict()}
                 try:

diff --git a/resources/tools/presentation/input_data_parser.py b/resources/tools/presentation/input_data_parser.py
index f2660db..e0393a8 100644 (file)
--- a/resources/tools/presentation/input_data_parser.py
+++ b/resources/tools/presentation/input_data_parser.py
@@ -206,6 +206,8 @@ class ExecutionChecker(ResultVisitor):
 
     REGEX_TC_NAME_NEW = re.compile(r'-\d+[cC]-')
 
+    REGEX_TC_NUMBER = re.compile(r'tc[0-9]{2}-')
+
     def __init__(self, metadata):
         """Initialisation.
 
@@ -477,6 +479,9 @@ class ExecutionChecker(ResultVisitor):
         tags = [str(tag) for tag in test.tags]
         test_result = dict()
         test_result["name"] = test.name.lower()
+        # Remove TC number from the TC name (not needed):
+        test_result["name"] = re.sub(self.REGEX_TC_NUMBER, "",
+                                     test.name.lower())
         test_result["parent"] = test.parent.name.lower()
         test_result["tags"] = tags
         doc_str = test.doc.replace('"', "'").replace('\n', ' '). \
@@ -485,7 +490,9 @@ class ExecutionChecker(ResultVisitor):
         test_result["msg"] = test.message.replace('\n', ' |br| '). \
             replace('\r', '').replace('"', "'")
         test_result["status"] = test.status
-        self._test_ID = test.longname.lower()
+        # Remove TC number from the TC long name (backward compatibility):
+        self._test_ID = re.sub(self.REGEX_TC_NUMBER, "", test.longname.lower())
+
         if test.status == "PASS" and ("NDRPDRDISC" in tags or
                                       "TCP" in tags or
                                       "MRR" in tags or