From 047c22946fc90d15cee7b7512fa4713124a43218 Mon Sep 17 00:00:00 2001 From: Miroslav Miklus Date: Mon, 24 Oct 2016 22:16:22 +0200 Subject: [PATCH 1/1] TB2 Cisco-VIC-1385 Change-Id: If2b601470dfab46966987611c86d6f0e32859bcc Signed-off-by: Miroslav Miklus --- topologies/available/lf_testbed2.yaml | 50 +++++++++++++++++------------------ 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/topologies/available/lf_testbed2.yaml b/topologies/available/lf_testbed2.yaml index 0d95dee46f..1b34c18fe5 100644 --- a/topologies/available/lf_testbed2.yaml +++ b/topologies/available/lf_testbed2.yaml @@ -118,19 +118,18 @@ nodes: pci_address: "0000:0a:00.1" link: link3 model: Intel-X520-DA2 -###TODO:links need to be identified before enabling interfaces### -# port3: -# # t2-sut1-c2/p1 - 40GE port1 on Cisco VIC 1385 2p40GE. -# mac_address: "04:62:73:8c:ca:cd" -# pci_address: "0000:13:00.0" -# link: -# model: Cisco-VIC-1385 -# port4: -# # t2-sut1-c2/p2 - 40GE port2 on Cisco VIC 1385 2p40GE. -# mac_address: "04:62:73:8c:ca:ce" -# pci_address: "0000:15:00.0" -# link: -# model: Cisco-VIC-1385 + port3: + # t2-sut1-c2/p1 - 40GE port1 on Cisco VIC 1385 2p40GE. + mac_address: "04:62:73:8c:ca:cd" + pci_address: "0000:13:00.0" + link: link22 + model: Cisco-VIC-1385 + port4: + # t2-sut1-c2/p2 - 40GE port2 on Cisco VIC 1385 2p40GE. + mac_address: "04:62:73:8c:ca:ce" + pci_address: "0000:15:00.0" + link: link1 + model: Cisco-VIC-1385 port5: # t2-sut1-c4/p1 - 40GE port1 on Intel NIC xl710 2p40GE. mac_address: "68:05:ca:35:77:08" @@ -187,19 +186,18 @@ nodes: pci_address: "0000:0a:00.1" link: link21 model: Intel-X520-DA2 -###TODO:links need to be identified before enabling interfaces### -# port3: -# # t2-sut2-c2/p1 - 40GE port1 on Cisco VIC 1385 2p40GE. -# mac_address: "ec:bd:1d:08:8f:88" -# pci_address: "0000:13:00.0" -# link: link4 -# model: Cisco-VIC-1385 -# port4: -# # t2-sut2-c2/p2 - 40GE port2 on Cisco VIC 1385 2p40GE. -# mac_address: "ec:bd:1d:08:8f:89" -# pci_address: "0000:15:00.0" -# link: link13 -# model: Cisco-VIC-1385 + port3: + # t2-sut2-c2/p1 - 40GE port1 on Cisco VIC 1385 2p40GE. + mac_address: "ec:bd:1d:08:8f:88" + pci_address: "0000:13:00.0" + link: link2 + model: Cisco-VIC-1385 + port4: + # t2-sut2-c2/p2 - 40GE port2 on Cisco VIC 1385 2p40GE. + mac_address: "ec:bd:1d:08:8f:89" + pci_address: "0000:15:00.0" + link: link22 + model: Cisco-VIC-1385 port5: # t2-sut2-c4/p1 - 40GE port1 on Intel NIC xl710 2p40GE. mac_address: "68:05:ca:35:76:98" -- 2.16.6