diff options
Diffstat (limited to 'resources/libraries')
| -rw-r--r-- | resources/libraries/bash/function/common.sh | 17 | ||||
| -rw-r--r-- | resources/libraries/python/Constants.py | 2 | ||||
| -rw-r--r-- | resources/libraries/python/DUTSetup.py | 6 | ||||
| -rw-r--r-- | resources/libraries/python/SetupFramework.py | 7 |
4 files changed, 22 insertions, 10 deletions
diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh index 9fd208b465..fa00b14ded 100644 --- a/resources/libraries/bash/function/common.sh +++ b/resources/libraries/bash/function/common.sh @@ -128,6 +128,7 @@ function activate_virtualenv () { set +u source "${env_dir}/bin/activate" || die "Virtualenv activation failed." set -u + pip3 install setuptools pip3 install -r "${req_path}" || { die "Requirements installation failed." } @@ -519,6 +520,10 @@ function get_test_code () { NODENESS="3n" FLAVOR="alt" ;; + *"2n-grc") + NODENESS="2n" + FLAVOR="grc" + ;; *"-x-2n"*) TESTBED="${TEST_CODE#${TEST_CODE%2n*}}" NODENESS="${TESTBED%-${TEST_CODE#*-x-2n*-}}" @@ -765,7 +770,7 @@ function reserve_and_cleanup_testbed () { } # Cleanup + calibration checks set +e - ansible_playbook "cleanup, calibration" + ansible_playbook "cleanup,calibration" result="$?" set -e if [[ "${result}" == "0" ]]; then @@ -960,6 +965,9 @@ function select_tags () { *"3n-alt") default_nic="nic_intel-xl710" ;; + *"2n-grc") + default_nic="nic_mellanox-cx7veat" + ;; *"1n-aws" | *"2n-aws" | *"3n-aws") default_nic="nic_amazon-nitro-50g" ;; @@ -1103,6 +1111,9 @@ function select_tags () { *"3n-alt") test_tag_array+=("!ipsechw") ;; + *"2n-grc") + test_tag_array+=("!ipsechw") + ;; *"3n-icx") test_tag_array+=("!ipsechw") test_tag_array+=("!3_node_double_link_topoANDnic_intel-xxv710") @@ -1231,6 +1242,10 @@ function select_topology () { TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n_alt_*.yaml ) TOPOLOGIES_TAGS="3_node_single_link_topo" ;; + *"2n-grc") + TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_grc_*.yaml ) + TOPOLOGIES_TAGS="2_node_single_link_topo" + ;; *"3n-aws") TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n-aws*.yaml ) TOPOLOGIES_TAGS="3_node_single_link_topo" diff --git a/resources/libraries/python/Constants.py b/resources/libraries/python/Constants.py index 3fabe0141b..76bb296325 100644 --- a/resources/libraries/python/Constants.py +++ b/resources/libraries/python/Constants.py @@ -180,7 +180,7 @@ class Constants: QEMU_VM_IMAGE = "/var/lib/vm/image.iso" # QEMU VM DPDK path - QEMU_VM_DPDK = "/opt/dpdk-23.11" + QEMU_VM_DPDK = "/opt/dpdk-24.07" # Docker container SUT image DOCKER_SUT_IMAGE_UBUNTU = "csit_sut-ubuntu2204:local" diff --git a/resources/libraries/python/DUTSetup.py b/resources/libraries/python/DUTSetup.py index 64f3b4317c..bc8af372df 100644 --- a/resources/libraries/python/DUTSetup.py +++ b/resources/libraries/python/DUTSetup.py @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Cisco and/or its affiliates. +# Copyright (c) 2024 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: @@ -631,7 +631,9 @@ class DUTSetup: """ if not hugesize: hugesize = "$(grep Hugepagesize /proc/meminfo | awk '{ print $2 }')" - command = f"cat /sys/kernel/mm/hugepages/hugepages-{hugesize}kB/*" + command = ( + f"cat /sys/kernel/mm/hugepages/hugepages-{hugesize}kB/*hugepages*" + ) stdout, _ = exec_cmd_no_error(node, command) try: line = stdout.splitlines() diff --git a/resources/libraries/python/SetupFramework.py b/resources/libraries/python/SetupFramework.py index 95ca8a7d51..438116fce0 100644 --- a/resources/libraries/python/SetupFramework.py +++ b/resources/libraries/python/SetupFramework.py @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Cisco and/or its affiliates. +# Copyright (c) 2024 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: @@ -165,11 +165,6 @@ def setup_node(node, tarball, remote_tarball, results=None, logs=None): try: copy_tarball_to_node(tarball, node) extract_tarball_at_node(remote_tarball, node) - if node[u"type"] == NodeType.TG: - stdout, stderr = create_env_directory_at_node(node) - if isinstance(logs, list): - logs.append(f"{node[u'host']} Env stdout: {stdout}") - logs.append(f"{node[u'host']} Env stderr: {stderr}") except Exception: # any exception must result in result = False # since this runs in a thread and can't be caught anywhere else |