Update IDF and PDF for zte pods

1. Add IDF of zte pod2 and pod3
2. Update PDF of zte pod2 and pod3
3. Update pod config template for yaml-lint

Change-Id: I30f644009ab270f929fe3ee41171986a0e0bde63
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>

5 files changed, 240 insertions, 179 deletions

diff --git a/labs/zte/idf-pod2.yaml b/labs/zte/idf-pod2.yaml
new file mode 100644
index 0000000..e8d7f78
--- /dev/null
+++ b/labs/zte/idf-pod2.yaml
@@ -0,0 +1,41 @@
+##############################################################################
+# Copyright (c) 2017 ZTE, Mirantis Inc., Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+### ZTE POD 2 installer descriptor file ###
+
+idf:
+  version: 0.1
+  daisy:
+    jumphost:
+      bridges:
+        admin: 'br7'
+    network:
+      node:
+        # Ordered-list, index should be in sync with node index in PDF
+        - interfaces: &interfaces
+            # Ordered-list, index should be in sync with interface index in PDF
+            - 'ens4f0'
+            - 'ens12f0'
+            - 'ens12f1'
+            - 'ens44f0'
+            - 'ens44f1'
+          busaddr: &busaddr
+            # Bus-info reported by `ethtool -i ethX`
+            - '0000:01:00.0'
+            - '0000:08:00.0'
+            - '0000:08:00.1'
+            - '0000:81:00.0'
+            - '0000:81:00.1'
+        - interfaces: *interfaces
+          busaddr: *busaddr
+        - interfaces: *interfaces
+          busaddr: *busaddr
+        - interfaces: *interfaces
+          busaddr: *busaddr
+        - interfaces: *interfaces
+          busaddr: *busaddr
diff --git a/labs/zte/idf-pod3.yaml b/labs/zte/idf-pod3.yaml
new file mode 100644
index 0000000..d1bb156
--- /dev/null
+++ b/labs/zte/idf-pod3.yaml
@@ -0,0 +1,39 @@
+##############################################################################
+# Copyright (c) 2017 ZTE, Mirantis Inc., Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+### ZTE POD 3 installer descriptor file ###
+
+idf:
+  version: 0.1
+  daisy:
+    jumphost:
+      bridges:
+        admin: 'br0'
+    network:
+      node:
+        # Ordered-list, index should be in sync with node index in PDF
+        - interfaces: &interfaces
+            # Ordered-list, index should be in sync with interface index in PDF
+            - 'enp2s0f0'
+            - 'enp2s0f1'
+            - 'enp132s0f0'
+            - 'enp132s0f1'
+          busaddr: &busaddr
+            # Bus-info reported by `ethtool -i ethX`
+            - '0000:02:00.0'
+            - '0000:02:00.1'
+            - '0000:84:00.0'
+            - '0000:84:00.1'
+        - interfaces: *interfaces
+          busaddr: *busaddr
+        - interfaces: *interfaces
+          busaddr: *busaddr
+        - interfaces: *interfaces
+          busaddr: *busaddr
+        - interfaces: *interfaces
+          busaddr: *busaddr
diff --git a/labs/zte/pod1.yaml b/labs/zte/pod1.yaml
index 6bbf6c2..66b17a3 100644
--- a/labs/zte/pod1.yaml
+++ b/labs/zte/pod1.yaml
@@ -48,7 +48,7 @@ net_config:
 jumphost:
   name: pod1-jump
   node:
-    type: barem
+    type: baremetal
     vendor: ZTE
     model: R5300
     arch: x86_64
diff --git a/labs/zte/pod2.yaml b/labs/zte/pod2.yaml
index 356b798..c1e4aef 100644
--- a/labs/zte/pod2.yaml
+++ b/labs/zte/pod2.yaml
@@ -9,7 +9,42 @@ details:
   location: Shanghai, China
   type: production
   link: https://wiki.opnfv.org/display/pharos/ZTE+SH+Testlab
-
+##############################################################################
+net_config:
+  # NOTE: Network names are likely to change after the PDF spec is updated
+  oob:
+    interface: 0
+    ip-range: 192.168.1.106-192.168.1.110
+    vlan: null
+  admin:
+    interface: 0
+    vlan: native
+    network: 10.20.7.0
+    mask: 24
+  mgmt:
+    interface: 1
+    vlan: 171
+    network: 192.168.71.0
+    mask: 24
+  storage:
+    interface: 2
+    vlan: 172
+    network: 192.168.72.0
+    mask: 24
+  private:
+    interface: 3
+    vlan: 1170
+    network: 192.168.73.0
+    mask: 24
+  public:
+    interface: 4
+    vlan: 173
+    network: 172.70.0.0
+    mask: 24
+    gateway: 172.70.0.1
+    dns:
+      - 172.10.0.1
+##############################################################################
 jumphost:
   name: pod2-jump
   node:
@@ -18,35 +53,43 @@ jumphost:
     model: R5300
     arch: x86_64
     cpus: 2
-    cpu_cflags: sandybridge
-    cores: 6
+    cpu_cflags: hasewell
+    cores: 12
     memory: 128G
   disks:
     - name: 'disk1'
       disk_capacity: 600G
       disk_type: hdd
       disk_interface: sas
-      disk_rotation: 10000
+      disk_rotation: 10500
     - name: 'disk2'
       disk_capacity: 4000G
       disk_type: hdd
       disk_interface: sata
-      disk_rotation: 15000
+      disk_rotation: 7200
+    - name: 'disk3'
+      disk_capacity: 4000G
+      disk_type: hdd
+      disk_interface: sata
+      disk_rotation: 7200
 
   os: CentOS-7
-  remote_params: &remoteparas
+  remote_params: &remote_params
     type: ipmi
     versions:
       - 2.0
     user: zteroot
     pass: superuser
+  remote_management:
+    <<: *remote_params
+    address:
+    mac_address:
   interfaces:
-    - nic: 'nic1'
-      mac_address: "74:4a:a4:00:91:18"
-      address:
-        - 10.20.7.1
-        - 172.70.0.239
-        - 192.168.1.239
+    - mac_address: "74:4a:a4:00:91:18"
+      speed: 1gb
+  fixed_ips:
+    admin: 10.20.7.1
+    public: 172.70.0.239
 nodes:
   - name: pod2-node1
     node: &nodeparas
@@ -70,169 +113,114 @@ nodes:
         disk_interface: sas
         disk_rotation: 10000
     remote_management:
-      <<: *remoteparas
+      <<: *remote_params
       address: 192.168.1.106
       mac_address: "74:4a:a4:00:cd:6f"
     interfaces:
-      - name: 'nic1'
+      - mac_address: "74:4a:a4:00:cd:72"
         speed: 1gb
         features: null
-        mac_address: "74:4a:a4:00:cd:72"
-        address: 10.20.7.11/24
-        vlan: 170
-      - name: 'nic2'
+      - mac_address: "74:4a:a4:00:b0:e9"
         speed: 10gb
         features: dpdk|sriov
-        mac_address: "74:4a:a4:00:b0:e9"
-        vlan: 171
-      - name: 'nic3'
+      - mac_address: "74:4a:a4:00:b0:ea"
         speed: 10gb
         features: dpdk|sriov
-        mac_address: "74:4a:a4:00:b0:ea"
-        vlan: 172
-      - name: 'nic4'
+      - mac_address: "74:4a:a4:00:b0:eb"
         speed: 10gb
         features: dpdk|sriov
-        mac_address: "74:4a:a4:00:b0:eb"
-        vlan: 1130
-      - name: 'nic5'
+      - mac_address: "74:4a:a4:00:b0:ec"
         speed: 10gb
         features: dpdk|sriov
-        mac_address: "74:4a:a4:00:b0:ec"
-        vlan: 173
   - name: pod2-node2
     node: *nodeparas
     disks: *disks
     remote_management:
-      <<: *remoteparas
+      <<: *remote_params
       address: 192.168.1.107
       mac_address: "74:4a:a4:00:ca:c9"
     interfaces:
-      - name: 'nic1'
+      - mac_address: "74:4a:a4:00:ca:cc"
         speed: 1gb
         features: null
-        mac_address: "74:4a:a4:00:ca:cc"
-        address: 10.20.7.12/24
-        vlan: 170
-      - name: 'nic2'
+      - mac_address: "74:4a:a4:00:d6:a3"
         speed: 10gb
         features: dpdk|sriov
-        mac_address: "74:4a:a4:00:d6:a3"
-        vlan: 171
-      - name: 'nic3'
+      - mac_address: "74:4a:a4:00:d6:a4"
         speed: 10gb
         features: dpdk|sriov
-        mac_address: "74:4a:a4:00:d6:a4"
-        vlan: 172
-      - name: 'nic4'
+      - mac_address: "74:4a:a4:00:d6:99"
         speed: 10gb
         features: dpdk|sriov
