Merge changes from topic 'fix-pdf-spec-deviations'

* changes:
  [PDF] zte-pod*: Fix spec deviations
  [PDF] lf-pod*: Fix spec deviations
  [PDF] intel-pod*: Fix spec deviations
  [PDF] ericsson-pod*: Fix spec deviations
  [PDF] bii-pod*: Fix spec deviations
  [PDF] arm-pod*: Fix spec deviations

12 files changed, 257 insertions, 124 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'
diff --git a/labs/bii/pod1.yaml b/labs/bii/pod1.yaml
index f6ad478f..117721b6 100644
--- a/labs/bii/pod1.yaml
+++ b/labs/bii/pod1.yaml
@@ -1,7 +1,7 @@
 ### This is a BII POD1 descriptor file ###
 ---
 details:
-  pod owner: ylong@BII
+  pod_owner: ylong@BII
   contact: ylong@biigroup.cn, zjtang@biigroup.cn
   lab: BII Pharos LAB
   location: BDA, Beijing, China
@@ -59,8 +59,10 @@ jumphost:
   interfaces:                               # physical interface list
     - mac_address: "44:a8:42:15:10:03"
       address: 10.20.0.2
+      name: 'nic1'
     - mac_address: "44:a8:42:15:10:04"
       address: 192.168.20.5
+      name: 'nic2'
 ###################################################
 nodes:
   - name: compute1
@@ -106,6 +108,7 @@ nodes:
     interfaces:                               # physical interface list
       - mac_address: "44:a8:42:14:ee:64"
         address: 10.20.0.4
+        name: 'nic1'
   ########################################
   - name: compute2
     node: *nodeparas
@@ -117,6 +120,7 @@ nodes:
     interfaces:
       - mac_address: "44:a8:42:14:cb:31"
         address: 10.20.0.5
+        name: 'nic1'
   ########################################
   - name: controller1
     node: *nodeparas
@@ -128,8 +132,10 @@ nodes:
     interfaces:
       - mac_address: "44:a8:42:14:cd:0d"
         address: 10.20.0.6
+        name: 'nic1'
       - mac_address: "44:a8:42:14:cd:0e"
         address: 192.168.20.12
+        name: 'nic2'
   ########################################
   - name: controller2
     node: *nodeparas
@@ -141,8 +147,10 @@ nodes:
     interfaces:
       - mac_address: "44:a8:42:15:1b:e6"
         address: 10.20.0.7
+        name: 'nic1'
       - mac_address: "44:a8:42:15:1b:e7"
         address: 192.168.20.13
+        name: 'nic2'
   ########################################
   - name: controller3
     node: *nodeparas
@@ -154,5 +162,7 @@ nodes:
     interfaces:
       - mac_address: "44:a8:42:14:fc:1a"
         address: 10.20.0.8
+        name: 'nic1'
       - mac_address: "44:a8:42:14:fc:1b"
         address: 192.168.20.14
+        name: 'nic2'
diff --git a/labs/ericsson/pod1.yaml b/labs/ericsson/pod1.yaml
index 70d47ced..ae04b309 100644
--- a/labs/ericsson/pod1.yaml
+++ b/labs/ericsson/pod1.yaml
@@ -46,40 +46,36 @@ jumphost:
     address: 172.16.1.21/24
     mac_address: "9C:B6:54:8E:C5:76"
   interfaces:
-    - nic: 'nic1'
+    - name: 'nic1'
       speed: 10gb
       features: 'dpdk|sriov'
       address: 100.64.200.5/24
       mac_address: "38:ea:a7:8f:53:00"
       vlan: 80
-    - nic: 'nic2'
+    - name: 'nic2'
       speed: 10gb
       features: 'dpdk|sriov'
-      address:
       mac_address: "38:ea:a7:8f:53:01"
       vlan: native
-    - nic: 'nic3'
+    - name: 'nic3'
       speed: 10gb
       features: 'dpdk|sriov'
       address: 172.16.0.250/16
       mac_address: "38:ea:a7:8f:06:00"
       vlan: native
-    - nic: 'nic4'
+    - name: 'nic4'
       speed: 10gb
       features: 'dpdk|sriov'
-      address:
       mac_address: "38:ea:a7:8f:06:01"
       vlan: native
-    - nic: 'nic5'
+    - name: 'nic5'
       speed: 10gb
       features: 'dpdk|sriov'
-      address:
       mac_address: "9c:b6:54:8a:05:70"
       vlan: native
-    - nic: 'nic6'
+    - name: 'nic6'
       speed: 10gb
       features: 'dpdk|sriov'
-      address:
       mac_address: "9c:b6:54:8a:05:74"
       vlan: native
 ##############################################################################
@@ -95,33 +91,27 @@ nodes:
       - name: 'nic1'
         speed: 10gb
         features: 'dpdk|sriov'
