diff options
| -rw-r--r-- | resources/libraries/bash/function/common.sh | 13 | ||||
| -rw-r--r-- | topologies/available/lf_2n_tx2_testbed34.yaml | 64 |
2 files changed, 76 insertions, 1 deletions
diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh index 2f15762da5..83ebeebe39 100644 --- a/resources/libraries/bash/function/common.sh +++ b/resources/libraries/bash/function/common.sh @@ -465,6 +465,10 @@ function get_test_code () { NODENESS="3n" FLAVOR="dnv" ;; + *"2n-tx2"*) + NODENESS="2n" + FLAVOR="tx2" + ;; *"3n-tsh"*) NODENESS="3n" FLAVOR="tsh" @@ -796,7 +800,7 @@ function select_tags () { *"3n-skx"* | *"2n-skx"* | *"2n-clx"* | *"2n-zn2"*) default_nic="nic_intel-xxv710" ;; - *"3n-hsw"* | *"mrr-daily-master") + *"3n-hsw"* | *"2n-tx2"* | *"mrr-daily-master") default_nic="nic_intel-xl710" ;; *) @@ -904,6 +908,9 @@ function select_tags () { test_tag_array+=("!vts") test_tag_array+=("!drv_avf") ;; + *"2n-tx2"*) + test_tag_array+=("!ipsechw") + ;; *"3n-dnv"*) test_tag_array+=("!memif") test_tag_array+=("!srv6_proxy") @@ -1032,6 +1039,10 @@ function select_topology () { TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n_tsh*.yaml ) TOPOLOGIES_TAGS="3_node_single_link_topo" ;; + "2n_tx2") + TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_tx2*.yaml ) + TOPOLOGIES_TAGS="2_node_single_link_topo" + ;; *) # No falling back to 3n_hsw default, that should have been done # by the function which has set NODENESS and FLAVOR. diff --git a/topologies/available/lf_2n_tx2_testbed34.yaml b/topologies/available/lf_2n_tx2_testbed34.yaml new file mode 100644 index 0000000000..6c08aaf183 --- /dev/null +++ b/topologies/available/lf_2n_tx2_testbed34.yaml @@ -0,0 +1,64 @@ +# Copyright (c) 2020 PANTHEON.tech 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. + +--- +metadata: + version: 0.1 + schema: # list of schema files against which to validate + - resources/topology_schemas/2_node_topology.sch.yaml + - resources/topology_schemas/topology.sch.yaml + tags: [hw, 2-node] + +nodes: + TG: + type: TG + subtype: TREX + host: 10.30.51.49 + arch: x86_64 + port: 6002 + username: root + password: Csit1234 + interfaces: + port0: + mac_address: "3c:fd:fe:c3:e0:90" + pci_address: "0000:af:00.0" + link: link1 + driver: i40e + model: Intel-XL710 + port1: + mac_address: "3c:fd:fe:c3:e0:91" + pci_address: "0000:af:00.1" + link: link2 + driver: i40e + model: Intel-XL710 + DUT1: + type: DUT + host: 10.30.51.69 + arch: aarch64 + port: 22 + uio_driver: vfio-pci + username: testuser + password: Csit1234 + interfaces: + port0: + mac_address: "3c:fd:fe:c3:e9:70" + pci_address: "0000:91:00.0" + link: link1 + driver: i40e + model: Intel-XL710 + port1: + mac_address: "3c:fd:fe:c3:e9:71" + pci_address: "0000:91:00.1" + link: link2 + driver: i40e + model: Intel-XL710 |