-        mac_address: "74:4a:a4:00:d6:99"
-        vlan: 1130
-      - name: 'nic5'
+      - mac_address: "74:4a:a4:00:d6:9a"
         speed: 10gb
         features: dpdk|sriov
-        mac_address: "74:4a:a4:00:d6:9a"
-        vlan: 173
   - name: pod2-node3
     node: *nodeparas
     disks: *disks
     remote_management:
-      <<: *remoteparas
+      <<: *remote_params
       address: 192.168.1.108
       mac_address: "74:4a:a4:00:cd:0f"
     interfaces:
-      - name: 'nic1'
+      - mac_address: "74:4a:a4:00:cd:12"
         speed: 1gb
         features: null
-        mac_address: "74:4a:a4:00:cd:12"
-        address: 10.20.7.13/24
-        vlan: 170
-      - name: 'nic2'
+      - mac_address: "74:4a:a4:00:d6:9d"
         speed: 10gb
         features: dpdk|sriov
-        mac_address: "74:4a:a4:00:d6:9d"
-        vlan: 171
-      - name: 'nic3'
+      - mac_address: "74:4a:a4:00:d6:9e"
         speed: 10gb
         features: dpdk|sriov
-        mac_address: "74:4a:a4:00:d6:9e"
-        vlan: 172
-      - name: 'nic4'
+      - mac_address: "74:4a:a4:00:d3:15"
         speed: 10gb
         features: dpdk|sriov
-        mac_address: "74:4a:a4:00:d3:15"
-        vlan: 1130
-      - name: 'nic5'
+      - mac_address: "74:4a:a4:00:d3:16"
         speed: 10gb
         features: dpdk|sriov
-        mac_address: "74:4a:a4:00:d3:16"
-        vlan: 173
   - name: pod2-node4
     node: *nodeparas
     disks: *disks
     remote_management:
-      <<: *remoteparas
+      <<: *remote_params
       address: 192.168.1.109
       mac_address: "74:4a:a4:00:cf:3d"
     interfaces:
-      - name: 'nic1'
+      - mac_address: "74:4a:a4:00:cf:40"
         speed: 1gb
         features: null
-        mac_address: "74:4a:a4:00:cf:40"
-        address: 10.20.7.14/24
-        vlan: 170
-      - name: 'nic2'
+      - mac_address: "74:4a:a4:00:d6:a5"
         speed: 10gb
         features: dpdk|sriov
-        mac_address: "74:4a:a4:00:d6:a5"
-        vlan: 171
-      - name: 'nic3'
+      - mac_address: "74:4a:a4:00:d6:a6"
         speed: 10gb
         features: dpdk|sriov
-        mac_address: "74:4a:a4:00:d6:a6"
-        vlan: 172
-      - name: 'nic4'
+      - mac_address: "74:4a:a4:00:d6:a7"
         speed: 10gb
         features: dpdk|sriov
-        mac_address: "74:4a:a4:00:d6:a7"
-        vlan: 1130
-      - name: 'nic5'
+      - mac_address: "74:4a:a4:00:d6:a8"
         speed: 10gb
         features: dpdk|sriov
-        mac_address: "74:4a:a4:00:d6:a8"
-        vlan: 173
   - name: pod2-node5
     node: *nodeparas
     disks: *disks
     remote_management:
-      <<: *remoteparas
+      <<: *remote_params
       address: 192.168.1.110
       mac_address: "74:4a:a4:00:ce:d1"
     interfaces:
-      - name: 'nic1'
+      - mac_address: "74:4a:a4:00:ce:d4"
         speed: 1gb
         features: null
-        mac_address: "74:4a:a4:00:ce:d4"
-        address: 10.20.7.15/24
-        vlan: 170
-      - name: 'nic2'
+      - mac_address: "74:4a:a4:00:d2:c3"
         speed: 10gb
         features: dpdk|sriov
-        mac_address: "74:4a:a4:00:d2:c3"
-        vlan: 171
-      - name: 'nic3'
+      - mac_address: "74:4a:a4:00:d2:c4"
         speed: 10gb
         features: dpdk|sriov
-        mac_address: "74:4a:a4:00:d2:c4"
-        vlan: 172
-      - name: 'nic4'
+      - mac_address: "74:4a:a4:00:d2:c1"
         speed: 10gb
         features: dpdk|sriov
-        mac_address: "74:4a:a4:00:d2:c1"
-        vlan: 1130
-      - name: 'nic5'
+      - mac_address: "74:4a:a4:00:d2:c2"
         speed: 10gb
         features: dpdk|sriov