-        address:
         mac_address: "38:ea:a7:17:6b:98"
       - name: 'nic2'
         speed: 10gb
         features: 'dpdk|sriov'
-        address:
         mac_address: "38:ea:a7:17:6b:99"
       - name: 'nic3'
         speed: 10gb
         features: 'dpdk|sriov'
-        address:
         mac_address: "38:ea:a7:17:6b:84"
       - name: 'nic4'
         speed: 10gb
         features: 'dpdk|sriov'
-        address:
         mac_address: "38:ea:a7:17:6b:85"
-      - nic: 'nic5'
+      - name: 'nic5'
         speed: 10gb
         features: 'dpdk|sriov'
-        address:
         mac_address: "14:58:d0:54:e7:88"
         vlan: native
-      - nic: 'nic6'
+      - name: 'nic6'
         speed: 10gb
         features: 'dpdk|sriov'
-        address:
         mac_address: "00:00:00:00:00:00"
         vlan: native
   ############################################################################
@@ -136,33 +126,27 @@ nodes:
       - name: 'nic1'
         speed: 10gb
         features: 'dpdk|sriov'
-        address:
         mac_address: "38:ea:a7:17:6b:7c"
       - name: 'nic2'
         speed: 10gb
         features: 'dpdk|sriov'
-        address:
         mac_address: "38:ea:a7:17:6b:7d"
       - name: 'nic3'
         speed: 10gb
         features: 'dpdk|sriov'
-        address:
         mac_address: "38:ea:a7:17:6b:6c"
       - name: 'nic4'
         speed: 10gb
         features: 'dpdk|sriov'
-        address:
         mac_address: "38:ea:a7:17:6b:6d"
-      - nic: 'nic5'
+      - name: 'nic5'
         speed: 10gb
         features: 'dpdk|sriov'
-        address:
         mac_address: "14:58:d0:54:6a:60"
         vlan: native
-      - nic: 'nic6'
+      - name: 'nic6'
         speed: 10gb
         features: 'dpdk|sriov'
-        address:
         mac_address: "00:00:00:00:00:00"
         vlan: native
   ############################################################################
@@ -177,33 +161,27 @@ nodes:
       - name: 'nic1'
         speed: 10gb
         features: 'dpdk|sriov'
-        address:
         mac_address: "38:ea:a7:17:6a:38"
       - name: 'nic2'
         speed: 10gb
         features: 'dpdk|sriov'
-        address:
         mac_address: "38:ea:a7:17:6a:39"
       - name: 'nic3'
         speed: 10gb
         features: 'dpdk|sriov'
-        address:
         mac_address: "38:ea:a7:17:6a:3c"
       - name: 'nic4'
         speed: 10gb
         features: 'dpdk|sriov'
-        address:
         mac_address: "38:ea:a7:17:6a:3d"
-      - nic: 'nic5'
+      - name: 'nic5'
         speed: 10gb
         features: 'dpdk|sriov'
-        address:
         mac_address: "14:58:d0:54:7a:28"
         vlan: native
-      - nic: 'nic6'
+      - name: 'nic6'
         speed: 10gb
         features: 'dpdk|sriov'
-        address:
         mac_address: "00:00:00:00:00:00"
         vlan: native
   ############################################################################
@@ -218,33 +196,27 @@ nodes:
       - name: 'nic1'
         speed: 10gb
         features: 'dpdk|sriov'
-        address:
         mac_address: "38:ea:a7:8f:1f:d4"
       - name: 'nic2'
         speed: 10gb
         features: 'dpdk|sriov'
-        address:
         mac_address: "38:ea:a7:8f:1f:d5"
       - name: 'nic3'
         speed: 10gb
         features: 'dpdk|sriov'
-        address:
         mac_address: "38:ea:a7:8f:52:cc"
       - name: 'nic4'
         speed: 10gb
         features: 'dpdk|sriov'
-        address:
         mac_address: "38:ea:a7:8f:52:cd"
-      - nic: 'nic5'
+      - name: 'nic5'
         speed: 10gb
         features: 'dpdk|sriov'
-        address:
         mac_address: "9c:b6:54:8a:95:a0"
         vlan: native
-      - nic: 'nic6'
+      - name: 'nic6'
         speed: 10gb
         features: 'dpdk|sriov'
-        address:
         mac_address: "00:00:00:00:00:00"
         vlan: native
   ############################################################################
@@ -259,32 +231,26 @@ nodes:
       - name: 'nic1'
         speed: 10gb
         features: 'dpdk|sriov'
-        address:
         mac_address: "38:ea:a7:8f:07:50"
       - name: 'nic2'
         speed: 10gb
         features: 'dpdk|sriov'
-        address:
         mac_address: "38:ea:a7:8f:07:51"
       - name: 'nic3'
         speed: 10gb
         features: 'dpdk|sriov'
