Code Review / csit.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
TB2 Cisco-VIC-1227
[csit.git] / topologies / available / lf_testbed2.yaml
diff --git a/topologies/available/lf_testbed2.yaml b/topologies/available/lf_testbed2.yaml
index 2c486d6..89a4256 100644 (file)
--- 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"
@@ -143,31 +142,30 @@ nodes:
         pci_address: "0000:85:00.1"
         link: link7
         model: Intel-XL710
-###TODO:links need to be identified before enabling interfaces###
-#      port7:
-#        # t2-sut1-c5/p1 - 10GE port1 on Intel NIC x710 2p10GE.
-#        mac_address: "3c:fd:fe:9c:ee:ec"
-#        pci_address: "0000:87:00.0"
-#        link:
-#        model: Intel-X710
-#      port8:
-#        # t2-sut1-c5/p2 - 10GE port2 on Intel NIC x710 2p10GE.
-#        mac_address: "3c:fd:fe:9c:ee:ed"
-#        pci_address: "0000:87:00.1"
-#        link:
-#        model: Intel-X710
-#      port9:
-#        # t2-sut1-cm/p1 - 10GE port1 on Cisco VIC 1227 2p10GE.
-#        mac_address: "00:fe:c8:e4:d0:9b"
-#        pci_address: "0000:06:00.0"
-#        link:
-#        model: Cisco-VIC-1227
-#      port10:
-#        # t2-sut1-cm/p2 - 10GE port2 on Cisco VIC 1227 2p10GE.
-#        mac_address: "00:fe:c8:e4:d0:9c"
-#        pci_address: "0000:07:00.0"
-#        link:
-#        model: Cisco-VIC-1227
+      port7:
+        # t2-sut1-c5/p1 - 10GE port1 on Intel NIC x710 2p10GE.
+        mac_address: "3c:fd:fe:9c:ee:ec"
+        pci_address: "0000:87:00.0"
+        link: link24
+        model: Intel-X710
+      port8:
+        # t2-sut1-c5/p2 - 10GE port2 on Intel NIC x710 2p10GE.
+        mac_address: "3c:fd:fe:9c:ee:ed"
+        pci_address: "0000:87:00.1"
+        link: link9
+        model: Intel-X710
+      port9:
+        # t2-sut1-cm/p1 - 10GE port1 on Cisco VIC 1227 2p10GE.
+        mac_address: "00:fe:c8:e4:d0:9b"
+        pci_address: "0000:06:00.0"
+        link: link25
+        model: Cisco-VIC-1227
+      port10:
+        # t2-sut1-cm/p2 - 10GE port2 on Cisco VIC 1227 2p10GE.
+        mac_address: "00:fe:c8:e4:d0:9c"
+        pci_address: "0000:07:00.0"
+        link: link5
+        model: Cisco-VIC-1227
   DUT2:
     type: DUT
     host: "10.30.51.22"
@@ -187,19 +185,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"
@@ -212,28 +209,27 @@ nodes:
         pci_address: "0000:85:00.1"
         link: link23
         model: Intel-XL710
-###TODO:links need to be identified before enabling interfaces###
-#      port7:
-#        # t2-sut2-c5/p1 - 10GE port1 on Intel NIC x710 2p10GE.
-#        mac_address: "3c:fd:fe:9c:ee:e4"
-#        pci_address: "0000:87:00.0"
-#        link:
-#        model: Intel-X710
-#      port8:
-#        # t2-sut2-c5/p2 - 10GE port2 on Intel NIC x710 2p10GE.
-#        mac_address: "3c:fd:fe:9c:ee:e5"
-#        pci_address: "0000:87:00.1"
-#        link:
-#        model: Intel-X710
-#      port9:
-#        # t2-sut2-cm/p1 - 10GE port1 on Cisco VIC 1227 2p10GE.
-#        mac_address: "00:fe:c8:e4:eb:4b"
-#        pci_address: "0000:06:00.0"
-#        link:
-#        model: Cisco-VIC-1227
-#      port10:
-#        # t2-sut2-cm/p2 - 10GE port2 on Cisco VIC 1227 2p10GE.
-#        mac_address: "00:fe:c8:e4:eb:4c"
-#        pci_address: "0000:07:00.0"
-#        link:
-#        model: Cisco-VIC-1227
+      port7:
+        # t2-sut2-c5/p1 - 10GE port1 on Intel NIC x710 2p10GE.
+        mac_address: "3c:fd:fe:9c:ee:e4"
+        pci_address: "0000:87:00.0"
+        link: link10
+        model: Intel-X710
+      port8:
+        # t2-sut2-c5/p2 - 10GE port2 on Intel NIC x710 2p10GE.
+        mac_address: "3c:fd:fe:9c:ee:e5"
+        pci_address: "0000:87:00.1"
+        link: link24
+        model: Intel-X710
+      port9:
+        # t2-sut2-cm/p1 - 10GE port1 on Cisco VIC 1227 2p10GE.
+        mac_address: "00:fe:c8:e4:eb:4b"
+        pci_address: "0000:06:00.0"
+        link: link6
+        model: Cisco-VIC-1227
+      port10:
+        # t2-sut2-cm/p2 - 10GE port2 on Cisco VIC 1227 2p10GE.
+        mac_address: "00:fe:c8:e4:eb:4c"
+        pci_address: "0000:07:00.0"
+        link: link25
+        model: Cisco-VIC-1227
Integration tests