From: Guillermo Herrero <guillermo.herrero@enea.com>
Date: Wed, 28 Nov 2018 13:02:36 +0000 (+0100)
Subject: arm pod-10: reorder unused interfaces
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=e54f2c00727fc2c6e03b718baa91e254887fc42e;p=pharos.git

arm pod-10: reorder unused interfaces

Change-Id: I491edc564a2b0777c0afc65eb0ebc1b2d97f44fc
Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
---

diff --git a/labs/arm/idf-pod10.yaml b/labs/arm/idf-pod10.yaml
index 4cb325b6..ab014465 100644
--- a/labs/arm/idf-pod10.yaml
+++ b/labs/arm/idf-pod10.yaml
@@ -68,19 +68,19 @@ idf:
         - interfaces: &interfaces_intel
             # Ordered-list, index should be in sync with interface index in PDF
             - 'eno1'
+            - 'enp5s0f0'
+            - 'enp5s0f1'
             - 'eno2'
             - 'eno3'
             - 'eno4'
-            - 'enp5s0f0'
-            - 'enp5s0f1'
           busaddr: &busaddr_intel
             # Bus-info reported by `ethtool -i ethX`
             - '0000:02:00.0'
-            - '0000:02:00.1'
-            - '0000:02:00.0'
-            - '0000:03:00.1'
             - '0000:05:00.0'
             - '0000:05:00.1'
+            - '0000:02:00.1'
+            - '0000:03:00.0'
+            - '0000:03:00.1'
         - interfaces: *interfaces_intel
           busaddr: *busaddr_intel
         - interfaces: *interfaces_intel
diff --git a/labs/arm/pod10.yaml b/labs/arm/pod10.yaml
index 72160d5d..4f02aad4 100644
--- a/labs/arm/pod10.yaml
+++ b/labs/arm/pod10.yaml
@@ -104,30 +104,30 @@ nodes:
         speed: 1gb
         features: ''
         name: 'nic1'
-      # eno2
+      # enp5s0f0
+      - mac_address: "B4:96:91:31:9D:44"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic2'
+      # enp5s0f1
+      - mac_address: "B4:96:91:31:9D:46"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic3'
+      # eno2 UNUSED
       - mac_address: "D0:94:66:58:8C:A5"
         speed: 1gb
         features: ''
-        name: 'nic2'
-      # eno3
+        name: 'nic4'
+      # eno3 UNUSED
       - mac_address: "D0:94:66:58:8C:A6"
         speed: 1gb
         features: ''
-        name: 'nic3'
-      # eno4
+        name: 'nic5'
+      # eno4 UNUSED
       - mac_address: "D0:94:66:58:8C:A7"
         speed: 1gb
         features: ''
-        name: 'nic4'
-      # enp5s0f0
-      - mac_address: "B4:96:91:31:9D:44"
-        speed: 10gb
-        features: 'dpdk|sriov'
-        name: 'nic5'
-      # enp5s0f1
-      - mac_address: "B4:96:91:31:9D:46"
-        speed: 10gb
-        features: 'dpdk|sriov'
         name: 'nic6'
   ############################################################################
   - name: intel2660-2
@@ -143,30 +143,30 @@ nodes:
         speed: 1gb
         features: ''
         name: 'nic1'
-      # eno2
+      # enp5s0f0
+      - mac_address: "B4:96:91:31:9C:64"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic2'
+      # enp5s0f1
+      - mac_address: "B4:96:91:31:9C:66"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic3'
+      # eno2 UNUSED
       - mac_address: "D0:94:66:6D:9A:DB"
         speed: 1gb
         features: ''
-        name: 'nic2'
-      # eno3
+        name: 'nic4'
+      # eno3 UNUSED
       - mac_address: "D0:94:66:6D:9A:DC"
         speed: 1gb
         features: ''
-        name: 'nic3'
-      # eno4
+        name: 'nic5'
+      # eno4 UNUSED
       - mac_address: "D0:94:66:6D:9A:DD"
         speed: 1gb
         features: ''
-        name: 'nic4'
-      # enp5s0f0
-      - mac_address: "B4:96:91:31:9C:64"
-        speed: 10gb
-        features: 'dpdk|sriov'
-        name: 'nic5'
-      # enp5s0f1
-      - mac_address: "B4:96:91:31:9C:66"
-        speed: 10gb
-        features: 'dpdk|sriov'
         name: 'nic6'
   ############################################################################
   - name: intel2660-3
@@ -182,30 +182,30 @@ nodes:
         speed: 1gb
         features: ''
         name: 'nic1'
-      # eno2
+      # enp5s0f0
+      - mac_address: "B4:96:91:31:9C:9C"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic2'
+      # enp5s0f1
+      - mac_address: "B4:96:91:31:9C:9E"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic3'
+      # eno2 UNUSED
       - mac_address: "D0:94:66:58:9E:DC"
         speed: 1gb
         features: ''
-        name: 'nic2'
-      # eno3
+        name: 'nic4'
+      # eno3 UNUSED
       - mac_address: "D0:94:66:58:9E:DD"
         speed: 1gb
         features: ''
-        name: 'nic3'
-      # eno4
+        name: 'nic5'
+      # eno4 UNUSED
       - mac_address: "D0:94:66:58:9E:DE"
         speed: 1gb
         features: ''
-        name: 'nic4'
-      # enp5s0f0
-      - mac_address: "B4:96:91:31:9C:9C"
-        speed: 10gb
-        features: 'dpdk|sriov'
-        name: 'nic5'
-      # enp5s0f1
-      - mac_address: "B4:96:91:31:9C:9E"
-        speed: 10gb
-        features: 'dpdk|sriov'
         name: 'nic6'
   ############################################################################
   - name: cn8890-10