-        address:
         mac_address: "38:ea:a7:8f:12:48"
       - name: 'nic4'
         speed: 10gb
         features: 'dpdk|sriov'
-        address:
         mac_address: "38:ea:a7:8f:12:49"
-      - nic: 'nic5'
+      - name: 'nic5'
         speed: 10gb
         features: 'dpdk|sriov'
-        address:
         mac_address: "9c:b6:54:8a:10:18"
         vlan: native
-      - nic: 'nic6'
+      - name: 'nic6'
         speed: 10gb
         features: 'dpdk|sriov'
-        address:
         mac_address: "00:00:00:00:00:00"
         vlan: native
diff --git a/labs/ericsson/pod2.yaml b/labs/ericsson/pod2.yaml
index c6477faf..8814c42d 100644
--- a/labs/ericsson/pod2.yaml
+++ b/labs/ericsson/pod2.yaml
@@ -39,27 +39,27 @@ jumphost:
     address: 172.16.2.11/24
     mac_address: "58:20:B1:01:8A:F2"
   interfaces:
-    - nic: 'nic1'
+    - name: 'nic1'
       speed: 10gb
-      features: 'dpdk,sriov'
+      features: 'dpdk|sriov'
       address: 100.64.201.5/24
       mac_address: "5c:b9:01:8b:9f:e8"
       vlan: 84
-    - nic: 'nic2'
+    - name: 'nic2'
       speed: 10gb
-      features: 'dpdk,sriov'
+      features: 'dpdk|sriov'
       address: 100.64.201.5/24
       mac_address: "5c:b9:01:8b:9f:e9"
       vlan: native
-    - nic: 'nic3'
+    - name: 'nic3'
       speed: 10gb
-      features: 'dpdk,sriov'
+      features: 'dpdk|sriov'
       address: 172.16.0.248/16
       mac_address: "5c:b9:01:8b:9f:ec"
       vlan: native
-    - nic: 'nic4'
+    - name: 'nic4'
       speed: 10gb
-      features: 'dpdk,sriov'
+      features: 'dpdk|sriov'
       address: 172.16.0.248/16
       mac_address: "5c:b9:01:8b:9f:ed"
       vlan: native
@@ -75,23 +75,19 @@ nodes:
     interfaces:
       - name: 'nic1'
         speed: 10gb
-        features: 'dpdk,sriov'
-        address:
+        features: 'dpdk|sriov'
         mac_address: "5c:b9:01:8b:a6:94"
       - name: 'nic2'
         speed: 10gb
-        features: 'dpdk,sriov'
-        address:
+        features: 'dpdk|sriov'
         mac_address: "5c:b9:01:8b:a6:95"
       - name: 'nic3'
         speed: 10gb
-        features: 'dpdk,sriov'
-        address:
+        features: 'dpdk|sriov'
         mac_address: "5c:b9:01:8b:a6:80"
       - name: 'nic4'
         speed: 10gb
-        features: 'dpdk,sriov'
-        address:
+        features: 'dpdk|sriov'
         mac_address: "5c:b9:01:8b:a6:81"
   ############################################################################
   - name: CI-ERICSSON-POD2-NODE2
@@ -104,23 +100,19 @@ nodes:
     interfaces:
       - name: 'nic1'
         speed: 10gb
-        features: 'dpdk,sriov'
-        address:
+        features: 'dpdk|sriov'
         mac_address: "5c:b9:01:8b:a6:30"
       - name: 'nic2'
         speed: 10gb
-        features: 'dpdk,sriov'
-        address:
+        features: 'dpdk|sriov'
         mac_address: "5c:b9:01:8b:a6:31"
       - name: 'nic3'
         speed: 10gb
-        features: 'dpdk,sriov'
-        address:
+        features: 'dpdk|sriov'
         mac_address: "5c:b9:01:8b:99:64"
       - name: 'nic4'
         speed: 10gb
-        features: 'dpdk,sriov'
-        address:
+        features: 'dpdk|sriov'
         mac_address: "5c:b9:01:8b:99:65"   # second port, no connection
   ############################################################################
   - name: CI-ERICSSON-POD2-NODE3
@@ -133,23 +125,19 @@ nodes:
     interfaces:
       - name: 'nic1'
         speed: 10gb
-        features: 'dpdk,sriov'
-        address:
+        features: 'dpdk|sriov'
         mac_address: "5c:b9:01:8b:9d:4c"
       - name: 'nic2'
         speed: 10gb
-        features: 'dpdk,sriov'
-        address:
+        features: 'dpdk|sriov'
         mac_address: "5c:b9:01:8b:9d:4d"
       - name: 'nic3'
         speed: 10gb
-        features: 'dpdk,sriov'
-        address:
+        features: 'dpdk|sriov'
         mac_address: "5c:b9:01:8b:9d:6c"
       - name: 'nic4'
         speed: 10gb
