From 5c4c05c8ea9f1b07862c09c8d971a3dae3b16adf Mon Sep 17 00:00:00 2001
From: Viliam Luc <vluc@cisco.com>
Date: Mon, 13 Jun 2022 13:42:29 +0200
Subject: fix: testpmd and l3fwd check state      + print testpmd and l3fwd pid
 after start

Testpmd and l3fwd utility can be started but link might not be
ready yet. This fix start the utility on all DUTs and do the
check later.

Signed-off-by: Viliam Luc <vluc@cisco.com>
Change-Id: If476e22f206d9a6a0dd399879a88eafedca92bb6
---
 resources/libraries/python/DPDK/L3fwdCheck.py   | 36 +++++++++++++++++++++++++
 resources/libraries/python/DPDK/TestpmdCheck.py | 35 ++++++++++++++++++++++++
 resources/libraries/python/DPDK/TestpmdTest.py  |  4 +--
 3 files changed, 73 insertions(+), 2 deletions(-)
 create mode 100644 resources/libraries/python/DPDK/L3fwdCheck.py
 create mode 100644 resources/libraries/python/DPDK/TestpmdCheck.py

(limited to 'resources/libraries/python/DPDK')

diff --git a/resources/libraries/python/DPDK/L3fwdCheck.py b/resources/libraries/python/DPDK/L3fwdCheck.py
new file mode 100644
index 0000000000..a2f3ce655e
--- /dev/null
+++ b/resources/libraries/python/DPDK/L3fwdCheck.py
@@ -0,0 +1,36 @@
+# 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:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from resources.libraries.python.Constants import Constants
+from resources.libraries.python.DpdkUtil import DpdkUtil
+from resources.libraries.python.ssh import exec_cmd_no_error, exec_cmd
+from resources.libraries.python.topology import NodeType, Topology
+
+
+class L3fwdCheck:
+    """Test the DPDK l3fwd is ready."""
+
+    @staticmethod
+    def check_l3fwd(node):
+        """
+        Execute the l3fwd check on the DUT node.
+
+        :param node: DUT node.
+        :type node: dict
+        :raises RuntimeError: If the script "check_l3fwd.sh" fails.
+        """
+        if node[u"type"] == NodeType.DUT:
+            command = f"{Constants.REMOTE_FW_DIR}/{Constants.RESOURCES_LIB_SH}"\
+                f"/entry/check_l3fwd.sh"
+            message = f"Failed to check l3fwd state at node {node['host']}"
+            exec_cmd_no_error(node, command, timeout=1800, message=message)
diff --git a/resources/libraries/python/DPDK/TestpmdCheck.py b/resources/libraries/python/DPDK/TestpmdCheck.py
new file mode 100644
index 0000000000..fb6f4dc791
--- /dev/null
+++ b/resources/libraries/python/DPDK/TestpmdCheck.py
@@ -0,0 +1,35 @@
+# 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:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from resources.libraries.python.Constants import Constants
+from resources.libraries.python.ssh import exec_cmd_no_error
+from resources.libraries.python.topology import NodeType
+
+
+class TestpmdCheck:
+    """Test the DPDK testpmd is ready."""
+
+    @staticmethod
+    def check_testpmd(node):
+        """
+        Execute the testpmd check on the DUT node.
+
+        :param node: DUT node.
+        :type node: dict
+        :raises RuntimeError: If the script "check_testpmd.sh" fails.
+        """
+        if node[u"type"] == NodeType.DUT:
+            command = f"{Constants.REMOTE_FW_DIR}/{Constants.RESOURCES_LIB_SH}"\
+                f"/entry/check_testpmd.sh"
+            message = f"Failed to check testpmd state at node {node['host']}"
+            exec_cmd_no_error(node, command, timeout=1800, message=message)
diff --git a/resources/libraries/python/DPDK/TestpmdTest.py b/resources/libraries/python/DPDK/TestpmdTest.py
index ed53acb0b5..f88b368e93 100644
--- a/resources/libraries/python/DPDK/TestpmdTest.py
+++ b/resources/libraries/python/DPDK/TestpmdTest.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:
@@ -74,7 +74,7 @@ class TestpmdTest:
                 pmd_rxq=queue_nums,
                 pmd_txq=queue_nums,
                 pmd_nb_cores=nb_cores,
-                pmd_disable_link_check=True,
+                pmd_disable_link_check=False,
                 pmd_auto_start=True,
                 pmd_numa=True
             )
-- 
cgit 1.2.3-korg