arm-pod5 align with latest PDF spec

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

diff --git a/labs/arm/pod5.yaml b/labs/arm/pod5.yaml
index 28dacd2..429ae5e 100644 (file)
--- a/labs/arm/pod5.yaml
+++ b/labs/arm/pod5.yaml
@@ -11,32 +11,31 @@ details:
 ##############################################################################
 net_config:
   oob:
-    interface: 0
     ip-range: 10.0.8.3-10.0.8.10
-    vlan: 0
+    vlan: native
   admin:
-    interface: 1
-    vlan: 0
+    interface: 0
+    vlan: native
     network: 192.168.11.0
     mask: 24
   mgmt:
-    interface: 2
+    interface: 1
     vlan: 2183
     network: 172.16.10.0
     mask: 24
   storage:
-    interface: 2
+    interface: 1
     vlan: 2184
     network: 10.2.0.0
     mask: 24
   private:
-    interface: 2
+    interface: 1
     vlan: 2185
     network: 10.1.0.0
     mask: 24
   public:
-    interface: 2
-    vlan: 0
+    interface: 1
+    vlan: native
     network: 10.0.8.0
     mask: 24
     gateway: 10.0.8.254
@@ -73,11 +72,18 @@ jumphost:
     address: 10.0.1.32
     mac_address: "40:8D:5C:BA:B9:6A"
   interfaces:
-    - "40:8D:5C:BA:B9:6A"
-    - "00:0f:b7:04:00:c0"
-    - "00:0f:b7:04:00:c1"
-    - "00:0f:b7:04:00:c2"
-    - "68:05:ca:34:60:e3"
+    - mac_address: "68:05:ca:34:60:e3"
+      speed: 1gb
+      features: ''
+    - mac_address: "00:0f:b7:04:00:c1"
+      speed: 40gb
+      features: 'dpdk|sriov'
+    - mac_address: "00:0f:b7:04:00:c2"
+      speed: 40gb
+      features: 'dpdk|sriov'
+    - mac_address: "00:0f:b7:04:00:c0"
+      speed: 10gb
+      features: ''
   fixed_ips:
     admin: 192.168.11.1
     mgmt: 172.16.10.1
@@ -99,7 +105,6 @@ nodes:
         disk_capacity: 128G
         disk_type: ssd
         disk_interface: sata
-        disk_rotation: ''
       - name: 'disk2'
         disk_capacity: 2048G
         disk_type: hdd
@@ -110,9 +115,12 @@ nodes:
       address: 10.0.8.3
       mac_address: "e0:ff:f7:00:04:99"
     interfaces:
-      - "e0:ff:f7:00:04:99"
-      - "e0:ff:f7:00:08:ae"
-      - "e0:ff:f7:00:08:af"
+      - mac_address: "e0:ff:f7:00:08:ae"
+        speed: 10gb
+        features: ''
+      - mac_address: "e0:ff:f7:00:08:af"
+        speed: 10gb
+        features: ''
     fixed_ips:
       admin: 192.168.11.2
       mgmt: 172.16.10.141
@@ -126,9 +134,12 @@ nodes:
       address: 10.0.8.4
       mac_address: "e0:ff:f7:00:05:00"
     interfaces:
-      - "e0:ff:f7:00:05:00"
-      - "e0:ff:f7:00:08:b1"
-      - "e0:ff:f7:00:08:b2"
+      - mac_address: "e0:ff:f7:00:08:b1"
+        speed: 10gb
+        features: ''
+      - mac_address: "e0:ff:f7:00:08:b2"
+        speed: 10gb
+        features: ''
     fixed_ips:
       admin: 192.168.11.3
       mgmt: 172.16.10.142
@@ -142,9 +153,12 @@ nodes:
       address: 10.0.8.5
       mac_address: "e0:ff:f7:00:04:a9"
     interfaces:
-      - "e0:ff:f7:00:04:a9"
-      - "e0:ff:f7:00:08:bd"
-      - "e0:ff:f7:00:08:be"
+      - mac_address: "e0:ff:f7:00:08:bd"
+        speed: 10gb
+        features: ''
+      - mac_address: "e0:ff:f7:00:08:be"
+        speed: 10gb
+        features: ''
     fixed_ips:
       admin: 192.168.11.4
       mgmt: 172.16.10.143
@@ -158,9 +172,12 @@ nodes:
       address: 10.0.8.6
       mac_address: "e0:ff:f7:00:04:78"
     interfaces:
-      - "e0:ff:f7:00:04:78"
-      - "e0:ff:f7:00:08:c6"
-      - "e0:ff:f7:00:08:c7"
+      - mac_address: "e0:ff:f7:00:08:c6"
+        speed: 10gb
+        features: ''
+      - mac_address: "e0:ff:f7:00:08:c7"
+        speed: 10gb
+        features: ''
     fixed_ips:
       admin: 192.168.11.5
       mgmt: 172.16.10.101
@@ -174,9 +191,12 @@ nodes:
       address: 10.0.8.7
       mac_address: "e0:ff:f7:00:05:19"
     interfaces:
-      - "e0:ff:f7:00:05:19"
-      - "e0:ff:f7:00:08:cf"
-      - "e0:ff:f7:00:08:d0"
+      - mac_address: "e0:ff:f7:00:08:d0"
+        speed: 10gb
+        features: ''
+      - mac_address: "e0:ff:f7:00:08:cf"
+        speed: 10gb
+        features: ''
     fixed_ips:
       admin: 192.168.11.6
       mgmt: 172.16.10.102