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

7 files changed, 127 insertions, 121 deletions

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