-        mac_address: "74:4a:a4:00:d2:c2"
-        vlan: 173
diff --git a/labs/zte/pod3.yaml b/labs/zte/pod3.yaml
index 08e12d5..fde8905 100644
--- a/labs/zte/pod3.yaml
+++ b/labs/zte/pod3.yaml
@@ -1,5 +1,5 @@
 ---
-### ZTE POD e descriptor file ###
+### ZTE POD 3 descriptor file ###
 # refering to https://gerrit.opnfv.org/gerrit/#/c/23727/9/config/pod1.yaml
 
 details:
@@ -9,7 +9,42 @@ details:
   location: Shanghai, China
   type: production
   link: https://wiki.opnfv.org/display/pharos/ZTE+SH+Testlab
-
+##############################################################################
+net_config:
+  # NOTE: Network names are likely to change after the PDF spec is updated
+  oob:
+    interface: 0
+    ip-range: 192.168.1.32-192.168.1.36
+    vlan: null
+  admin:
+    interface: 0
+    vlan: native
+    network: 10.20.0.0
+    mask: 24
+  mgmt:
+    interface: 1
+    vlan: 101
+    network: 192.168.11.0
+    mask: 24
+  storage:
+    interface: 2
+    vlan: 102
+    network: 192.168.12.0
+    mask: 24
+  private:
+    interface: 3
+    vlan: 1030
+    network: 192.168.13.0
+    mask: 24
+  public:
+    interface: 3
+    vlan: 103
+    network: 172.10.0.0
+    mask: 24
+    gateway: 172.10.0.1
+    dns:
+      - 172.10.0.1
+##############################################################################
 jumphost:
   name: pod3-jump
   node:
@@ -18,9 +53,9 @@ jumphost:
     model: R5300
     arch: x86_64
     cpus: 1
-    cpu_cflags: ivybridge
+    cpu_cflags: hasewell
     cores: 6
-    memory: 32G
+    memory: 80G
   disks:
     - name: 'disk1'
       disk_capacity: 300G
@@ -38,19 +73,22 @@ jumphost:
       disk_interface: iscsi
       disk_rotation: 10000
   os: CentOS-7
-  remote_params: &remoteparas
+  remote_params: &remote_params
     type: ipmi
     versions:
       - 2.0
     user: zteroot
     pass: superuser
+  remote_management:
+    <<: *remote_params
+    address:
+    mac_address:
   interfaces:
-    - nic: 'nic1'
-      mac_address: "74:4a:a4:00:21:0c"
-      address:
-        - 10.20.0.1
-        - 172.10.0.240
-        - 192.168.1.4
+    - mac_address: "74:4a:a4:00:21:0c"
+      speed: 1gb
+  fixed_ips:
+    admin: 10.20.0.1
+    public: 172.10.0.240
 nodes:
   - name: pod3-node1
     node: &nodeparas
@@ -74,144 +112,99 @@ nodes:
         disk_interface: sas
         disk_rotation: 10000
     remote_management:
-      <<: *remoteparas
+      <<: *remote_params
       address: 192.168.1.32
       mac_address: "0c:12:62:e4:bf:de"
     interfaces:
-      - name: 'nic1'
+      - mac_address: "74:4a:a4:00:0b:85"
         speed: 10gb
         features: dpdk|sriov
-        mac_address: "74:4a:a4:00:0b:85"
-        address: 10.20.0.11/24
-        vlan: 100
-      - name: 'nic2'
+      - mac_address: "74:4a:a4:00:0b:86"
         speed: 10gb
         features: dpdk|sriov
-        mac_address: "74:4a:a4:00:0b:86"
-        vlan: 101
-      - name: 'nic3'
+      - mac_address: "74:4a:a4:00:0b:87"
         speed: 10gb
         features: dpdk|sriov
-        mac_address: "74:4a:a4:00:0b:87"
-        vlan: 102
-      - name: 'nic4'
+      - mac_address: "74:4a:a4:00:0b:88"
         speed: 10gb
         features: dpdk|sriov
-        mac_address: "74:4a:a4:00:0b:88"
-        vlan: 103, 1020
   - name: pod3-node2
     node: *nodeparas
     disks: *disks
     remote_management:
-      <<: *remoteparas
+      <<: *remote_params
       address: 192.168.1.33
       mac_address: "00:12:62:e4:c0:33"
     interfaces:
-      - name: 'nic1'
+      - mac_address: "74:4a:a4:00:5c:5d"
         speed: 10gb
         features: dpdk|sriov
