Merge changes from topic 'move-net_config-idf'

* changes:
  [PDF] Daisy, Fuel: Drop support for PDF net_config
  [PDF] zte-pod*: Move net_config to IDF
  [PDF] lf-pod*: Drop 'fixed_ips'
  [PDD] ericsson-pod*: Move net_config to IDF
  [PDF] bii-pod*: Move net_config to IDF
  [PDF] arm-pod*: Move net_config to IDF
  [PDF] Daisy, Fuel: Add support for IDF net_config

21 files changed, 331 insertions, 397 deletions

diff --git a/config/installers/daisy/network.yaml.j2 b/config/installers/daisy/network.yaml.j2
index 914df461..f5ac6150 100644
--- a/config/installers/daisy/network.yaml.j2
+++ b/config/installers/daisy/network.yaml.j2
@@ -44,7 +44,7 @@ networks:
   {%- set nodes_num = conf['nodes'] | length -%}
   {%- set networks = {} -%}
   {%- for key in mapping -%}
-    {%- set net_data = conf['net_config'][mapping[key]] -%}
+    {%- set net_data = conf.idf.net_config[mapping[key]] -%}
     {%- set interface = net_data['interface'] -%}
     {%- set interface_name = conf.idf[installer].network.node[0].interfaces[interface] -%}
     {%- set bus_addr = conf.idf[installer].network.node[0].busaddr[interface] -%}
diff --git a/config/installers/fuel/pod_config.yml.j2 b/config/installers/fuel/pod_config.yml.j2
index bfcec091..8a4d869e 100644
--- a/config/installers/fuel/pod_config.yml.j2
+++ b/config/installers/fuel/pod_config.yml.j2
@@ -1,18 +1,18 @@
 ---
 {%- if conf.idf is defined and conf.idf.fuel is defined -%}
-  {%- if conf.net_config is defined -%}
-      {%- set net_admin = conf.net_config.admin.network -%}
-      {%- set net_mgmt = conf.net_config.mgmt.network -%}
-      {%- set net_private = conf.net_config.private.network -%}
-      {%- set net_public = conf.net_config.public.network -%}
-      {%- set vlan_mgmt = conf.net_config.mgmt.vlan -%}
-      {%- set vlan_private = conf.net_config.private.vlan -%}
-      {%- if conf.net_config.public.dns is defined -%}
-          {%- set dns_public = conf.net_config.public.dns -%}
+  {%- if conf.idf.net_config is defined -%}
+      {%- set net_admin = conf.idf.net_config.admin.network -%}
+      {%- set net_mgmt = conf.idf.net_config.mgmt.network -%}
+      {%- set net_private = conf.idf.net_config.private.network -%}
+      {%- set net_public = conf.idf.net_config.public.network -%}
+      {%- set vlan_mgmt = conf.idf.net_config.mgmt.vlan -%}
+      {%- set vlan_private = conf.idf.net_config.private.vlan -%}
+      {%- if conf.idf.net_config.public.dns is defined -%}
+          {%- set dns_public = conf.idf.net_config.public.dns -%}
       {%- endif -%}
-      {%- set pxe_interface = conf.net_config.admin.interface -%}
-      {%- if conf.net_config.public.gateway is defined -%}
-          {%- set net_public_gw = conf.net_config.public.gateway -%}
+      {%- set pxe_interface = conf.idf.net_config.admin.interface -%}
+      {%- if conf.idf.net_config.public.gateway is defined -%}
+          {%- set net_public_gw = conf.idf.net_config.public.gateway -%}
       {%- endif -%}
   {%- else -%}
       {%- set net_admin = '192.168.11.0' -%}
diff --git a/labs/arm/idf-pod5.yaml b/labs/arm/idf-pod5.yaml
index d8a6baf4..c8035228 100644
--- a/labs/arm/idf-pod5.yaml
+++ b/labs/arm/idf-pod5.yaml
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright (c) 2017 Enea AB and others.
+# Copyright (c) 2018 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
@@ -10,6 +10,39 @@
 
 idf:
   version: 0.1
