X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=topologies%2Favailable%2Flf_testbed1.yaml;h=b7ad638f2af56fbaf8d2939f3bddf87329581726;hp=e55df8cc7d8de732084d740936701103f32d1301;hb=32219bc12fb10a663d2f2372434631e892fc5cb3;hpb=e98eac4fea0956dacc5589baa7991723c0e2bf20

diff --git a/topologies/available/lf_testbed1.yaml b/topologies/available/lf_testbed1.yaml
index e55df8cc7d..b7ad638f2a 100644
--- a/topologies/available/lf_testbed1.yaml
+++ b/topologies/available/lf_testbed1.yaml
@@ -13,7 +13,7 @@ nodes:
     host: "10.30.51.16"
     port: 22
     username: testuser
-    password: Cisco1234
+    password: Csit1234
     interfaces:
       port1:
         # t1-tg1-c1/p1 - 40GE port1 on Intel NIC xl710 2p40GE.
@@ -30,28 +30,28 @@ nodes:
         link: link2
         model: Intel-XL710
       port3:
-        # t1-tg1-c2/p1 - 10GE port1 on Intel NIC x710 2p10GE.
-        mac_address: "3c:fd:fe:9c:ed:a0"
+        # t1-tg1-c3/p1 - 10GE port1 on Intel NIC x710 2p10GE.
+        mac_address: "3c:fd:fe:9c:ee:a0"
         pci_address: "0000:05:00.0"
         driver: i40e
         link: link3
         model: Intel-X710
       port4:
-        # t1-tg1-c2/p2 - 10GE port2 on Intel NIC x710 2p10GE.
-        mac_address: "3c:fd:fe:9c:ed:a1"
+        # t1-tg1-c3/p2 - 10GE port2 on Intel NIC x710 2p10GE.
+        mac_address: "3c:fd:fe:9c:ee:a1"
         pci_address: "0000:05:00.1"
         driver: i40e
         link: link4
         model: Intel-X710
       port5:
-        # t1-tg1-c3/p1 - 10GE port1 on Intel NIC x710 2p10GE.
+        # t1-tg1-c2/p1 - 10GE port1 on Intel NIC x710 2p10GE.
         mac_address: "3c:fd:fe:9c:ed:50"
         pci_address: "0000:07:00.0"
         driver: i40e
         link: link5
         model: Intel-X710
       port6:
-        # t1-tg1-c3/p2 - 10GE port2 on Intel NIC x710 2p10GE.
+        # t1-tg1-c2/p2 - 10GE port2 on Intel NIC x710 2p10GE.
         mac_address: "3c:fd:fe:9c:ed:51"
         pci_address: "0000:07:00.1"
         driver: i40e
@@ -104,136 +104,137 @@ nodes:
     host: "10.30.51.17"
     port: 22
     username: testuser
-    password: Cisco1234
+    password: Csit1234
+    cryptodev: 0000:86:00.0
+    uio_driver: igb_uio
     interfaces:
       port1:
         # t1-sut1-c1/p1 - 10GE port1 on Intel NIC x520 2p10GE.
-        mac_address: "90:e2:ba:b5:0a:2c"
+        mac_address: "90:e2:ba:b5:0a:18"
         pci_address: "0000:0a:00.0"
         link: link21
         model: Intel-X520-DA2
       port2:
         # t1-sut1-c1/p2 - 10GE port2 on Intel NIC x520 2p10GE.
-        mac_address: "90:e2:ba:b5:0a:2d"
+        mac_address: "90:e2:ba:b5:0a:19"
         pci_address: "0000:0a:00.1"
         link: link3
         model: Intel-X520-DA2
-###TODO:links need to be identified before enabling interfaces###
-#      port3:
-#        # t1-sut1-c2/p1 - 40GE port1 on Cisco VIC 1385 2p40GE.
-#        mac_address: "04:62:73:8c:c3:0f"
-#        pci_address: "0000:13:00.0"
-#        link:
-#        model: Cisco-VIC-1385
-#      port4:
-#        # t1-sut1-c2/p2 - 40GE port2 on Cisco VIC 1385 2p40GE.
-#        mac_address: "04:62:73:8c:c3:10"
-#        pci_address: "0000:14:00.0"
-#        link:
-#        model: Cisco-VIC-1385
+      port3:
+        # t1-sut1-c2/p1 - 40GE port1 on Cisco VIC 1385 2p40GE.
+        mac_address: "04:62:73:8c:c3:0f"
+        pci_address: "0000:13:00.0"
+        link: link22
+        model: Cisco-VIC-1385
+      port4:
+        # t1-sut1-c2/p2 - 40GE port2 on Cisco VIC 1385 2p40GE.
+        mac_address: "04:62:73:8c:c3:10"
+        pci_address: "0000:14:00.0"
+        link: link1
+        model: Cisco-VIC-1385
       port5:
         # t1-sut1-c4/p1 - 40GE port1 on Intel NIC xl710 2p40GE.
         mac_address: "68:05:ca:37:20:48"
