PAL: Update to RobotFramework 5.0

[csit.git] / resources / tools / presentation / input_data_parser.py

diff --git a/resources/tools/presentation/input_data_parser.py b/resources/tools/presentation/input_data_parser.py
index 364d188..9408142 100644 (file)
--- a/resources/tools/presentation/input_data_parser.py
+++ b/resources/tools/presentation/input_data_parser.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Cisco and/or its affiliates.
+# Copyright (c) 2022 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -1043,7 +1043,7 @@ class ExecutionChecker(ResultVisitor):
                                   u"level": len(suite.longname.split(u"."))
                               }
 
-        suite.keywords.visit(self)
+        suite.body.visit(self)
 
     def end_suite(self, suite):
         """Called when suite ends.
@@ -1061,7 +1061,7 @@ class ExecutionChecker(ResultVisitor):
         :returns: Nothing.
         """
         if self.start_test(test) is not False:
-            test.keywords.visit(self)
+            test.body.visit(self)
             self.end_test(test)
 
     def start_test(self, test):
@@ -1202,15 +1202,15 @@ class ExecutionChecker(ResultVisitor):
             if test.status == u"PASS":
                 test_result[u"throughput"], test_result[u"status"] = \
                     self._get_plr_throughput(test.message)
+        elif u"LDP_NGINX" in tags:
+            test_result[u"type"] = u"LDP_NGINX"
+            test_result[u"result"], test_result[u"status"] = \
+                self._get_vsap_data(test.message, tags)
         elif u"HOSTSTACK" in tags:
             test_result[u"type"] = u"HOSTSTACK"
             if test.status == u"PASS":
                 test_result[u"result"], test_result[u"status"] = \
                     self._get_hoststack_data(test.message, tags)
-        elif u"LDP_NGINX" in tags:
-            test_result[u"type"] = u"LDP_NGINX"
-            test_result[u"result"], test_result[u"status"] = \
-                self._get_vsap_data(test.message, tags)
         # elif u"TCP" in tags:  # This might be not used
         #     test_result[u"type"] = u"TCP"
         #     if test.status == u"PASS":
@@ -1285,7 +1285,7 @@ class ExecutionChecker(ResultVisitor):
         :type test_kw: Keyword
         :returns: Nothing.
         """
-        for keyword in test_kw.keywords:
+        for keyword in test_kw.body:
             if self.start_test_kw(keyword) is not False:
                 self.visit_test_kw(keyword)
                 self.end_test_kw(keyword)
@@ -1327,7 +1327,7 @@ class ExecutionChecker(ResultVisitor):
         :type setup_kw: Keyword
         :returns: Nothing.
         """
-        for keyword in setup_kw.keywords:
+        for keyword in setup_kw.body:
             if self.start_setup_kw(keyword) is not False:
                 self.visit_setup_kw(keyword)
                 self.end_setup_kw(keyword)
@@ -1368,7 +1368,7 @@ class ExecutionChecker(ResultVisitor):
         :type teardown_kw: Keyword
         :returns: Nothing.
         """
-        for keyword in teardown_kw.keywords:
+        for keyword in teardown_kw.body:
             if self.start_teardown_kw(keyword) is not False:
                 self.visit_teardown_kw(keyword)
                 self.end_teardown_kw(keyword)
@@ -1531,12 +1531,12 @@ class InputData:
         process_oper = False
         if u"-vpp-perf-report-coverage-" in job:
             process_oper = True
-        elif u"-vpp-perf-report-iterative-" in job:
-            # Exceptions for TBs where we do not have coverage data:
-            for item in (u"-2n-icx", u"-3n-icx", u"-2n-aws", u"-3n-aws"):
-                if item in job:
-                    process_oper = True
-                    break
+        # elif u"-vpp-perf-report-iterative-" in job:
+        #     # Exceptions for TBs where we do not have coverage data:
+        #     for item in (u"-2n-icx", ):
+        #         if item in job:
+        #             process_oper = True
+        #             break
         checker = ExecutionChecker(
             metadata, self._cfg.mapping, self._cfg.ignore, process_oper
         )