+  net_config:
+    oob:
+      ip-range: 10.0.8.3-10.0.8.10
+      vlan: native
+    admin:
+      interface: 0
+      vlan: native
+      network: 192.168.11.0
+      mask: 24
+    mgmt:
+      interface: 1
+      vlan: 2183
+      network: 172.16.10.0
+      mask: 24
+    storage:
+      interface: 1
+      vlan: 2184
+      network: 10.2.0.0
+      mask: 24
+    private:
+      interface: 1
+      vlan: 2185
+      network: 10.1.0.0
+      mask: 24
+    public:
+      interface: 1
+      vlan: native
+      network: 10.0.8.0
+      mask: 24
+      gateway: 10.0.8.254
+      dns:
+        - 8.8.8.8
+        - 8.8.4.4
   fuel:
     jumphost:
       bridges:
diff --git a/labs/arm/idf-pod6.yaml b/labs/arm/idf-pod6.yaml
index 2db3865e..9246c4f7 100644
--- a/labs/arm/idf-pod6.yaml
+++ b/labs/arm/idf-pod6.yaml
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright (c) 2017 Enea AB and others.
+# Copyright (c) 2018 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
@@ -10,6 +10,39 @@
 
 idf:
   version: 0.1
+  net_config:
+    oob:
+      ip-range: 10.0.1.54-10.0.1.58
+      vlan: native
+    admin:
+      interface: 0
+      vlan: native
+      network: 192.168.11.0
+      mask: 24
+    mgmt:
+      interface: 1
+      vlan: 2323
+      network: 172.16.10.0
+      mask: 24
+    storage:
+      interface: 1
+      vlan: 2324
+      network: 10.2.0.0
+      mask: 24
+    private:
+      interface: 1
+      vlan: 2325
+      network: 10.1.0.0
+      mask: 24
+    public:
+      interface: 1
+      vlan: native
+      network: 10.0.15.0
+      mask: 24
+      gateway: 10.0.15.254
+      dns:
+        - 8.8.8.8
+        - 8.8.4.4
   fuel:
     jumphost:
       bridges:
diff --git a/labs/arm/pod5.yaml b/labs/arm/pod5.yaml
index 7ee358fc..959e79fb 100644
--- a/labs/arm/pod5.yaml
+++ b/labs/arm/pod5.yaml
@@ -1,3 +1,10 @@
+##############################################################################
+# Copyright (c) 2018 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
+##############################################################################
 ---
 ### Enea ARM POD 5 descriptor file ###
 
@@ -9,40 +16,6 @@ details:
   type: production
   link: https://wiki.opnfv.org/display/pharos/Enea+Hosting
 ##############################################################################
-net_config:
-  oob:
-    ip-range: 10.0.8.3-10.0.8.10
-    vlan: native
-  admin:
-    interface: 0
-    vlan: native
-    network: 192.168.11.0
-    mask: 24
-  mgmt:
-    interface: 1
-    vlan: 2183
-    network: 172.16.10.0
-    mask: 24
-  storage:
-    interface: 1
-    vlan: 2184
-    network: 10.2.0.0
-    mask: 24
-  private:
-    interface: 1
-    vlan: 2185
-    network: 10.1.0.0
-    mask: 24
-  public:
-    interface: 1
-    vlan: native
-    network: 10.0.8.0
-    mask: 24
-    gateway: 10.0.8.254
-    dns:
-      - 8.8.8.8
-      - 8.8.4.4
-##############################################################################
 jumphost:
   name: jenkins-slave-arm-pod5
   node:
@@ -74,6 +47,7 @@ jumphost:
   interfaces:
     # Connected, used only for admin/PXE
     - mac_address: "68:05:ca:34:60:e3"
+      address: 192.168.11.1
       speed: 1gb
       features: ''
     # Not connected for now
@@ -88,10 +62,6 @@ jumphost:
     - mac_address: "00:0f:b7:04:00:c0"
       speed: 10gb
       features: ''
-  fixed_ips:
-    admin: 192.168.11.1
-    mgmt: 172.16.10.1
-    public: 10.0.8.9
 ##############################################################################
 nodes:
   - name: softiron-3
@@ -127,10 +97,6 @@ nodes:
       - mac_address: "e0:ff:f7:00:08:af"
         speed: 10gb
         features: ''
-    fixed_ips:
-      admin: 192.168.11.2
-      mgmt: 172.16.10.141
-      public: 10.0.8.141
   ############################################################################
   - name: softiron-4
     node: *nodeparams
@@ -146,10 +112,6 @@ nodes:
       - mac_address: "e0:ff:f7:00:08:b2"
         speed: 10gb
         features: ''
-    fixed_ips:
-      admin: 192.168.11.3
-      mgmt: 172.16.10.142
-      public: 10.0.8.142
   ############################################################################
   - name: softiron-5
     node: *nodeparams