-        pci_address: "0000:85:00.0"
+        pci_address: "0000:88:00.0"
         link: link23
         model: Intel-XL710
       port6:
         # t1-sut1-c4/p2 - 40GE port2 on Intel NIC xl710 2p40GE.
         mac_address: "68:05:ca:37:20:49"
-        pci_address: "0000:85:00.1"
+        pci_address: "0000:88:00.1"
         link: link7
         model: Intel-XL710
-###TODO:links need to be identified before enabling interfaces###
-#      port7:
-#        # t1-sut1-c5/p1 - 10GE port1 on Intel NIC x710 2p10GE.
-#        mac_address: "3c:fd:fe:9c:ee:c4"
-#        pci_address: "0000:87:00.0"
-#        link: link15
-#        model: Intel-X710
-#      port8:
-#        # t1-sut1-c5/p2 - 10GE port2 on Intel NIC x710 2p10GE.
-#        mac_address: "3c:fd:fe:9c:ee:c5"
-#        pci_address: "0000:87:00.1"
-#        link: link9
-#        model: Intel-X710
-#      port9:
-#        # t1-sut1-cm/p1 - 10GE port1 on Cisco VIC 1227 2p10GE.
-#        mac_address: "00:fe:c8:e4:d0:1b"
-#        pci_address: "0000:06:00.0"
-#        link: link16
-#        model: Cisco-VIC-1227
-#      port10:
-#        # t1-sut1-cm/p2 - 10GE port2 on Cisco VIC 1227 2p10GE.
-#        mac_address: "00:fe:c8:e4:d0:1c"
-#        pci_address: "0000:07:00.0"
-#        link: link3
-#        model: Cisco-VIC-1227
+      port7:
+        # t1-sut1-c5/p1 - 10GE port1 on Intel NIC x710 2p10GE.
+        mac_address: "3c:fd:fe:9c:ee:c4"
+        pci_address: "0000:8a:00.0"
+        link: link24
+        model: Intel-X710
+      port8:
+        # t1-sut1-c5/p2 - 10GE port2 on Intel NIC x710 2p10GE.
+        mac_address: "3c:fd:fe:9c:ee:c5"
+        pci_address: "0000:8a:00.1"
+        link: link9
+        model: Intel-X710
+      port9:
+        # t1-sut1-cm/p1 - 10GE port1 on Cisco VIC 1227 2p10GE.
+        mac_address: "00:fe:c8:e4:d0:1b"
+        pci_address: "0000:06:00.0"
+        link: link25
+        model: Cisco-VIC-1227
+      port10:
+        # t1-sut1-cm/p2 - 10GE port2 on Cisco VIC 1227 2p10GE.
+        mac_address: "00:fe:c8:e4:d0:1c"
+        pci_address: "0000:07:00.0"
+        link: link5
+        model: Cisco-VIC-1227
   DUT2:
     type: DUT
     host: "10.30.51.18"
     port: 22
     username: testuser
-    password: Cisco1234
+    password: Csit1234
+    cryptodev: 0000:86:00.0
+    uio_driver: igb_uio
     interfaces:
       port1:
         # t1-sut2-c1/p1 - 10GE port1 on Intel NIC x520 2p10GE.
-        mac_address: "90:e2:ba:b5:12:30"
+        mac_address: "90:e2:ba:b5:05:e4"
         pci_address: "0000:0a:00.0"
         link: link4
         model: Intel-X520-DA2
       port2:
         # t1-sut2-c1/p2 - 10GE port2 on Intel NIC x520 2p10GE.
-        mac_address: "90:e2:ba:b5:12:31"
+        mac_address: "90:e2:ba:b5:05:e5"
         pci_address: "0000:0a:00.1"
         link: link21
         model: Intel-X520-DA2