-        features: 'dpdk,sriov'
-        address:
+        features: 'dpdk|sriov'
         mac_address: "5c:b9:01:8b:9d:6d"
   ############################################################################
   - name: CI-ERICSSON-POD2-NODE4
@@ -162,23 +150,19 @@ nodes:
     interfaces:
       - name: 'nic1'
         speed: 10gb
-        features: 'dpdk,sriov'
-        address:
+        features: 'dpdk|sriov'
         mac_address: "5c:b9:01:8b:a5:fc"
       - name: 'nic2'
         speed: 10gb
-        features: 'dpdk,sriov'
-        address:
+        features: 'dpdk|sriov'
         mac_address: "5c:b9:01:8b:a5:fd"
       - name: 'nic3'
         speed: 10gb
-        features: 'dpdk,sriov'
-        address:
+        features: 'dpdk|sriov'
         mac_address: "5c:b9:01:8b:a6:08"
       - name: 'nic4'
         speed: 10gb
-        features: 'dpdk,sriov'
-        address:
+        features: 'dpdk|sriov'
         mac_address: "5c:b9:01:8b:a6:09"
   ############################################################################
   - name: CI-ERICSSON-POD2-NODE5
@@ -191,21 +175,17 @@ nodes:
     interfaces:
       - name: 'nic1'
         speed: 10gb
-        features: 'dpdk,sriov'
-        address:
+        features: 'dpdk|sriov'
         mac_address: "5c:b9:01:8b:a6:e8"
       - name: 'nic2'
         speed: 10gb
-        features: 'dpdk,sriov'
-        address:
+        features: 'dpdk|sriov'
         mac_address: "5c:b9:01:8b:a6:e9"
       - name: 'nic3'
         speed: 10gb
-        features: 'dpdk,sriov'
-        address:
+        features: 'dpdk|sriov'
         mac_address: "5c:b9:01:8b:97:14"
       - name: 'nic4'
         speed: 10gb
-        features: 'dpdk,sriov'
-        address:
+        features: 'dpdk|sriov'
         mac_address: "5c:b9:01:8b:97:15"
diff --git a/labs/intel/pod18.yaml b/labs/intel/pod18.yaml
index cc956976..b1123b7e 100644
--- a/labs/intel/pod18.yaml
+++ b/labs/intel/pod18.yaml
@@ -7,7 +7,7 @@ details:
   contact: jack.morgan@intel.com
   lab: Intel Pharos Lab
   location: Portland, Oregon, USA
-  type: {production|development}
+  type: production
   link: http://wiki.opnfv.org/display/pharos/Intel+Hosting
 
 jumphost:
@@ -26,7 +26,7 @@ jumphost:
       disk_capacity: 480GB
       disk_type: ssd
       disk_interface: ssd
-      disk_rotation:
+      disk_rotation: 0
     - name: 'disk2'
       disk_capacity: 1TB
       disk_type: hdd
@@ -45,11 +45,11 @@ jumphost:
     address: 10.10.180.10
     mac_address: "A4:BF:01:16:31:98"
   interfaces:
-    - nic: 'nic1'
+    - name: 'nic1'
       address: 10.10.180.20/24
       mac_address: "A4:BF:01:16:31:96"
       vlan: native
-    - nic: 'nic2'
+    - name: 'nic2'
       address: 10.10.181.20/24
       mac_address: "A4:BF:01:16:31:97"
       vlan: native
@@ -69,7 +69,7 @@ nodes:
         disk_capacity: 480GB
         disk_type: ssd
         disk_interface: ssd
-        disk_rotation:
+        disk_rotation: 0
       - name: 'disk2'
         disk_capacity: 1TB
         disk_type: hdd
diff --git a/labs/lf/pod2.yaml b/labs/lf/pod2.yaml
index 3c5502cc..ab60bdb8 100644
--- a/labs/lf/pod2.yaml
+++ b/labs/lf/pod2.yaml
@@ -32,7 +32,7 @@ jumphost:
       disk_capacity: 2400G
       disk_type: hdd
       disk_interface: sas
-      disk_rotation:
+      disk_rotation: 0
   os: centos-7
   remote_params: &remote_params
     type: ipmi
@@ -49,15 +49,19 @@ jumphost:
       speed: 40gb
       features: 'dpdk|sriov'
       address: 192.168.11.1
+      name: 'nic1'
     - mac_address: "00:25:b5:a0:00:1b"
       speed: 40gb
       features: 'dpdk|sriov'
+      name: 'nic2'
     - mac_address: "00:25:b5:a0:00:1c"
       speed: 40gb
       features: 'dpdk|sriov'
+      name: 'nic3'
     - mac_address: "00:25:b5:a0:00:1d"
       speed: 40gb
       features: 'dpdk|sriov'
+      name: 'nic4'
 ##############################################################################
 nodes:
   - name: pod2-node1
