[PDF] arm-pod*: Fix spec deviations

- disk_rotation: 0 for SSD drives;
- rename 'disk' to 'disks';
- add 'name: nicN' to jumpserver & node interfaces;

Change-Id: I17d8e64f9b7c5b236d2494566e24bac91f1fc914
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

2 files changed, 59 insertions, 8 deletions

diff --git a/labs/arm/pod5.yaml b/labs/arm/pod5.yaml
index 959e79fb..3708b7f0 100644
--- a/labs/arm/pod5.yaml
+++ b/labs/arm/pod5.yaml
@@ -50,18 +50,22 @@ jumphost:
       address: 192.168.11.1
       speed: 1gb
       features: ''
+      name: 'nic1'
     # Not connected for now
     - mac_address: "00:0f:b7:04:00:c1"
       speed: 40gb
       features: 'dpdk|sriov'
+      name: 'nic2'
     # Not connected for now
     - mac_address: "00:0f:b7:04:00:c2"
       speed: 40gb
       features: 'dpdk|sriov'
+      name: 'nic3'
     # Connected, trunk for all other VLANs
     - mac_address: "00:0f:b7:04:00:c0"
       speed: 10gb
       features: ''
+      name: 'nic4'
 ##############################################################################
 nodes:
   - name: softiron-3
@@ -79,6 +83,7 @@ nodes:
         disk_capacity: 128G
         disk_type: ssd
         disk_interface: sata
+        disk_rotation: 0
       - name: 'disk2'
         disk_capacity: 2048G
         disk_type: hdd
@@ -93,14 +98,16 @@ nodes:
       - mac_address: "e0:ff:f7:00:08:ae"
         speed: 10gb
         features: ''
+        name: 'nic1'
       # Connected, trunk for all other VLANs
       - mac_address: "e0:ff:f7:00:08:af"
         speed: 10gb
         features: ''
+        name: 'nic2'
   ############################################################################
   - name: softiron-4
     node: *nodeparams
-    disk: *disks
+    disks: *disks
     remote_management:
       <<: *remote_params
       address: 10.0.8.4
@@ -109,13 +116,15 @@ nodes:
       - mac_address: "e0:ff:f7:00:08:b1"
         speed: 10gb
         features: ''
+        name: 'nic1'
       - mac_address: "e0:ff:f7:00:08:b2"
         speed: 10gb
         features: ''
+        name: 'nic2'
   ############################################################################
   - name: softiron-5
     node: *nodeparams
-    disk: *disks
+    disks: *disks
     remote_management:
       <<: *remote_params
       address: 10.0.8.5
@@ -124,13 +133,15 @@ nodes:
       - mac_address: "e0:ff:f7:00:08:bd"
         speed: 10gb
         features: ''
+        name: 'nic1'
       - mac_address: "e0:ff:f7:00:08:be"
         speed: 10gb
         features: ''
+        name: 'nic2'
   ############################################################################
   - name: softiron-6
     node: *nodeparams
-    disk: *disks
+    disks: *disks
     remote_management:
       <<: *remote_params
       address: 10.0.8.6
@@ -139,13 +150,15 @@ nodes:
       - mac_address: "e0:ff:f7:00:08:c6"
         speed: 10gb
         features: ''
+        name: 'nic1'
       - mac_address: "e0:ff:f7:00:08:c7"
         speed: 10gb
         features: ''
+        name: 'nic2'
   ############################################################################
   - name: softiron-7
     node: *nodeparams
-    disk: *disks
+    disks: *disks
     remote_management:
       <<: *remote_params
       address: 10.0.8.7
@@ -154,6 +167,8 @@ nodes:
       - mac_address: "e0:ff:f7:00:08:cf"
         speed: 10gb
         features: ''
+        name: 'nic1'
       - mac_address: "e0:ff:f7:00:08:d0"
         speed: 10gb
         features: ''
+        name: 'nic2'
diff --git a/labs/arm/pod6.yaml b/labs/arm/pod6.yaml
index b2d3419e..dc53888c 100644
--- a/labs/arm/pod6.yaml
+++ b/labs/arm/pod6.yaml
@@ -33,6 +33,7 @@ jumphost:
       disk_capacity: 120G
       disk_type: ssd
       disk_interface: sata
+      disk_rotation: 0
     ## /dev/sdb
     - name: disk2
       disk_capacity: 1T
@@ -62,18 +63,22 @@ jumphost:
       address: 192.168.11.1
       speed: 1gb
       features: ''
+      name: 'nic1'
     ## eth1, Connected, used only for admin/PXE
     - mac_address: "00:01:73:02:36:d5"
       speed: 1gb
       features: ''
+      name: 'nic2'
     ## eth2, Not connected for now
     - mac_address: "00:01:73:02:36:d6"
       speed: 1gb
       features: ''
+      name: 'nic3'
     ## eth3, Connected, trunk for all other VLANs
     - mac_address: "00:01:73:02:36:d7"
       speed: 10gb
       features: ''
+      name: 'nic4'
 ##############################################################################
 nodes:
   - name: cn8890-24
@@ -91,6 +96,7 @@ nodes:
         disk_capacity: 480G
         disk_type: ssd
         disk_interface: sata
+        disk_rotation: 0
     remote_management:
       <<: *remote_params
       address: 10.0.1.54
@@ -100,30 +106,36 @@ nodes:
       - mac_address: "68:05:ca:5a:c3:a7"
         speed: 1gb
         features: ''