-###TODO:links need to be identified before enabling interfaces###
-#      port3:
-#        # t1-sut2-c2/p1 - 40GE port1 on Cisco VIC 1385 2p40GE.
-#        mac_address: "d8:b1:90:19:41:69"
-#        pci_address: "0000:13:00.0"
-#        link: link4
-#        model: Cisco-VIC-1385
-#      port4:
-#        # t1-sut2-c2/p2 - 40GE port2 on Cisco VIC 1385 2p40GE.
-#        mac_address: "d8:b1:90:19:41:6a"
-#        pci_address: "0000:15:00.0"
-#        link: link13
-#        model: Cisco-VIC-1385
+      port3:
+        # t1-sut2-c2/p1 - 40GE port1 on Cisco VIC 1385 2p40GE.
+        mac_address: "d8:b1:90:19:41:69"
+        pci_address: "0000:13:00.0"
+        link: link2
+        model: Cisco-VIC-1385
+      port4:
+        # t1-sut2-c2/p2 - 40GE port2 on Cisco VIC 1385 2p40GE.
+        mac_address: "d8:b1:90:19:41:6a"
+        pci_address: "0000:15:00.0"
+        link: link22
+        model: Cisco-VIC-1385
       port5:
         # t1-sut2-c4/p1 - 40GE port1 on Intel NIC xl710 2p40GE.
         mac_address: "68:05:ca:35:78:e8"
-        pci_address: "0000:85:00.0"
+        pci_address: "0000:88:00.0"
         link: link8
         model: Intel-XL710
       port6:
         # t1-sut2-c4/p2 - 40GE port2 on Intel NIC xl710 2p40GE.
         mac_address: "68:05:ca:35:78:e9"
-        pci_address: "0000:85:00.1"
+        pci_address: "0000:88:00.1"
         link: link23
         model: Intel-XL710
-###TODO:links need to be identified before enabling interfaces###
-#      port7:
-#        # t1-sut2-c5/p1 - 10GE port1 on Intel NIC x710 2p10GE.
-#        mac_address: "3c:fd:fe:9c:ef:94"
-#        pci_address: "0000:87:00.0"
-#        link: link10
-#        model: Intel-X710
-#      port8:
-#        # t1-sut2-c5/p2 - 10GE port2 on Intel NIC x710 2p10GE.
-#        mac_address: "3c:fd:fe:9c:ef:95"
-#        pci_address: "0000:87:00.1"
-#        link: link15
-#        model: Intel-X710
-#      port9:
-#        # t1-sut2-cm/p1 - 10GE port1 on Cisco VIC 1227 2p10GE.
-#        mac_address: "00:fe:c8:e5:44:4c"
-#        pci_address: "0000:06:00.0"
-#        link: link4
-#        model: Cisco-VIC-1227
-#      port10:
-#        # t1-sut2-cm/p2 - 10GE port2 on Cisco VIC 1227 2p10GE.
-#        mac_address: "00:fe:c8:e5:44:4d"
-#        pci_address: "0000:07:00.0"
-#        link: link16
-#        model: Cisco-VIC-1227
+      port7:
+        # t1-sut2-c5/p1 - 10GE port1 on Intel NIC x710 2p10GE.
+        mac_address: "3c:fd:fe:9c:ef:94"
+        pci_address: "0000:8a:00.0"
+        link: link10
+        model: Intel-X710
+      port8:
+        # t1-sut2-c5/p2 - 10GE port2 on Intel NIC x710 2p10GE.
+        mac_address: "3c:fd:fe:9c:ef:95"
+        pci_address: "0000:8a:00.1"
+        link: link24
+        model: Intel-X710
+      port9:
+        # t1-sut2-cm/p1 - 10GE port1 on Cisco VIC 1227 2p10GE.
+        mac_address: "00:fe:c8:e5:44:4c"
+        pci_address: "0000:06:00.0"
+        link: link6
+        model: Cisco-VIC-1227
+      port10:
+        # t1-sut2-cm/p2 - 10GE port2 on Cisco VIC 1227 2p10GE.
+        mac_address: "00:fe:c8:e5:44:4d"
+        pci_address: "0000:07:00.0"
+        link: link25
+        model: Cisco-VIC-1227
+