@@ -79,15 +83,19 @@ nodes:
       - mac_address: "00:25:b5:a0:00:2a"
         speed: 40gb
         features: 'dpdk|sriov'
+        name: 'nic1'
       - mac_address: "00:25:b5:a0:00:2b"
         speed: 40gb
         features: 'dpdk|sriov'
+        name: 'nic2'
       - mac_address: "00:25:b5:a0:00:2c"
         speed: 40gb
         features: 'dpdk|sriov'
+        name: 'nic3'
       - mac_address: "00:25:b5:a0:00:2d"
         speed: 40gb
         features: 'dpdk|sriov'
+        name: 'nic4'
   ############################################################################
   - name: pod2-node2
     node: *nodeparams
@@ -100,15 +108,19 @@ nodes:
       - mac_address: "00:25:b5:a0:00:3a"
         speed: 40gb
         features: 'dpdk|sriov'
+        name: 'nic1'
       - mac_address: "00:25:b5:a0:00:3b"
         speed: 40gb
         features: 'dpdk|sriov'
+        name: 'nic2'
       - mac_address: "00:25:b5:a0:00:3c"
         speed: 40gb
         features: 'dpdk|sriov'
+        name: 'nic3'
       - mac_address: "00:25:b5:a0:00:3d"
         speed: 40gb
         features: 'dpdk|sriov'
+        name: 'nic4'
   ############################################################################
   - name: pod2-node3
     node: *nodeparams
@@ -121,15 +133,19 @@ nodes:
       - mac_address: "00:25:b5:a0:00:4a"
         speed: 40gb
         features: 'dpdk|sriov'
+        name: 'nic1'
       - mac_address: "00:25:b5:a0:00:4b"
         speed: 40gb
         features: 'dpdk|sriov'
+        name: 'nic2'
       - mac_address: "00:25:b5:a0:00:4c"
         speed: 40gb
         features: 'dpdk|sriov'
+        name: 'nic3'
       - mac_address: "00:25:b5:a0:00:4d"
         speed: 40gb
         features: 'dpdk|sriov'
+        name: 'nic4'
   ############################################################################
   - name: pod2-node4
     node: *nodeparams
@@ -142,15 +158,19 @@ nodes:
       - mac_address: "00:25:b5:a0:00:5a"
         speed: 40gb
         features: 'dpdk|sriov'
+        name: 'nic1'
       - mac_address: "00:25:b5:a0:00:5b"
         speed: 40gb
         features: 'dpdk|sriov'
+        name: 'nic2'
       - mac_address: "00:25:b5:a0:00:5c"
         speed: 40gb
         features: 'dpdk|sriov'
+        name: 'nic3'
       - mac_address: "00:25:b5:a0:00:5d"
         speed: 40gb
         features: 'dpdk|sriov'
+        name: 'nic4'
   ############################################################################
   - name: pod2-node5
     node: *nodeparams
@@ -163,12 +183,16 @@ nodes:
       - mac_address: "00:25:b5:a0:00:6a"
         speed: 40gb
         features: 'dpdk|sriov'
+        name: 'nic1'
       - mac_address: "00:25:b5:a0:00:6b"
         speed: 40gb
         features: 'dpdk|sriov'
+        name: 'nic2'
       - mac_address: "00:25:b5:a0:00:6c"
         speed: 40gb
         features: 'dpdk|sriov'
+        name: 'nic3'
       - mac_address: "00:25:b5:a0:00:6d"
         speed: 40gb
         features: 'dpdk|sriov'
+        name: 'nic4'
diff --git a/labs/lf/pod5.yaml b/labs/lf/pod5.yaml
index 9c14cc67..60ab4029 100644
--- a/labs/lf/pod5.yaml
+++ b/labs/lf/pod5.yaml
@@ -31,7 +31,7 @@ jumphost:
       disk_capacity: 480G
       disk_type: ssd
       disk_interface: sata
-      disk_rotation:
+      disk_rotation: 0
   os: centos-7
   remote_params: &remote_params
     type: ipmi
@@ -48,12 +48,15 @@ jumphost:
       speed: 1gb
       features: 'dpdk|sriov'
       address: 10.20.0.129
+      name: 'nic1'
     - mac_address: "00:1e:67:fd:9c:c2"
       speed: 10gb
       features: 'dpdk|sriov'
+      name: 'nic2'
     - mac_address: "00:1e:67:fd:9c:c3"
       speed: 10gb
       features: 'dpdk|sriov'
+      name: 'nic3'
 nodes:
   - name: pod5-node1
     node: *nodeparas
@@ -66,12 +69,15 @@ nodes:
       - mac_address: "a4:bf:01:01:a9:fc"
         speed: 1gb
         features: 'dpdk|sriov'
+        name: 'nic1'
       - mac_address: "00:1e:67:f6:9b:34"
         speed: 10gb
         features: 'dpdk|sriov'