@@ -165,10 +127,6 @@ nodes:
       - mac_address: "e0:ff:f7:00:08:be"
         speed: 10gb
         features: ''
-    fixed_ips:
-      admin: 192.168.11.4
-      mgmt: 172.16.10.143
-      public: 10.0.8.143
   ############################################################################
   - name: softiron-6
     node: *nodeparams
@@ -184,10 +142,6 @@ nodes:
       - mac_address: "e0:ff:f7:00:08:c7"
         speed: 10gb
         features: ''
-    fixed_ips:
-      admin: 192.168.11.5
-      mgmt: 172.16.10.101
-      public: 10.0.8.101
   ############################################################################
   - name: softiron-7
     node: *nodeparams
@@ -203,7 +157,3 @@ nodes:
       - mac_address: "e0:ff:f7:00:08:d0"
         speed: 10gb
         features: ''
-    fixed_ips:
-      admin: 192.168.11.6
-      mgmt: 172.16.10.102
-      public: 10.0.8.102
diff --git a/labs/arm/pod6.yaml b/labs/arm/pod6.yaml
index f4f92ddd..b2d3419e 100644
--- a/labs/arm/pod6.yaml
+++ b/labs/arm/pod6.yaml
@@ -1,3 +1,10 @@
+##############################################################################
+# Copyright (c) 2018 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
+##############################################################################
 ---
 ### Enea ARM POD 6 descriptor file ###
 
@@ -9,40 +16,6 @@ details:
   type: production
   link: https://wiki.opnfv.org/display/pharos/Enea+Hosting
 ##############################################################################
-net_config:
-  oob:
-    ip-range: 10.0.1.54-10.0.1.58
-    vlan: native
-  admin:
-    interface: 0
-    vlan: native
-    network: 192.168.11.0
-    mask: 24
-  mgmt:
-    interface: 1
-    vlan: 2323
-    network: 172.16.10.0
-    mask: 24
-  storage:
-    interface: 1
-    vlan: 2324
-    network: 10.2.0.0
-    mask: 24
-  private:
-    interface: 1
-    vlan: 2325
-    network: 10.1.0.0
-    mask: 24
-  public:
-    interface: 1
-    vlan: native
-    network: 10.0.15.0
-    mask: 24
-    gateway: 10.0.15.254
-    dns:
-      - 8.8.8.8
-      - 8.8.4.4
-##############################################################################
 jumphost:
   name: jenkins-slave-arm-pod6
   node:
@@ -86,6 +59,7 @@ jumphost:
   interfaces:
     ## eth0, Not connected for now
     - mac_address: "00:01:73:02:36:d4"
+      address: 192.168.11.1
       speed: 1gb
       features: ''
     ## eth1, Connected, used only for admin/PXE
@@ -100,10 +74,6 @@ jumphost:
     - mac_address: "00:01:73:02:36:d7"
       speed: 10gb
       features: ''
-  fixed_ips:
-    admin: 192.168.11.1
-    mgmt: 172.16.10.1
-    public: 10.0.15.9
 ##############################################################################
 nodes:
   - name: cn8890-24
@@ -150,10 +120,6 @@ nodes:
       - mac_address: "1c:1b:0d:e8:fa:87"
         speed: 10gb
         features: 'dpdk|sriov'
-    fixed_ips:
-      admin: 192.168.11.2
-      mgmt: 172.16.10.142
-      public: 10.0.15.142
   ############################################################################
   - name: cn8890-25
     node: *nodeparams
@@ -181,10 +147,6 @@ nodes:
       - mac_address: "1c:1b:0d:e8:fb:a9"
         speed: 10gb
         features: 'dpdk|sriov'
-    fixed_ips:
-      admin: 192.168.11.3
-      mgmt: 172.16.10.143
-      public: 10.0.15.143
   ############################################################################
   - name: cn8890-26
     node: *nodeparams
@@ -212,10 +174,6 @@ nodes:
       - mac_address: "1c:1b:0d:e8:fa:69"
         speed: 10gb
         features: 'dpdk|sriov'
-    fixed_ips:
-      admin: 192.168.11.4
-      mgmt: 172.16.10.144
-      public: 10.0.15.144
   ############################################################################
   - name: cn8890-27
     node: *nodeparams
