Update topology files after HW changes

Adding Intel QAT crypto card caused changes in PCI adresses

Change-Id: Ifeaa0dba87d0c1b3436d303e63dd2ff284526dd1
Signed-off-by: pmikus <pmikus@cisco.com>

diff --git a/topologies/available/lf_testbed1.yaml b/topologies/available/lf_testbed1.yaml
index 2f77a9a..d5dc88e 100644 (file)
--- a/topologies/available/lf_testbed1.yaml
+++ b/topologies/available/lf_testbed1.yaml
@@ -105,6 +105,8 @@ nodes:
     port: 22
     username: testuser
     password: Csit1234
     port: 22
     username: testuser
     password: Csit1234

+    cryptodev: 0000:86:00.0
+    uio_driver: igb_uio

     interfaces:
       port1:
         # t1-sut1-c1/p1 - 10GE port1 on Intel NIC x520 2p10GE.
     interfaces:
       port1:
         # t1-sut1-c1/p1 - 10GE port1 on Intel NIC x520 2p10GE.


@@ -133,25 +135,25 @@ nodes:
       port5:
         # t1-sut1-c4/p1 - 40GE port1 on Intel NIC xl710 2p40GE.
         mac_address: "68:05:ca:37:20:48"
       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"
         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
       port7:
         # t1-sut1-c5/p1 - 10GE port1 on Intel NIC x710 2p10GE.
         mac_address: "3c:fd:fe:9c:ee:c4"
         link: link7
         model: Intel-XL710
       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"
+        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"
         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:87:00.1"
+        pci_address: "0000:8a:00.1"

         link: link9
         model: Intel-X710
       port9:
         link: link9
         model: Intel-X710
       port9:


@@ -172,6 +174,8 @@ nodes:
     port: 22
     username: testuser
     password: Csit1234
     port: 22
     username: testuser
     password: Csit1234

+    cryptodev: 0000:86:00.0
+    uio_driver: igb_uio

     interfaces:
       port1:
         # t1-sut2-c1/p1 - 10GE port1 on Intel NIC x520 2p10GE.
     interfaces:
       port1:
         # t1-sut2-c1/p1 - 10GE port1 on Intel NIC x520 2p10GE.


@@ -200,25 +204,25 @@ nodes:
       port5:
         # t1-sut2-c4/p1 - 40GE port1 on Intel NIC xl710 2p40GE.
         mac_address: "68:05:ca:35:78:e8"
       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"
         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
       port7:
         # t1-sut2-c5/p1 - 10GE port1 on Intel NIC x710 2p10GE.
         mac_address: "3c:fd:fe:9c:ef:94"
         link: link23
         model: Intel-XL710
       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"
+        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"
         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"
+        pci_address: "0000:8a:00.1"

         link: link24
         model: Intel-X710
       port9:
         link: link24
         model: Intel-X710
       port9:

diff --git a/topologies/available/lf_testbed2.yaml b/topologies/available/lf_testbed2.yaml
index 89a4256..908797c 100644 (file)
--- a/topologies/available/lf_testbed2.yaml
+++ b/topologies/available/lf_testbed2.yaml
@@ -105,6 +105,8 @@ nodes:
     port: 22
     username: testuser
     password: Csit1234
     port: 22
     username: testuser
     password: Csit1234

+    cryptodev: 0000:86:00.0
+    uio_driver: igb_uio

     interfaces:
       port1:
         # t2-sut1-c1/p1 - 10GE port1 on Intel NIC x520 2p10GE.
     interfaces:
       port1:
         # t2-sut1-c1/p1 - 10GE port1 on Intel NIC x520 2p10GE.


@@ -133,25 +135,25 @@ nodes:
       port5:
         # t2-sut1-c4/p1 - 40GE port1 on Intel NIC xl710 2p40GE.
         mac_address: "68:05:ca:35:77:08"
       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"
         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"
         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"
         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
       port9:
         link: link9
         model: Intel-X710
       port9:


@@ -172,6 +174,8 @@ nodes:
     port: 22
     username: testuser
     password: Csit1234
     port: 22
     username: testuser
     password: Csit1234

+    cryptodev: 0000:86:00.0
+    uio_driver: igb_uio

     interfaces:
       port1:
         # t2-sut2-c1/p1 - 10GE port1 on Intel NIC x520 2p10GE.
     interfaces:
       port1:
         # t2-sut2-c1/p1 - 10GE port1 on Intel NIC x520 2p10GE.


@@ -200,25 +204,25 @@ nodes:
       port5:
         # t2-sut2-c4/p1 - 40GE port1 on Intel NIC xl710 2p40GE.
         mac_address: "68:05:ca:35:76:98"
       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"
         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"
         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"
         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
       port9:
         link: link24
         model: Intel-X710
       port9:

diff --git a/topologies/available/lf_testbed3.yaml b/topologies/available/lf_testbed3.yaml
index 579db0b..e68a987 100644 (file)
--- a/topologies/available/lf_testbed3.yaml
+++ b/topologies/available/lf_testbed3.yaml
@@ -105,7 +105,8 @@ nodes:
     port: 22
     username: testuser
     password: Csit1234
     port: 22
     username: testuser
     password: Csit1234

-    cryptodev: "dev 0000:86:00.0"
+    cryptodev: 0000:86:00.0
+    uio_driver: igb_uio

     interfaces:
       port1:
         # t3-sut1-c1/p1 - 10GE port1 on Intel NIC x520 2p10GE.
     interfaces:
       port1:
         # t3-sut1-c1/p1 - 10GE port1 on Intel NIC x520 2p10GE.


@@ -173,7 +174,8 @@ nodes:
     port: 22
     username: testuser
     password: Csit1234
     port: 22
     username: testuser
     password: Csit1234

-    cryptodev: "dev 0000:86:00.0"
+    cryptodev: 0000:86:00.0
+    uio_driver: igb_uio

     interfaces:
       port1:
         # t3-sut3-c1/p1 - 10GE port1 on Intel NIC x520 2p10GE.
     interfaces:
       port1:
         # t3-sut3-c1/p1 - 10GE port1 on Intel NIC x520 2p10GE.