X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=topologies%2Favailable%2Flf_testbed2.yaml;h=e046fa5670dfaebf64dcd8d69f4027c079fdeb30;hb=eecad36d7d2275fa47fbcab40dbcf56108ab0a51;hp=1b34c18fe51d230713fc37dcd90f3c37130962e4;hpb=047c22946fc90d15cee7b7512fa4713124a43218;p=csit.git

diff --git a/topologies/available/lf_testbed2.yaml b/topologies/available/lf_testbed2.yaml
index 1b34c18fe5..e046fa5670 100644
--- a/topologies/available/lf_testbed2.yaml
+++ b/topologies/available/lf_testbed2.yaml
@@ -105,6 +105,13 @@ nodes:
     port: 22
     username: testuser
     password: Csit1234
+    cryptodev: 0000:86:00.0
+    uio_driver: igb_uio
+    honeycomb:
+      user: admin
+      passwd: admin
+      port: 8183
+      netconf_port: 2831
     interfaces:
       port1:
         # t2-sut1-c1/p1 - 10GE port1 on Intel NIC x520 2p10GE.
@@ -133,46 +140,52 @@ nodes:
       port5:
         # t2-sut1-c4/p1 - 40GE port1 on Intel NIC xl710 2p40GE.
         mac_address: "68:05:ca:35:77:08"
-        pci_address: "0000:85:00.0"
+        pci_address: "0000:88:00.0"
         link: link23
         model: Intel-XL710
       port6:
         # t2-sut1-c4/p2 - 40GE port2 on Intel NIC xl710 2p40GE.
         mac_address: "68:05:ca:35:77:09"
-        pci_address: "0000:85:00.1"
+        pci_address: "0000:88:00.1"
         link: link7
         model: Intel-XL710
       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"
+        pci_address: "0000:8a: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"
+        pci_address: "0000:8a:00.1"
         link: link9
         model: Intel-X710
-###TODO:links need to be identified before enabling interfaces###
-#      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
+      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"
     port: 22
     username: testuser
     password: Csit1234
+    cryptodev: 0000:86:00.0
+    uio_driver: igb_uio
+    honeycomb:
+      user: admin
+      passwd: admin
+      port: 8183
+      netconf_port: 2831
     interfaces:
       port1:
         # t2-sut2-c1/p1 - 10GE port1 on Intel NIC x520 2p10GE.
@@ -201,37 +214,36 @@ nodes:
       port5:
         # t2-sut2-c4/p1 - 40GE port1 on Intel NIC xl710 2p40GE.
         mac_address: "68:05:ca:35:76:98"
-        pci_address: "0000:85:00.0"
+        pci_address: "0000:88:00.0"
         link: link8
         model: Intel-XL710
       port6:
         # t2-sut2-c4/p2 - 40GE port2 on Intel NIC xl710 2p40GE.
         mac_address: "68:05:ca:35:76:99"
-        pci_address: "0000:85:00.1"
+        pci_address: "0000:88:00.1"
         link: link23
         model: Intel-XL710
       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"
+        pci_address: "0000:8a: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"
+        pci_address: "0000:8a:00.1"
         link: link24
         model: Intel-X710
-###TODO:links need to be identified before enabling interfaces###
-#      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
+      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