From: Vratko Polak Date: Wed, 7 Feb 2024 13:36:29 +0000 (+0100) Subject: fix(bootstrap): skip suites for virtual NIC X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=commitdiff_plain;h=7705455505377fffaa61173c62f305c1a2107795 fix(bootstrap): skip suites for virtual NIC As the skipping logic looks at available topologies, fix skipping by adding virtual to vagrant.yaml Change-Id: I5e7bf1dc2f4f4787917f1f989a974255cf2591a9 Signed-off-by: Vratko Polak --- diff --git a/resources/libraries/python/Constants.py b/resources/libraries/python/Constants.py index df6b2dd1aa..12f555ca84 100644 --- a/resources/libraries/python/Constants.py +++ b/resources/libraries/python/Constants.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: @@ -407,7 +407,7 @@ class Constants: "100ge2p1cx6dx": "cx6dx", "200ge2p1cx7veat": "cx7veat", "200ge6p3cx7veat": "cx7veat", - "1ge1p82540em": "8250em", + "1ge1p82540em": "82540em", } # Not each driver is supported by each NIC. diff --git a/topologies/available/vagrant.yaml b/topologies/available/vagrant.yaml index b2a444efc9..a9177c799e 100644 --- a/topologies/available/vagrant.yaml +++ b/topologies/available/vagrant.yaml @@ -20,31 +20,37 @@ nodes: pci_address: "0000:00:09.0" link: link0 driver: e1000 + model: virtual port2: mac_address: "" pci_address: "0000:00:0a.0" link: link0 driver: e1000 + model: virtual port3: mac_address: "" pci_address: "0000:00:10.0" link: link1 driver: e1000 + model: virtual port4: mac_address: "" pci_address: "0000:00:11.0" link: link4 driver: e1000 + model: virtual port5: mac_address: "" pci_address: "0000:00:12.0" link: link2 driver: e1000 + model: virtual port6: mac_address: "" pci_address: "0000:00:13.0" link: link5 driver: e1000 + model: virtual DUT1: type: DUT host: "192.168.255.101" @@ -58,21 +64,25 @@ nodes: pci_address: "0000:00:09.0" link: link1 driver: e1000 + model: virtual port2: mac_address: "" pci_address: "0000:00:0a.0" link: link4 driver: e1000 + model: virtual port3: mac_address: "" pci_address: "0000:00:10.0" link: link3 driver: e1000 + model: virtual port4: mac_address: "" pci_address: "0000:00:11.0" link: link6 driver: e1000 + model: virtual DUT2: type: DUT host: "192.168.255.102" @@ -86,18 +96,22 @@ nodes: pci_address: "0000:00:09.0" link: link2 driver: e1000 + model: virtual port2: mac_address: "" pci_address: "0000:00:0a.0" link: link5 driver: e1000 + model: virtual port3: mac_address: "" pci_address: "0000:00:10.0" link: link3 driver: e1000 + model: virtual port4: mac_address: "" pci_address: "0000:00:11.0" link: link6 driver: e1000 + model: virtual