+        name: 'nic2'
       - mac_address: "00:1e:67:f6:9b:35"
         speed: 10gb
         features: 'dpdk|sriov'
+        name: 'nic3'
   - name: pod5-node2
     node: *nodeparas
     disks: *disks
@@ -83,12 +89,15 @@ nodes:
       - mac_address: "a4:bf:01:01:a9:d4"
         speed: 1gb
         features: 'dpdk|sriov'
+        name: 'nic1'
       - mac_address: "00:1e:67:f6:9b:36"
         speed: 10gb
         features: 'dpdk|sriov'
+        name: 'nic2'
       - mac_address: "00:1e:67:f6:9b:37"
         speed: 10gb
         features: 'dpdk|sriov'
+        name: 'nic3'
   - name: pod5-node3
     node: *nodeparas
     disks: *disks
@@ -100,12 +109,15 @@ nodes:
       - mac_address: "a4:bf:01:00:97:a2"
         speed: 1gb
         features: 'dpdk|sriov'
+        name: 'nic1'
       - mac_address: "00:1e:67:fd:9c:b0"
         speed: 10gb
         features: 'dpdk|sriov'
+        name: 'nic2'
       - mac_address: "00:1e:67:fd:9c:b1"
         speed: 10gb
         features: 'dpdk|sriov'
+        name: 'nic3'
   - name: pod5-node4
     node: *nodeparas
     disks: *disks
@@ -117,12 +129,15 @@ nodes:
       - mac_address: "a4:bf:01:01:72:73"
         speed: 1gb
         features: 'dpdk|sriov'
+        name: 'nic1'
       - mac_address: "00:1e:67:fd:99:24"
         speed: 10gb
         features: 'dpdk|sriov'
+        name: 'nic2'
       - mac_address: "00:1e:67:fd:99:25"
         speed: 10gb
         features: 'dpdk|sriov'
+        name: 'nic3'
   - name: pod5-node5
     node: *nodeparas
     disks: *disks
@@ -134,9 +149,12 @@ nodes:
       - mac_address: "a4:bf:01:01:74:30"
         speed: 1gb
         features: 'dpdk|sriov'
+        name: 'nic1'
       - mac_address: "00:1e:67:f6:9b:96"
         speed: 10gb
         features: 'dpdk|sriov'
+        name: 'nic2'
       - mac_address: "00:1e:67:f6:9b:97"
         speed: 10gb
         features: 'dpdk|sriov'
+        name: 'nic3'
diff --git a/labs/zte/pod1.yaml b/labs/zte/pod1.yaml
index 700c5d0c..1b4d1ad6 100644
--- a/labs/zte/pod1.yaml
+++ b/labs/zte/pod1.yaml
@@ -71,12 +71,14 @@ jumphost:
       4IoqgBAYdFlBw90sTOBqrhoHmRbr]
   remote_management:
     <<: *remote_params
-    address:
-    mac_address:
+    # Not used, fill in with dummy values
+    address: 0.0.0.0
+    mac_address: "00:00:00:00:00:00"
   interfaces:
     - mac_address: "74:4a:a4:00:91:b3"
       speed: 1gb
       address: 10.20.6.1
+      name: 'nic1'
 nodes:
   - name: pod1-node1
     node: &nodeparas
@@ -107,18 +109,23 @@ nodes:
       - mac_address: "74:4a:a4:00:cf:dc"
         speed: 1gb
         features: null
+        name: 'nic1'
       - mac_address: "74:4a:a4:00:b0:e1"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic2'
       - mac_address: "74:4a:a4:00:b0:e2"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic3'
       - mac_address: "74:4a:a4:00:b0:dd"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic4'
       - mac_address: "74:4a:a4:00:b0:de"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic5'
   - name: pod1-node2
     node: *nodeparas
     disks: *disks
@@ -130,18 +137,23 @@ nodes:
       - mac_address: "74:4a:a4:00:ce:ce"
         speed: 1gb
         features: null
+        name: 'nic1'
       - mac_address: "74:4a:a4:00:d6:ad"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic2'
       - mac_address: "74:4a:a4:00:d6:ae"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic3'
       - mac_address: "74:4a:a4:00:d6:a9"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic4'
       - mac_address: "74:4a:a4:00:d6:aa"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic5'
   - name: pod1-node3
     node: *nodeparas
     disks: *disks
@@ -153,18 +165,23 @@ nodes:
       - mac_address: "74:4a:a4:00:cf:58"
         speed: 1gb
         features: null
+        name: 'nic1'
       - mac_address: "74:4a:a4:00:d6:ab"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic2'
       - mac_address: "74:4a:a4:00:d6:ac"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic3'
       - mac_address: "74:4a:a4:00:d6:af"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic4'
       - mac_address: "74:4a:a4:00:d6:b0"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic5'
   - name: pod1-node4
     node: *nodeparas
     disks: *disks