-        mac_address: "74:4a:a4:00:5c:5d"
-        address: 10.20.0.12/24
-        vlan: 100
-      - name: 'nic2'
+      - mac_address: "74:4a:a4:00:5c:5e"
         speed: 10gb
         features: dpdk|sriov
-        mac_address: "74:4a:a4:00:5c:5e"
-        vlan: 101
-      - name: 'nic3'
+      - mac_address: "74:4a:a4:00:5c:5f"
         speed: 10gb
         features: dpdk|sriov
-        mac_address: "74:4a:a4:00:5c:5f"
-        vlan: 102
-      - name: 'nic4'
+      - mac_address: "74:4a:a4:00:5c:60"
         speed: 10gb
         features: dpdk|sriov
-        mac_address: "74:4a:a4:00:5c:60"
-        vlan: 103, 1020
   - name: pod3-node3
     node: *nodeparas
     disks: *disks
     remote_management:
-      <<: *remoteparas
+      <<: *remote_params
       address: 192.168.1.34
       mac_address: "74:4a:a4:00:30:93"
     interfaces:
-      - name: 'nic1'
+      - mac_address: "74:4a:a4:00:5c:35"
         speed: 10gb
         features: dpdk|sriov
-        mac_address: "74:4a:a4:00:5c:35"
-        address: 10.20.0.13/24
-        vlan: 100
-      - name: 'nic2'
+      - mac_address: "74:4a:a4:00:5c:36"
         speed: 10gb
         features: dpdk|sriov
-        mac_address: "74:4a:a4:00:5c:36"
-        vlan: 101
-      - name: 'nic3'
+      - mac_address: "74:4a:a4:00:5c:37"
         speed: 10gb
         features: dpdk|sriov
-        mac_address: "74:4a:a4:00:5c:37"
-        vlan: 102
-      - name: 'nic4'
+      - mac_address: "74:4a:a4:00:5c:38"
         speed: 10gb
         features: dpdk|sriov
-        mac_address: "74:4a:a4:00:5c:38"
-        vlan: 103, 1020
   - name: pod3-node4
     node: *nodeparas
     disks: *disks
     remote_management:
-      <<: *remoteparas
+      <<: *remote_params
       address: 192.168.1.35
       mac_address: "00:12:62:e4:c0:42"
     interfaces:
-      - name: 'nic1'
+      - mac_address: "74:4a:a4:00:5c:69"
         speed: 10gb
         features: dpdk|sriov
-        mac_address: "74:4a:a4:00:5c:69"
-        address: 10.20.0.14/24
-        vlan: 100
-      - name: 'nic2'
+      - mac_address: "74:4a:a4:00:5c:6a"
         speed: 10gb
         features: dpdk|sriov
-        mac_address: "74:4a:a4:00:5c:6a"
-        vlan: 101
-      - name: 'nic3'
+      - mac_address: "74:4a:a4:00:5c:6b"
         speed: 10gb
         features: dpdk|sriov
-        mac_address: "74:4a:a4:00:5c:6b"
-        vlan: 102
-      - name: 'nic4'
+      - mac_address: "74:4a:a4:00:5c:6c"
         speed: 10gb
         features: dpdk|sriov
-        mac_address: "74:4a:a4:00:5c:6c"
-        vlan: 103, 1020
   - name: pod3-node5
     node: *nodeparas
     disks: *disks
     remote_management:
-      <<: *remoteparas
+      <<: *remote_params
       address: 192.168.1.36
       mac_address: "74:4a:a4:00:30:43"
     interfaces:
-      - name: 'nic1'
+      - mac_address: "74:4a:a4:00:5c:6d"
         speed: 10gb
         features: dpdk|sriov
-        mac_address: "74:4a:a4:00:5c:6d"
-        address: 10.20.0.15/24
-        vlan: 100
-      - name: 'nic2'
+      - mac_address: "74:4a:a4:00:5c:6e"
         speed: 10gb
         features: dpdk|sriov
-        mac_address: "74:4a:a4:00:5c:6e"
-        vlan: 101
-      - name: 'nic3'
+      - mac_address: "74:4a:a4:00:5c:6f"
         speed: 10gb
         features: dpdk|sriov
-        mac_address: "74:4a:a4:00:5c:6f"
-        vlan: 102
-      - name: 'nic4'
+      - mac_address: "74:4a:a4:00:5c:70"
         speed: 10gb
         features: dpdk|sriov
-        mac_address: "74:4a:a4:00:5c:70"
-        vlan: 103, 1020