X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Finput_data_parser.py;h=1a8b5bf98d178bc7113f76d7d659a8e2271d744f;hp=0a6efc7b18e4e0223b465ba96ec97db60596c15b;hb=764041478f165644c0dea744bc4b2d976bb0b840;hpb=f3b1688c46df79e24cf4532b85463b85e7aa77a6

diff --git a/resources/tools/presentation/input_data_parser.py b/resources/tools/presentation/input_data_parser.py
index 0a6efc7b18..1a8b5bf98d 100644
--- a/resources/tools/presentation/input_data_parser.py
+++ b/resources/tools/presentation/input_data_parser.py
@@ -530,8 +530,8 @@ class ExecutionChecker(ResultVisitor):
         """
 
         if msg.message.count(u"return STDOUT Version:") or \
-            msg.message.count(u"VPP Version:") or \
-            msg.message.count(u"VPP version:"):
+                msg.message.count(u"VPP Version:") or \
+                msg.message.count(u"VPP version:"):
             self._version = str(re.search(self.REGEX_VERSION_VPP, msg.message).
                                 group(2))
             self._data[u"metadata"][u"version"] = self._version
@@ -1038,11 +1038,16 @@ class ExecutionChecker(ResultVisitor):
             name = test.name.lower()
 
         # Remove TC number from the TC long name (backward compatibility):
-        self._test_id = re.sub(self.REGEX_TC_NUMBER, u"", longname)
+        self._test_id = re.sub(
+            self.REGEX_TC_NUMBER, u"", longname.replace(u"snat", u"nat")
+        )
         # Remove TC number from the TC name (not needed):
-        test_result[u"name"] = re.sub(self.REGEX_TC_NUMBER, "", name)
+        test_result[u"name"] = re.sub(
+            self.REGEX_TC_NUMBER, "", name.replace(u"snat", u"nat")
+        )
 
-        test_result[u"parent"] = test.parent.name.lower()
+        test_result[u"parent"] = test.parent.name.lower().\
+            replace(u"snat", u"nat")
         test_result[u"tags"] = tags
         test_result["doc"] = test.doc.\
             replace(u'"', u"'").\
@@ -1102,7 +1107,9 @@ class ExecutionChecker(ResultVisitor):
                     return
 
         if test.status == u"PASS":
-            if u"NDRPDR" in tags:
+            if u"DEVICETEST" in tags:
+                test_result[u"type"] = u"DEVICETEST"
+            elif u"NDRPDR" in tags:
                 test_result[u"type"] = u"NDRPDR"
                 test_result[u"throughput"], test_result[u"status"] = \
                     self._get_ndrpdr_throughput(test.message)
@@ -1155,8 +1162,6 @@ class ExecutionChecker(ResultVisitor):
                     }
                 except (AttributeError, IndexError, ValueError, TypeError):
                     test_result[u"status"] = u"FAIL"
-            elif u"DEVICETEST" in tags:
-                test_result[u"type"] = u"DEVICETEST"
             else:
                 test_result[u"status"] = u"FAIL"
                 self._data[u"tests"][self._test_id] = test_result
@@ -1229,12 +1234,10 @@ class ExecutionChecker(ResultVisitor):
         :returns: Nothing.
         """
         if test_kw.name.count(u"Show Runtime On All Duts") or \
-                test_kw.name.count(u"Show Runtime Counters On All Duts"):
+                test_kw.name.count(u"Show Runtime Counters On All Duts") or \
+                test_kw.name.count(u"Vpp Show Runtime On All Duts"):
             self._msg_type = u"test-show-runtime"
             self._sh_run_counter += 1
-        elif test_kw.name.count(u"Install Dpdk Test On All Duts") and \
-                not self._version:
-            self._msg_type = u"dpdk-version"
         else:
             return
         test_kw.messages.visit(self)
@@ -1271,6 +1274,9 @@ class ExecutionChecker(ResultVisitor):
         if setup_kw.name.count(u"Show Vpp Version On All Duts") \
                 and not self._version:
             self._msg_type = u"vpp-version"
+        elif setup_kw.name.count(u"Install Dpdk Framework On All Duts") and \
+                not self._version:
+            self._msg_type = u"dpdk-version"
         elif setup_kw.name.count(u"Set Global Variable") \
                 and not self._timestamp:
             self._msg_type = u"timestamp"