@@ -176,18 +193,23 @@ nodes:
       - mac_address: "74:4a:a4:00:49:84"
         speed: 1gb
         features: null
+        name: 'nic1'
       - mac_address: "74:4a:a4:00:b1:a5"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic2'
       - mac_address: "74:4a:a4:00:b1:a6"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic3'
       - mac_address: "74:4a:a4:00:b1:b1"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic4'
       - mac_address: "74:4a:a4:00:b1:b2"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic5'
   - name: pod1-node5
     node: *nodeparas
     disks: *disks
@@ -199,15 +221,20 @@ nodes:
       - mac_address: "74:4a:a4:00:ce:c2"
         speed: 1gb
         features: null
+        name: 'nic1'
       - mac_address: "74:4a:a4:00:d6:8d"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic2'
       - mac_address: "74:4a:a4:00:d6:8e"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic3'
       - mac_address: "74:4a:a4:00:d6:9b"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic4'
       - mac_address: "74:4a:a4:00:d6:9c"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic5'
diff --git a/labs/zte/pod2.yaml b/labs/zte/pod2.yaml
index 3a7db7c8..f51d7f79 100644
--- a/labs/zte/pod2.yaml
+++ b/labs/zte/pod2.yaml
@@ -33,7 +33,7 @@ jumphost:
       disk_capacity: 600G
       disk_type: hdd
       disk_interface: sas
-      disk_rotation: 10500
+      disk_rotation: 10000
     - name: 'disk2'
       disk_capacity: 4000G
       disk_type: hdd
@@ -72,12 +72,14 @@ jumphost:
       2+PxgBC5OzeXar0HSyATMD/Z7K0x]
   remote_management:
     <<: *remote_params
-    address:
-    mac_address:
+    # Not used, fill in with dummy values
+    address: 0.0.0.0
+    mac_address: "00:00:00:00:00:00"
   interfaces:
     - mac_address: "74:4a:a4:00:91:18"
       speed: 1gb
       address: 10.20.7.1
+      name: 'nic1'
 nodes:
   - name: pod2-node1
     node: &nodeparas
@@ -108,18 +110,23 @@ nodes:
       - mac_address: "74:4a:a4:00:cd:72"
         speed: 1gb
         features: null
+        name: 'nic1'
       - mac_address: "74:4a:a4:00:b0:e9"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic2'
       - mac_address: "74:4a:a4:00:b0:ea"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic3'
       - mac_address: "74:4a:a4:00:b0:eb"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic4'
       - mac_address: "74:4a:a4:00:b0:ec"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic5'
   - name: pod2-node2
     node: *nodeparas
     disks: *disks
@@ -131,18 +138,23 @@ nodes:
       - mac_address: "74:4a:a4:00:ca:cc"
         speed: 1gb
         features: null
+        name: 'nic1'
       - mac_address: "74:4a:a4:00:d6:a3"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic2'
       - mac_address: "74:4a:a4:00:d6:a4"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic3'
       - mac_address: "74:4a:a4:00:d6:99"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic4'
       - mac_address: "74:4a:a4:00:d6:9a"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic5'
   - name: pod2-node3
     node: *nodeparas
     disks: *disks
@@ -154,18 +166,23 @@ nodes:
       - mac_address: "74:4a:a4:00:cd:12"
         speed: 1gb
         features: null
+        name: 'nic1'
       - mac_address: "74:4a:a4:00:d6:9d"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic2'
       - mac_address: "74:4a:a4:00:d6:9e"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic3'
       - mac_address: "74:4a:a4:00:d3:15"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic4'
       - mac_address: "74:4a:a4:00:d3:16"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic5'
   - name: pod2-node4
     node: *nodeparas
     disks: *disks
@@ -177,18 +194,23 @@ nodes:
       - mac_address: "74:4a:a4:00:cf:40"
         speed: 1gb
         features: null
+        name: 'nic1'
       - mac_address: "74:4a:a4:00:d6:a5"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic2'
       - mac_address: "74:4a:a4:00:d6:a6"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic3'
       - mac_address: "74:4a:a4:00:d6:a7"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic4'
       - mac_address: "74:4a:a4:00:d6:a8"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic5'
   - name: pod2-node5
     node: *nodeparas
     disks: *disks
@@ -200,15 +222,20 @@ nodes:
       - mac_address: "74:4a:a4:00:ce:d4"
         speed: 1gb
         features: null
+        name: 'nic1'
       - mac_address: "74:4a:a4:00:d2:c3"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic2'
       - mac_address: "74:4a:a4:00:d2:c4"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic3'
       - mac_address: "74:4a:a4:00:d2:c1"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic4'
       - mac_address: "74:4a:a4:00:d2:c2"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic5'