@@ -243,10 +201,6 @@ nodes:
       - mac_address: "1c:1b:0d:e8:fb:1d"
         speed: 10gb
         features: 'dpdk|sriov'
-    fixed_ips:
-      admin: 192.168.11.5
-      mgmt: 172.16.10.145
-      public: 10.0.15.145
   ############################################################################
   - name: cn8890-28
     node: *nodeparams
@@ -274,7 +228,3 @@ nodes:
       - mac_address: "1c:1b:0d:e8:fb:81"
         speed: 10gb
         features: 'dpdk|sriov'
-    fixed_ips:
-      admin: 192.168.11.6
-      mgmt: 172.16.10.146
-      public: 10.0.15.146
diff --git a/labs/bii/idf-pod1.yaml b/labs/bii/idf-pod1.yaml
new file mode 100644
index 00000000..8c358a9c
--- /dev/null
+++ b/labs/bii/idf-pod1.yaml
@@ -0,0 +1,33 @@
+---
+### This is a BII POD1 Installer descriptor file ###
+
+idf:
+  version: 0.1
+  net_config:
+    admin:
+      interface: 0
+      vlan: 0
+      network: 10.20.0.0
+      mask: 24
+      gateway: 10.20.0.1
+      dns: 10.20.0.1
+    mgmt:
+      interface: 0
+      vlan: 102
+      network: 192.168.102.0
+      mask: 24
+    storage:
+      interface: 0
+      vlan: 101
+      network: 192.168.101.0
+      mask: 24
+    private:
+      interface: 0
+      vlan: 103
+      network: 192.168.103.0
+      mask: 24
+    public:
+      interface: 1
+      vlan: 0
+      network: 192.168.20.0
+      mask: 24
diff --git a/labs/bii/pod1.yaml b/labs/bii/pod1.yaml
index 159401b7..f6ad478f 100644
--- a/labs/bii/pod1.yaml
+++ b/labs/bii/pod1.yaml
@@ -8,35 +8,6 @@ details:
   type: development
   link: https://wiki.opnfv.org/display/pharos/BII
 ###################################################
-net_config:
-  admin:
-    interface: 0
-    vlan: 0
-    network: 10.20.0.0
-    mask: 24
-    gateway: 10.20.0.1
-    dns: 10.20.0.1
-  mgmt:
-    interface: 0
-    vlan: 102
-    network: 192.168.102.0
-    mask: 24
-  storage:
-    interface: 0
-    vlan: 101
-    network: 192.168.101.0
-    mask: 24
-  private:
-    interface: 0
-    vlan: 103
-    network: 192.168.103.0
-    mask: 24
-  public:
-    interface: 1
-    vlan: 0
-    network: 192.168.20.0
-    mask: 24
-###################################################
 jumphost:
   name: fuel
   node:
@@ -86,11 +57,10 @@ jumphost:
     address: 192.168.20.200
     mac_address: "44:A8:42:1A:68:78"
   interfaces:                               # physical interface list
-    - "44:a8:42:15:10:03"
-    - "44:a8:42:15:10:04"
-  fixed_ips:
-    admin: 10.20.0.2
-    public: 192.168.20.5
+    - mac_address: "44:a8:42:15:10:03"
+      address: 10.20.0.2
+    - mac_address: "44:a8:42:15:10:04"
+      address: 192.168.20.5
 ###################################################
 nodes:
   - name: compute1
@@ -134,9 +104,8 @@ nodes:
       address: 192.168.20.201
       mac_address: "44:A8:42:1A:70:BE"
     interfaces:                               # physical interface list
-      - "44:a8:42:14:ee:64"
-    fixed_ips:
-      admin: 10.20.0.4
+      - mac_address: "44:a8:42:14:ee:64"
+        address: 10.20.0.4
   ########################################
   - name: compute2
     node: *nodeparas
@@ -146,9 +115,8 @@ nodes:
       address: 192.168.20.202
       mac_address: "44:A8:42:1A:76:26"
     interfaces:
-      - "44:a8:42:14:cb:31"
-    fixed_ips:
-      admin: 10.20.0.5
+      - mac_address: "44:a8:42:14:cb:31"
+        address: 10.20.0.5
   ########################################
   - name: controller1
     node: *nodeparas
@@ -158,11 +126,10 @@ nodes:
       address: 192.168.20.203
       mac_address: "44:A8:42:1A:49:A5"
     interfaces:
-      - "44:a8:42:14:cd:0d"
-      - "44:a8:42:14:cd:0e"
-    fixed_ips:
-      admin: 10.20.0.6
-      public: 192.168.20.12
+      - mac_address: "44:a8:42:14:cd:0d"
+        address: 10.20.0.6
+      - mac_address: "44:a8:42:14:cd:0e"
+        address: 192.168.20.12
   ########################################
   - name: controller2
     node: *nodeparas
@@ -172,11 +139,10 @@ nodes:
       address: 192.168.20.204
       mac_address: "44:A8:42:1A:76:2C"
     interfaces:
-      - "44:a8:42:15:1b:e6"
-      - "44:a8:42:15:1b:e7"
-    fixed_ips:
-      admin: 10.20.0.7
-      public: 192.168.20.13
+      - mac_address: "44:a8:42:15:1b:e6"
+        address: 10.20.0.7
+      - mac_address: "44:a8:42:15:1b:e7"
+        address: 192.168.20.13
   ########################################
   - name: controller3
     node: *nodeparas
@@ -186,8 +152,7 @@ nodes:
       address: 192.168.20.205
       mac_address: "44:A8:42:13:D5:1B"
     interfaces:
-      - "44:a8:42:14:fc:1a"
-      - "44:a8:42:14:fc:1b"
-    fixed_ips:
-      admin: 10.20.0.8
-      public: 192.168.20.14
+      - mac_address: "44:a8:42:14:fc:1a"
+        address: 10.20.0.8
+      - mac_address: "44:a8:42:14:fc:1b"
+        address: 192.168.20.14
diff --git a/labs/ericsson/idf-pod1.yaml b/labs/ericsson/idf-pod1.yaml
index 9b4a98d4..d9042544 100644
--- a/labs/ericsson/idf-pod1.yaml
+++ b/labs/ericsson/idf-pod1.yaml
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright (c) 2017 Ericsson AB, Mirantis Inc., Enea AB and others.
+# Copyright (c) 2018 Ericsson AB, 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
@@ -10,6 +10,40 @@
 
 idf:
   version: 0.1
+  net_config:
+    oob:
+      interface: 0
+      ip-range: 172.16.1.16-172.16.1.21
+      vlan: native
+    admin:
+      interface: 4
+      vlan: native
+      network: 192.168.11.0  # Untagged, 'PXE/Admin' for MaaS (no IP on JP)
+      mask: 24
+    mgmt:
+      interface: 2
+      vlan: 81
+      network: 192.168.10.0
+      mask: 24
+    storage:
+      interface: 2
+      vlan: 82
+      network: 192.168.20.0
+      mask: 24
+    private:
+      interface: 3
+      vlan: 1000
+      network: 192.168.2.0
+      mask: 24
+    public:
+      interface: 2
+      vlan: 80
+      network: 100.64.200.0
+      mask: 24
+      gateway: 100.64.200.1
+      dns:
+        - 8.8.8.8
+        - 8.8.4.4
   fuel:
     jumphost:
       bridges:
diff --git a/labs/ericsson/pod1.yaml b/labs/ericsson/pod1.yaml
index 76ca002f..70d47ced 100644
--- a/labs/ericsson/pod1.yaml
+++ b/labs/ericsson/pod1.yaml
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright (c) 2017 Ericsson AB, Mirantis Inc., Enea AB and others.
+# Copyright (c) 2018 Ericsson AB, 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
@@ -16,44 +16,6 @@ details:
   type: production
   link: https://wiki.opnfv.org/display/pharos/CI-ERICSSON-POD1
 ##############################################################################
-net_config:
-  # NOTE: Network names are likely to change after the PDF spec is updated
-  # NOTE: Some networks (e.g. admin) are created by the installer
-  # NOTE: Network-to-interface mapping will be reworked after PDF update
-  oob:
-    interface: 0
-    ip-range: 172.16.1.16-172.16.1.21
-    vlan: native
-  admin:
-    interface: 4
-    vlan: native
-    network: 192.168.11.0  # Untagged, 'PXE/Admin' for MaaS (no IP on JP)
-    mask: 24
-  mgmt:
-    interface: 2
-    vlan: 81
-    network: 192.168.10.0
-    mask: 24
-  storage:
-    interface: 2
-    vlan: 82
-    network: 192.168.20.0
-    mask: 24
-  private:
-    interface: 3
-    vlan: 1000
-    network: 192.168.2.0
-    mask: 24
-  public:
-    interface: 2
-    vlan: 80
-    network: 100.64.200.0
-    mask: 24
-    gateway: 100.64.200.1
-    dns:
-      - 8.8.8.8
-      - 8.8.4.4
-##############################################################################
 jumphost:
   name: CI-POD1-HOST
   node: &nodeparams
