feat(core): Add 2n-spr topology

[csit.git] / resources / libraries / python / PapiHistory.py

diff --git a/resources/libraries/python/PapiHistory.py b/resources/libraries/python/PapiHistory.py
index 32429c4..18b2774 100644 (file)
--- a/resources/libraries/python/PapiHistory.py
+++ b/resources/libraries/python/PapiHistory.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Cisco and/or its affiliates.
+# Copyright (c) 2023 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:
 # 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:


@@ -48,7 +48,7 @@ class PapiHistory:
                 PapiHistory.reset_papi_history(node)
 
     @staticmethod
                 PapiHistory.reset_papi_history(node)
 
     @staticmethod

-    def add_to_papi_history(node, csit_papi_command, papi=True, **kwargs):
+    def add_to_papi_history(node, csit_papi_command, **kwargs):

         """Add command to PAPI command history on DUT node.
 
         Repr strings are used for argument values.
         """Add command to PAPI command history on DUT node.
 
         Repr strings are used for argument values.


@@ -70,29 +70,17 @@ class PapiHistory:
         VPP Stats:
             vpp-stats(path=['^/if', '/err/ip4-input', '/sys/node/ip4-input'])
 
         VPP Stats:
             vpp-stats(path=['^/if', '/err/ip4-input', '/sys/node/ip4-input'])
 

-        VAT:
-            sw_interface_set_flags sw_if_index 3 admin-up link-up
-

         :param node: DUT node to add command to PAPI command history for.
         :param csit_papi_command: Command to be added to PAPI command history.
         :param node: DUT node to add command to PAPI command history for.
         :param csit_papi_command: Command to be added to PAPI command history.

-        :param papi: Says if the command to store is PAPi or VAT. Remove when
-            VAT executor is completely removed.

         :param kwargs: Optional key-value arguments.
         :type node: dict
         :type csit_papi_command: str
         :param kwargs: Optional key-value arguments.
         :type node: dict
         :type csit_papi_command: str

-        :type papi: bool

         :type kwargs: dict
         """
         :type kwargs: dict
         """

-        if papi:
-            args = list()
-            for key, val in kwargs.items():
-                args.append(f"{key}={val!r}")
-            item = f"{csit_papi_command}({u','.join(args)})"
-        else:
-            # This else part is here to store VAT commands.
-            # VAT history is not used.
-            # TODO: Remove when VatExecutor is completely removed.
-            item = f"{csit_papi_command}"
+        args = list()
+        for key, val in kwargs.items():
+            args.append(f"{key}={val!r}")
+        item = f"{csit_papi_command}({u','.join(args)})"

         DICT__DUTS_PAPI_HISTORY[node[u"host"]].append(item)
 
     @staticmethod
         DICT__DUTS_PAPI_HISTORY[node[u"host"]].append(item)
 
     @staticmethod