diff --git a/labs/zte/pod3.yaml b/labs/zte/pod3.yaml
index a6aa217f..063b7dfc 100644
--- a/labs/zte/pod3.yaml
+++ b/labs/zte/pod3.yaml
@@ -71,12 +71,14 @@ jumphost:
       ZIpvgBCa0QYVwRsEcqVofk2pmPKq]
   remote_management:
     <<: *remote_params
-    address:
-    mac_address:
+    # Not used, fill in with dummy values
+    address: 0.0.0.0
+    mac_address: "00:00:00:00:00:00"
   interfaces:
     - mac_address: "74:4a:a4:00:21:0c"
       speed: 1gb
       address: 10.20.0.1
+      name: 'nic1'
 nodes:
   - name: pod3-node1
     node: &nodeparas
@@ -107,15 +109,19 @@ nodes:
       - mac_address: "74:4a:a4:00:0b:85"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic1'
       - mac_address: "74:4a:a4:00:0b:86"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic2'
       - mac_address: "74:4a:a4:00:0b:87"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic3'
       - mac_address: "74:4a:a4:00:0b:88"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic4'
   - name: pod3-node2
     node: *nodeparas
     disks: *disks
@@ -127,15 +133,19 @@ nodes:
       - mac_address: "74:4a:a4:00:5c:5d"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic1'
       - mac_address: "74:4a:a4:00:5c:5e"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic2'
       - mac_address: "74:4a:a4:00:5c:5f"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic3'
       - mac_address: "74:4a:a4:00:5c:60"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic4'
   - name: pod3-node3
     node: *nodeparas
     disks: *disks
@@ -147,15 +157,19 @@ nodes:
       - mac_address: "74:4a:a4:00:5c:35"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic1'
       - mac_address: "74:4a:a4:00:5c:36"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic2'
       - mac_address: "74:4a:a4:00:5c:37"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic3'
       - mac_address: "74:4a:a4:00:5c:38"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic4'
   - name: pod3-node4
     node: *nodeparas
     disks: *disks
@@ -167,15 +181,19 @@ nodes:
       - mac_address: "74:4a:a4:00:5c:69"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic1'
       - mac_address: "74:4a:a4:00:5c:6a"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic2'
       - mac_address: "74:4a:a4:00:5c:6b"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic3'
       - mac_address: "74:4a:a4:00:5c:6c"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic4'
   - name: pod3-node5
     node: *nodeparas
     disks: *disks
@@ -187,12 +205,16 @@ nodes:
       - mac_address: "74:4a:a4:00:5c:6d"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic1'
       - mac_address: "74:4a:a4:00:5c:6e"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic2'
       - mac_address: "74:4a:a4:00:5c:6f"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic3'
       - mac_address: "74:4a:a4:00:5c:70"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic4'
diff --git a/labs/zte/pod9.yaml b/labs/zte/pod9.yaml
index 1045fb0e..76d4aa9e 100644
--- a/labs/zte/pod9.yaml
+++ b/labs/zte/pod9.yaml
@@ -32,7 +32,7 @@ jumphost:
       disk_capacity: 107G
       disk_type: hdd
       disk_interface: sas
-      disk_rotation: 10500
+      disk_rotation: 10000
   os: CentOS-7
   remote_params: &remote_params
     type: ipmi
@@ -60,12 +60,14 @@ jumphost:
       WSgUgBDYj5D5l/12XoUNXxGDebYT]
   remote_management:
     <<: *remote_params
-    address:
-    mac_address:
+    # Not used, fill in with dummy values
+    address: 0.0.0.0
+    mac_address: "00:00:00:00:00:00"
   interfaces:
     - mac_address: "00:1b:21:89:30:87"
       speed: 10gb
       address: 10.20.7.1
+      name: 'nic1'
 nodes:
   - name: pod9-node1
     node: &nodeparas
@@ -91,9 +93,11 @@ nodes:
       - mac_address: "74:4a:a4:03:bf:96"
         speed: 1gb
         features: null
+        name: 'nic1'
       - mac_address: "74:4a:a4:05:ee:86"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic2'
   - name: pod9-node2
     node: *nodeparas
     disks: &disks
@@ -115,9 +119,11 @@ nodes:
       - mac_address: "74:4a:a4:03:bf:c6"
         speed: 1gb
         features: null
+        name: 'nic1'
       - mac_address: "74:4a:a4:05:ee:9a"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic2'
   - name: pod9-node3
     node: *nodeparas
     disks: *disks
@@ -129,6 +135,8 @@ nodes:
       - mac_address: "74:4a:a4:03:bf:fe"
         speed: 1gb
         features: null
+        name: 'nic1'
       - mac_address: "74:4a:a4:05:ee:7e"
         speed: 10gb
         features: dpdk|sriov
+        name: 'nic2'