diff --git a/labs/lf/idf-pod2.yaml b/labs/lf/idf-pod2.yaml
index c3ad1714..a2c00967 100644
--- a/labs/lf/idf-pod2.yaml
+++ b/labs/lf/idf-pod2.yaml
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright (c) 2017 Enea AB and others.
+# Copyright (c) 2018 Linux Foundation, 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
diff --git a/labs/lf/idf-pod5.yaml b/labs/lf/idf-pod5.yaml
index b7d05cfb..59064f3c 100644
--- a/labs/lf/idf-pod5.yaml
+++ b/labs/lf/idf-pod5.yaml
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright (c) 2017 Enea AB and others.
+# Copyright (c) 2018 Linux Foundation, 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
diff --git a/labs/lf/pod2.yaml b/labs/lf/pod2.yaml
index 6f684735..3c5502cc 100644
--- a/labs/lf/pod2.yaml
+++ b/labs/lf/pod2.yaml
@@ -1,3 +1,10 @@
+##############################################################################
+# Copyright (c) 2018 Linux Foundation, 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
+##############################################################################
 ---
 ### LF POD 2 descriptor file ###
 
@@ -41,6 +48,7 @@ jumphost:
     - mac_address: "00:25:b5:a0:00:1a"
       speed: 40gb
       features: 'dpdk|sriov'
+      address: 192.168.11.1
     - mac_address: "00:25:b5:a0:00:1b"
       speed: 40gb
       features: 'dpdk|sriov'
@@ -50,10 +58,6 @@ jumphost:
     - mac_address: "00:25:b5:a0:00:1d"
       speed: 40gb
       features: 'dpdk|sriov'
-  fixed_ips:
-    admin: 192.168.11.1
-    mgmt: 10.167.4.1
-    public: 172.30.10.72
 ##############################################################################
 nodes:
   - name: pod2-node1
@@ -84,10 +88,6 @@ nodes:
       - mac_address: "00:25:b5:a0:00:2d"
         speed: 40gb
         features: 'dpdk|sriov'
-    fixed_ips:
-      admin: 192.168.11.2
-      mgmt: 10.167.4.2
-      public: 172.30.10.2
   ############################################################################
   - name: pod2-node2
     node: *nodeparams
@@ -109,10 +109,6 @@ nodes:
       - mac_address: "00:25:b5:a0:00:3d"
         speed: 40gb
         features: 'dpdk|sriov'
-    fixed_ips:
-      admin: 192.168.11.3
-      mgmt: 10.167.4.3
-      public: 172.30.10.3
   ############################################################################
   - name: pod2-node3
     node: *nodeparams
@@ -134,10 +130,6 @@ nodes:
       - mac_address: "00:25:b5:a0:00:4d"
         speed: 40gb
         features: 'dpdk|sriov'
-    fixed_ips:
-      admin: 192.168.11.4
-      mgmt: 10.167.4.4
-      public: 172.30.10.4
   ############################################################################
   - name: pod2-node4
     node: *nodeparams
@@ -159,10 +151,6 @@ nodes:
       - mac_address: "00:25:b5:a0:00:5d"
         speed: 40gb
         features: 'dpdk|sriov'
-    fixed_ips:
-      admin: 192.168.11.5
-      mgmt: 10.167.4.5
-      public: 172.30.10.5
   ############################################################################
   - name: pod2-node5
     node: *nodeparams
@@ -184,7 +172,3 @@ nodes:
       - mac_address: "00:25:b5:a0:00:6d"
         speed: 40gb
         features: 'dpdk|sriov'
-    fixed_ips:
-      admin: 192.168.11.6
-      mgmt: 10.167.4.6
-      public: 172.30.10.6
diff --git a/labs/lf/pod5.yaml b/labs/lf/pod5.yaml
index ffb1b90d..9c14cc67 100644
--- a/labs/lf/pod5.yaml
+++ b/labs/lf/pod5.yaml
@@ -1,3 +1,10 @@
+##############################################################################
+# Copyright (c) 2018 Linux Foundation, 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
+##############################################################################
 ---
 ### LF POD 5 descriptor file ###
 
