From 1577123a3c27541181097cb4186aa8855f20b1cc Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Fri, 21 Jun 2019 12:15:56 +0000 Subject: Align suite/test teardown/setup + Phase II - aligning FUNC/PERF setup. + 2n/3n compatibility of suite setup. + Same structure of testcase for DEV/PERF. + DEVICE tests are now running VPP startup config in same way as PERF. + DEVICE is using COREKEEPER! - DEVICE tests are running topology compute twice for backward compatibility. TODO to remove. - Still phase III needed to align TAGS, LIBRARIES and remove OLD setup phase. Change-Id: Ib6e1b0ebf4abebf3cbe73b4fda5cac953c2a7270 Signed-off-by: Peter Mikus --- topologies/available/vpp_device.template | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'topologies') diff --git a/topologies/available/vpp_device.template b/topologies/available/vpp_device.template index c855a716e7..4659575c80 100644 --- a/topologies/available/vpp_device.template +++ b/topologies/available/vpp_device.template @@ -19,11 +19,13 @@ nodes: mac_address: "${CSIT_TG_INTERFACES_PORT1_MAC}" pci_address: "${CSIT_TG_INTERFACES_PORT1_PCI}" link: link1 + model: virtual driver: "${CSIT_TG_INTERFACES_PORT1_DRV}" port2: mac_address: "${CSIT_TG_INTERFACES_PORT2_MAC}" pci_address: "${CSIT_TG_INTERFACES_PORT2_PCI}" link: link2 + model: virtual driver: "${CSIT_TG_INTERFACES_PORT2_DRV}" DUT1: type: DUT @@ -37,9 +39,11 @@ nodes: mac_address: "${CSIT_DUT1_INTERFACES_PORT1_MAC}" pci_address: "${CSIT_DUT1_INTERFACES_PORT1_PCI}" link: link1 + model: virtual driver: "${CSIT_DUT1_INTERFACES_PORT1_DRV}" port2: mac_address: "${CSIT_DUT1_INTERFACES_PORT2_MAC}" pci_address: "${CSIT_DUT1_INTERFACES_PORT2_PCI}" link: link2 + model: virtual driver: "${CSIT_DUT1_INTERFACES_PORT2_DRV}" -- cgit 1.2.3-korg