+        name: 'nic1'
       ## enP2p1s0f1, Connected, trunk for all other VLANs
       - mac_address: "1c:1b:0d:e8:fa:83"
         speed: 10gb
         features: 'dpdk|sriov'
+        name: 'nic2'
       ## enP2p1s0f2, Not connected for now
       - mac_address: "1c:1b:0d:e8:fa:84"
         speed: 10gb
         features: 'dpdk|sriov'
+        name: 'nic3'
       ## enP2p1s0f3, Not connected for now
       - mac_address: "1c:1b:0d:e8:fa:85"
         speed: 10gb
         features: 'dpdk|sriov'
+        name: 'nic4'
       ## enP2p1s0f4, Not connected for now
       - mac_address: "1c:1b:0d:e8:fa:86"
         speed: 10gb
         features: 'dpdk|sriov'
+        name: 'nic5'
       ## enP2p1s0f5, Not connected for now
       - mac_address: "1c:1b:0d:e8:fa:87"
         speed: 10gb
         features: 'dpdk|sriov'
+        name: 'nic6'
   ############################################################################
   - name: cn8890-25
     node: *nodeparams
-    disk: *disks
+    disks: *disks
     remote_management:
       <<: *remote_params
       address: 10.0.1.55
@@ -132,25 +144,31 @@ nodes:
       - mac_address: "68:05:ca:5a:c3:bc"
         speed: 1gb
         features: ''
+        name: 'nic1'
       - mac_address: "1c:1b:0d:e8:fb:a5"
         speed: 10gb
         features: 'dpdk|sriov'
+        name: 'nic2'
       - mac_address: "1c:1b:0d:e8:fb:a6"
         speed: 10gb
         features: 'dpdk|sriov'
+        name: 'nic3'
       - mac_address: "1c:1b:0d:e8:fb:a7"
         speed: 10gb
         features: 'dpdk|sriov'
+        name: 'nic4'
       - mac_address: "1c:1b:0d:e8:fb:a8"
         speed: 10gb
         features: 'dpdk|sriov'
+        name: 'nic5'
       - mac_address: "1c:1b:0d:e8:fb:a9"
         speed: 10gb
         features: 'dpdk|sriov'
+        name: 'nic6'
   ############################################################################
   - name: cn8890-26
     node: *nodeparams
-    disk: *disks
+    disks: *disks
     remote_management:
       <<: *remote_params
       address: 10.0.1.56
@@ -159,25 +177,31 @@ nodes:
       - mac_address: "68:05:ca:61:b9:00"
         speed: 1gb
         features: ''
+        name: 'nic1'
       - mac_address: "1c:1b:0d:e8:fa:65"
         speed: 10gb
         features: 'dpdk|sriov'
+        name: 'nic2'
       - mac_address: "1c:1b:0d:e8:fa:66"
         speed: 10gb
         features: 'dpdk|sriov'
+        name: 'nic3'
       - mac_address: "1c:1b:0d:e8:fa:67"
         speed: 10gb
         features: 'dpdk|sriov'
+        name: 'nic4'
       - mac_address: "1c:1b:0d:e8:fa:68"
         speed: 10gb
         features: 'dpdk|sriov'
+        name: 'nic5'
       - mac_address: "1c:1b:0d:e8:fa:69"
         speed: 10gb
         features: 'dpdk|sriov'
+        name: 'nic6'
   ############################################################################
   - name: cn8890-27
     node: *nodeparams
-    disk: *disks
+    disks: *disks
     remote_management:
       <<: *remote_params
       address: 10.0.1.57
@@ -186,25 +210,31 @@ nodes:
       - mac_address: "68:05:ca:57:f7:16"
         speed: 1gb
         features: ''
+        name: 'nic1'
       - mac_address: "1c:1b:0d:e8:fb:19"
         speed: 10gb
         features: 'dpdk|sriov'
+        name: 'nic2'
       - mac_address: "1c:1b:0d:e8:fb:1a"
         speed: 10gb
         features: 'dpdk|sriov'
+        name: 'nic3'
       - mac_address: "1c:1b:0d:e8:fb:1b"
         speed: 10gb
         features: 'dpdk|sriov'
+        name: 'nic4'
       - mac_address: "1c:1b:0d:e8:fb:1c"
         speed: 10gb
         features: 'dpdk|sriov'
+        name: 'nic5'
       - mac_address: "1c:1b:0d:e8:fb:1d"
         speed: 10gb
         features: 'dpdk|sriov'
+        name: 'nic6'
   ############################################################################
   - name: cn8890-28
     node: *nodeparams
-    disk: *disks
+    disks: *disks
     remote_management:
       <<: *remote_params
       address: 10.0.1.58
@@ -213,18 +243,24 @@ nodes:
       - mac_address: "68:05:ca:61:97:5a"
         speed: 1gb
         features: ''
+        name: 'nic1'
       - mac_address: "1c:1b:0d:e8:fb:7d"
         speed: 10gb
         features: 'dpdk|sriov'
+        name: 'nic2'
       - mac_address: "1c:1b:0d:e8:fb:7e"
         speed: 10gb
         features: 'dpdk|sriov'
+        name: 'nic3'
       - mac_address: "1c:1b:0d:e8:fb:7f"
         speed: 10gb
         features: 'dpdk|sriov'
+        name: 'nic4'
       - mac_address: "1c:1b:0d:e8:fb:80"
         speed: 10gb
         features: 'dpdk|sriov'
+        name: 'nic5'
       - mac_address: "1c:1b:0d:e8:fb:81"
         speed: 10gb
         features: 'dpdk|sriov'
+        name: 'nic6'