@@ -40,16 +47,13 @@ jumphost:
     - mac_address: "a4:bf:01:01:ad:71"
       speed: 1gb
       features: 'dpdk|sriov'
+      address: 10.20.0.129
     - mac_address: "00:1e:67:fd:9c:c2"
       speed: 10gb
       features: 'dpdk|sriov'
     - mac_address: "00:1e:67:fd:9c:c3"
       speed: 10gb
       features: 'dpdk|sriov'
-  fixed_ips:
-    admin: 10.20.0.129
-    mgmt: 192.168.0.130
-    public: 172.30.13.89
 nodes:
   - name: pod5-node1
     node: *nodeparas
@@ -68,10 +72,6 @@ nodes:
       - mac_address: "00:1e:67:f6:9b:35"
         speed: 10gb
         features: 'dpdk|sriov'
-    fixed_ips:
-      admin: 10.20.0.130
-      mgmt: 192.168.0.131
-      public: 172.30.13.90
   - name: pod5-node2
     node: *nodeparas
     disks: *disks
@@ -89,10 +89,6 @@ nodes:
       - mac_address: "00:1e:67:f6:9b:37"
         speed: 10gb
         features: 'dpdk|sriov'
-    fixed_ips:
-      admin: 10.20.0.131
-      mgmt: 192.168.0.132
-      public: 172.30.13.91
   - name: pod5-node3
     node: *nodeparas
     disks: *disks
@@ -110,10 +106,6 @@ nodes:
       - mac_address: "00:1e:67:fd:9c:b1"
         speed: 10gb
         features: 'dpdk|sriov'
-    fixed_ips:
-      admin: 10.20.0.132
-      mgmt: 192.168.0.133
-      public: 172.30.13.92
   - name: pod5-node4
     node: *nodeparas
     disks: *disks
@@ -131,10 +123,6 @@ nodes:
       - mac_address: "00:1e:67:fd:99:25"
         speed: 10gb
         features: 'dpdk|sriov'
-    fixed_ips:
-      admin: 10.20.0.133
-      mgmt: 192.168.0.134
-      public: 172.30.13.93
   - name: pod5-node5
     node: *nodeparas
     disks: *disks
@@ -152,7 +140,3 @@ nodes:
       - mac_address: "00:1e:67:f6:9b:97"
         speed: 10gb
         features: 'dpdk|sriov'
-    fixed_ips:
-      admin: 10.20.0.134
-      mgmt: 192.168.0.135
-      public: 172.30.13.94
diff --git a/labs/zte/idf-pod1.yaml b/labs/zte/idf-pod1.yaml
index fc09db3f..3bb9e034 100644
--- a/labs/zte/idf-pod1.yaml
+++ b/labs/zte/idf-pod1.yaml
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright (c) 2017 ZTE, Mirantis Inc., Enea AB and others.
+# Copyright (c) 2018 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
@@ -10,6 +10,39 @@
 
 idf:
   version: 0.1
+  net_config:
+    oob:
+      interface: 0
+      ip-range: 192.168.1.101-192.168.1.105
+      vlan: null
+    admin:
+      interface: 0
+      vlan: native
+      network: 10.10.6.0
+      mask: 24
+    mgmt:
+      interface: 1
+      vlan: 161
+      network: 192.168.61.0
+      mask: 24
+    storage:
+      interface: 2
+      vlan: 162
+      network: 192.168.62.0
+      mask: 24
+    private:
+      interface: 3
+      vlan: 1120
+      network: 192.168.63.0
+      mask: 24
+    public:
+      interface: 4
+      vlan: 163
+      network: 172.60.0.0
+      mask: 24
+      gateway: 172.60.0.1
+      dns:
+        - 172.10.0.1
   fuel:
     jumphost:
       bridges:
diff --git a/labs/zte/idf-pod2.yaml b/labs/zte/idf-pod2.yaml
index e8d7f781..dbe14b9e 100644
--- a/labs/zte/idf-pod2.yaml
+++ b/labs/zte/idf-pod2.yaml
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright (c) 2017 ZTE, Mirantis Inc., Enea AB and others.
+# Copyright (c) 2018 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
@@ -10,6 +10,39 @@
 
 idf:
   version: 0.1
+  net_config:
+    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
   daisy:
     jumphost:
       bridges:
diff --git a/labs/zte/idf-pod3.yaml b/labs/zte/idf-pod3.yaml
index d1bb156e..e5e19f4c 100644
--- a/labs/zte/idf-pod3.yaml
+++ b/labs/zte/idf-pod3.yaml
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright (c) 2017 ZTE, Mirantis Inc., Enea AB and others.
+# Copyright (c) 2018 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
@@ -10,6 +10,39 @@
 
 idf:
   version: 0.1
+  net_config:
+    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
   daisy:
     jumphost:
       bridges:
diff --git a/labs/zte/pod1.yaml b/labs/zte/pod1.yaml
index 950c2d89..700c5d0c 100644
--- a/labs/zte/pod1.yaml
+++ b/labs/zte/pod1.yaml
@@ -1,3 +1,10 @@
+##############################################################################
+# Copyright (c) 2018 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 1 descriptor file ###
 # refering to https://gerrit.opnfv.org/gerrit/#/c/23727/9/config/pod1.yaml
@@ -10,41 +17,6 @@ details:
   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.101-192.168.1.105
-    vlan: null
-  admin:
-    interface: 0
-    vlan: native
-    network: 10.10.6.0
-    mask: 24
-  mgmt:
-    interface: 1
-    vlan: 161
-    network: 192.168.61.0
-    mask: 24
-  storage:
-    interface: 2
-    vlan: 162
-    network: 192.168.62.0
-    mask: 24
-  private:
-    interface: 3
-    vlan: 1120
-    network: 192.168.63.0
-    mask: 24
-  public:
-    interface: 4
-    vlan: 163
-    network: 172.60.0.0
-    mask: 24
-    gateway: 172.60.0.1
-    dns:
-      - 172.10.0.1
-##############################################################################
 jumphost:
   name: pod1-jump
   node:
@@ -104,10 +76,7 @@ jumphost:
   interfaces:
     - mac_address: "74:4a:a4:00:91:b3"
       speed: 1gb
-  fixed_ips:
-    admin: 10.20.6.1
-    mgmt: 192.168.61.238
-    public: 172.60.0.238
+      address: 10.20.6.1
 nodes:
   - name: pod1-node1
     node: &nodeparas
diff --git a/labs/zte/pod2.yaml b/labs/zte/pod2.yaml
index 5b3915fe..3a7db7c8 100644
--- a/labs/zte/pod2.yaml
+++ b/labs/zte/pod2.yaml
@@ -1,3 +1,10 @@
+##############################################################################
+# Copyright (c) 2018 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 descriptor file ###
 # refering to https://gerrit.opnfv.org/gerrit/#/c/23727/9/config/pod1.yaml
@@ -10,41 +17,6 @@ details:
   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:
@@ -105,9 +77,7 @@ jumphost:
   interfaces:
     - mac_address: "74:4a:a4:00:91:18"
       speed: 1gb
-  fixed_ips:
-    admin: 10.20.7.1
-    public: 172.70.0.239
+      address: 10.20.7.1
 nodes:
   - name: pod2-node1
     node: &nodeparas
diff --git a/labs/zte/pod3.yaml b/labs/zte/pod3.yaml
index b44602f2..a6aa217f 100644
--- a/labs/zte/pod3.yaml
+++ b/labs/zte/pod3.yaml
@@ -1,3 +1,10 @@
+##############################################################################
+# Copyright (c) 2018 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 descriptor file ###
 # refering to https://gerrit.opnfv.org/gerrit/#/c/23727/9/config/pod1.yaml
@@ -10,41 +17,6 @@ details:
   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:
@@ -104,9 +76,7 @@ jumphost:
   interfaces:
     - mac_address: "74:4a:a4:00:21:0c"
       speed: 1gb
-  fixed_ips:
-    admin: 10.20.0.1
-    public: 172.10.0.240
+      address: 10.20.0.1
 nodes:
   - name: pod3-node1
     node: &nodeparas
diff --git a/labs/zte/pod9.yaml b/labs/zte/pod9.yaml
index 7ffd20a1..1045fb0e 100644
--- a/labs/zte/pod9.yaml
+++ b/labs/zte/pod9.yaml
@@ -65,9 +65,7 @@ jumphost:
   interfaces:
     - mac_address: "00:1b:21:89:30:87"
       speed: 10gb
-  fixed_ips:
-    admin: 10.20.7.1
-    public: 192.168.21.195
+      address: 10.20.7.1
 nodes:
   - name: pod9-node1
     node: &nodeparas