Merge "[PDF] config: Add/update license headers"
authorAric Gardner <agardner@linuxfoundation.org>
Mon, 22 Jan 2018 16:13:11 +0000 (16:13 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Mon, 22 Jan 2018 16:13:11 +0000 (16:13 +0000)
35 files changed:
INFO
config/installers/daisy/network.yaml.j2
config/installers/daisy/pod_config.yaml.j2
config/installers/fuel/pod_config.yml.j2
config/pdf/pod1.encrypted.yaml
config/pdf/pod1.schema.yaml [new file with mode: 0644]
config/pdf/pod1.yaml
config/utils/check-jinja2.sh
config/utils/check-schema.sh [new file with mode: 0755]
config/utils/validate_schema.py [new file with mode: 0755]
labs/arm/idf-pod5.yaml
labs/arm/idf-pod6.yaml
labs/arm/idf-pod7.yaml [new file with mode: 0644]
labs/arm/pod5.yaml
labs/arm/pod6.yaml
labs/arm/pod7.yaml [new file with mode: 0644]
labs/bii/idf-pod1.yaml [new file with mode: 0644]
labs/bii/pod1.yaml
labs/ericsson/idf-pod1.yaml
labs/ericsson/pod1.yaml
labs/ericsson/pod2.yaml
labs/huawei/idf-pod1.yaml [new file with mode: 0644]
labs/huawei/pod1.yaml [new file with mode: 0644]
labs/intel/pod18.yaml
labs/lf/idf-pod2.yaml
labs/lf/idf-pod5.yaml
labs/lf/pod2.yaml
labs/lf/pod5.yaml
labs/zte/idf-pod1.yaml
labs/zte/idf-pod2.yaml
labs/zte/idf-pod3.yaml
labs/zte/pod1.yaml
labs/zte/pod2.yaml
labs/zte/pod3.yaml
labs/zte/pod9.yaml

diff --git a/INFO b/INFO
index 8299eea..3f003bc 100644 (file)
--- a/INFO
+++ b/INFO
@@ -17,13 +17,10 @@ Aric Gardner <agardner@linuxfoundation.org>
 Fatih Degirmenci <fatih.degirmenci@ericsson.com>
 Guillermo Herrero <guillermo.herrero@enea.com>
 Jack Morgan <jack.morgan@intel.com>
-Jose Lausuch <jalausuch@suse.com>
 Julien Zhang <zhang.jun3g@zte.com.cn>
-Morgan Richomme <morgan.richomme@orange.com>
 Parker Berberian <pberberian@iol.unh.edu>
 Trevor Bramwell <tbramwell@linuxfoundation.org>
 Trevor Cooper <trevor.cooper@intel.com>
-Wenjing Chu <wenjing.chu@huawei.com>
 
 Link to TSC approval of the project: http://meetbot.opnfv.org/meetings/opnfv-meeting/
 Link(s) to approval of additional committers:
index cc20c7e..1fad1ac 100644 (file)
@@ -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] -%}
index bea444b..30147a5 100644 (file)
@@ -86,6 +86,6 @@ daisy_passwd: 'r00tme'
 {% if 'fixed_ips' in conf['jumphost'] -%}
 daisy_gateway: {{ conf['jumphost']['fixed_ips']['admin'] }}
 {%- else -%}
-daisy_gateway: {{ conf['jumphost']['interfaces'][0]['address'][0] }}
+daisy_gateway: {{ conf['jumphost']['interfaces'][0]['address'] }}
 {%- endif %}
 ceph_disk_name: '/dev/sdb'
index 0b19eee..7443096 100644 (file)
@@ -7,19 +7,19 @@
 ##############################################################################
 ---
 {%- 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' -%}
@@ -46,6 +46,7 @@ parameters:
     opnfv_jump_bridge_public: {{ conf.idf.fuel.jumphost.bridges.public }}
 
     opnfv_infra_config_address: {{ net_mgmt | ipaddr_index(100) }}
+    opnfv_infra_config_pxe_address: {{ net_admin | ipaddr_index(2) }}
     opnfv_infra_maas_node01_address: {{ net_mgmt | ipaddr_index(3) }}
     opnfv_infra_maas_node01_deploy_address: {{ net_admin | ipaddr_index(3) }}
     opnfv_infra_kvm_address: {{ net_mgmt | ipaddr_index(140) }}
@@ -54,9 +55,8 @@ parameters:
     opnfv_infra_kvm_node03_address: {{ net_mgmt | ipaddr_index(143) }}
 
     opnfv_infra_maas_pxe_network_address: {{ net_admin }}
-    opnfv_infra_maas_pxe_address: {{ net_admin | ipaddr_index(3) }}
-    opnfv_infra_maas_pxe_start_address: {{ net_admin | ipaddr_index(5) }}
-    opnfv_infra_maas_pxe_end_address: {{ net_admin | ipaddr_index(250) }}
+    opnfv_infra_maas_pxe_start_address: {{ net_admin | ipaddr_index(4) }}
+    opnfv_infra_maas_pxe_end_address: {{ net_admin | ipaddr_index(100) }}
 
     opnfv_openstack_gateway_node01_address: {{ net_mgmt | ipaddr_index(124) }}
     opnfv_openstack_gateway_node02_address: {{ net_mgmt | ipaddr_index(125) }}
@@ -67,6 +67,7 @@ parameters:
     opnfv_openstack_proxy_address: {{ net_public | ipaddr_index(103) }}
     opnfv_openstack_proxy_node01_address: {{ net_public | ipaddr_index(104) }}
     opnfv_openstack_proxy_node02_address: {{ net_public | ipaddr_index(105) }}
+    opnfv_openstack_proxy_control_address: {{ net_mgmt | ipaddr_index(103) }}
     opnfv_openstack_proxy_node01_control_address: {{ net_mgmt | ipaddr_index(104) }}
     opnfv_openstack_proxy_node02_control_address: {{ net_mgmt | ipaddr_index(105) }}
     opnfv_openstack_control_address: {{ net_mgmt | ipaddr_index(10) }}
index 2320bde..c1e8f78 100644 (file)
@@ -39,7 +39,7 @@ jumphost:
       # several disk types possible
       disk_type: {hdd|ssd|cdrom|tape}
       # several interface types possible
-      disk_interface: {sata|sas|ssd|nvme}
+      disk_interface: {sata|sas|ssd|nvme|scsi|iscsi}
       # define rotation speed of disk
       disk_rotation: {5400|7200|10000|15000}
     # second disk
@@ -84,14 +84,14 @@ jumphost:
   # physical interface list
   interfaces:
     # first interface
-    - nic: {nic#number}
+    - name: {nic#number}
       # ip address of nic
       address: 192.168.100.1
       mac_address: "10:23:45:67:89:AC"
       # vlan tag, may have multiple tags
       vlan: {native|1-4095}
     # second interface
-    - nic: 'nic2'
+    - name: 'nic2'
       address: 10.20.0.1/24
       mac_address: "10:23:45:67:89:5B"
 nodes:
diff --git a/config/pdf/pod1.schema.yaml b/config/pdf/pod1.schema.yaml
new file mode 100644 (file)
index 0000000..a602b56
--- /dev/null
@@ -0,0 +1,182 @@
+##############################################################################
+# 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
+##############################################################################
+---
+$schema: 'http://json-schema.org/schema#'
+$id: 'https://github.com/opnfv/pharos/blob/master/config/pdf/pod1.yaml'
+
+definitions:
+  ip_address:
+    type: 'string'  # NOTE: we don't validate this is a valid addr (yet)
+  mac_address:
+    type: 'string'
+    pattern: '^([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})$'
+  # Common node schema for jumpserver, cluster nodes
+  node:
+    type: 'object'
+    properties:
+      type:
+        type: 'string'
+        enum: ['baremetal', 'virtual']
+      vendor:
+        type: 'string'
+      model:
+        type: 'string'
+      arch:
+        type: 'string'
+        enum: ['aarch64', 'x86_64']
+      cpus:
+        type: 'number'
+      cpu_cflags:
+        type: 'string'
+      cores:
+        type: 'number'
+      memory:
+        type: 'string'
+        pattern: '^[0-9]+[GT]B?$'
+    required: ['type', 'vendor', 'model', 'arch', 'cpus', 'cpu_cflags', 'cores', 'memory']
+    additionalProperties: false
+  disks:
+    type: 'array'
+    items:
+      type: 'object'
+      properties:
+        name:
+          type: 'string'
+          pattern: '^disk[0-9]+$'
+        disk_capacity:
+          type: 'string'
+          pattern: '^[0-9]+[MGT]B?$'
+        disk_type:
+          type: 'string'
+          enum: ['hdd', 'ssd', 'cdrom', 'tape']
+        disk_interface:
+          type: 'string'
+          enum: ['sata', 'sas', 'ssd', 'nvme', 'scsi', 'iscsi']
+        disk_rotation:
+          type: 'number'
+          enum: [0, 5400, 7200, 10000, 15000]
+      required: ['name', 'disk_capacity', 'disk_type', 'disk_interface', 'disk_rotation']
+      additionalProperties: false
+  remote_management:
+    type: 'object'
+    properties:
+      type:
+        type: 'string'
+        enum: ['ipmi', 'amt']
+      versions:
+        type: 'array'
+        items:
+          type: 'number'
+          enum: [1.0, 2.0]
+      user:
+        type: 'string'
+      pass:
+        type: 'string'
+      address:
+        $ref: '#/definitions/ip_address'
+      mac_address:
+        $ref: '#/definitions/mac_address'
+    required: ['type', 'versions', 'user', 'pass', 'address', 'mac_address']
+    additionalProperties: false
+  interfaces:
+    type: 'array'
+    items:
+      type: 'object'
+      properties:
+        name:
+          type: 'string'
+          pattern: '^nic[0-9]+$'
+        mac_address:
+          $ref: '#/definitions/mac_address'
+        # Optional
+        address:
+          $ref: '#/definitions/ip_address'
+        # Optional
+        vlan:
+          oneOf:
+            - type: 'string'
+              pattern: '^(native|[1-9][0-9]{0,3})(\|(native|[1-9][0-9]{0,3}))*$'
+            - type: 'integer'
+              mininum: 1
+              maximum: 4095
+        # Optional
+        speed:
+          type: 'string'
+          enum: ['1gb', '10gb', '25gb', '40gb']
+          # FIXME: mandatory for nodes?
+        # Optional
+        features:
+          type: ['string', 'null']
+          pattern: '^((dpdk|sriov)\|?)*$'
+          # FIXME: mandatory for nodes?
+      required: ['name', 'mac_address']
+      additionalProperties: false
+
+# Do not allow any properties not defined here. This lets us catch typos.
+additionalProperties: false
+
+properties:
+  details:
+    type: 'object'
+    properties:
+      type:
+        type: 'string'
+        enum: ['production', 'development']
+      pod_owner:
+        type: 'string'
+      contact:
+        type: 'string'
+        pattern: '^([a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+[,; ]*)+$'
+      lab:
+        type: 'string'
+      location:
+        type: 'string'
+      link:
+        type: 'string'
+    required: ['type', 'pod_owner', 'contact', 'lab', 'location', 'link']
+    additionalProperties: false
+  jumphost:
+    type: 'object'
+    properties:
+      name:
+        type: 'string'
+      node:
+        $ref: '#/definitions/node'
+      disks:
+        $ref: '#/definitions/disks'
+      os:
+        type: 'string'
+      remote_params:  # Optional YAML anchor, contents will be validated below
+        type: 'object'
+      remote_management:
+        $ref: '#/definitions/remote_management'
+      interfaces:
+        $ref: '#/definitions/interfaces'
+    required: ['name', 'node', 'disks', 'os', 'remote_management', 'interfaces']
+    additionalProperties: false
+  nodes:
+    type: 'array'
+    items:
+      type: 'object'
+      properties:
+        name:
+          type: 'string'
+        node:
+          $ref: '#/definitions/node'
+        disks:
+          $ref: '#/definitions/disks'
+        os:
+          type: 'string'
+        remote_params:  # Optional YAML anchor, contents will be validated after inject
+          type: 'object'
+        remote_management:
+          $ref: '#/definitions/remote_management'
+        interfaces:
+          $ref: '#/definitions/interfaces'
+      required: ['name', 'node', 'disks', 'remote_management', 'interfaces']
+      additionalProperties: false
index f4ae29b..c2d0734 100644 (file)
@@ -39,9 +39,9 @@ jumphost:
       # several disk types possible
       disk_type: {hdd|ssd|cdrom|tape}
       # several interface types possible
-      disk_interface: {sata|sas|ssd|nvme}
+      disk_interface: {sata|sas|ssd|nvme|scsi|iscsi}
       # define rotation speed of disk
-      disk_rotation: {5400|7200|10000|15000}
+      disk_rotation: {0|5400|7200|10000|15000}
     # second disk
     - name: 'disk2'
       disk_capacity: 2048G
@@ -65,14 +65,14 @@ jumphost:
   # physical interface list
   interfaces:
     # first interface
-    - nic: {nic#number}
+    - name: {nic#number}
       # ip address of nic
       address: 192.168.100.1
       mac_address: "10:23:45:67:89:AC"
       # vlan tag, may have multiple tags
       vlan: {native|1-4095}
     # second interface
-    - nic: 'nic2'
+    - name: 'nic2'
       address: 10.20.0.1/24
       mac_address: "10:23:45:67:89:5B"
 nodes:
index c84d36e..4403639 100755 (executable)
@@ -20,47 +20,47 @@ RC=0
 echo "Using $(yamllint --version)"
 
 # Build a table header, using ';' as column sep
-SUMMARY='PDF Verify Matrix;YAML Lint;'
-for adapter in ${INSTALLER_ADAPTERS}; do
+for adapter in 'PDF Verify Matrix' ${INSTALLER_ADAPTERS}; do
     SUMMARY+="$(basename "${adapter}");"
 done
 
 # Iterate all PDFs, check with each installer adapter, log results
 while IFS= read -r lab_config; do
-    valid_yaml='OK'
-    echo -e "\n###################### ${lab_config} ######################\n"
-    echo -e "\n\nyamllint -s ${lab_config}"
-    if ! yamllint -s "${lab_config}"; then valid_yaml='FAIL'; fi
-    SUMMARY+="\n${lab_config#labs/};${valid_yaml};"
+    SUMMARY+="\n${lab_config#labs/};"
+    echo "###################### ${lab_config} ######################"
     for adapter in ${INSTALLER_ADAPTERS}; do
         pdf_inst=0
         pdf_inst_pass=0
         pdf_yaml_pass=0
         while IFS= read -r jinja_template; do
-            echo -e "\n${GEN_CFG} -y ${lab_config} -j ${jinja_template}"
-            if "${GEN_CFG}" -y "${lab_config}" \
-                            -j "${jinja_template}" > "${TMPF}"; then
-                echo 'Result: PASS'
+            pdf_gen_cmd="${GEN_CFG} -y ${lab_config} -j ${jinja_template}"
+            if ${pdf_gen_cmd} > "${TMPF}"; then
                 ((pdf_inst_pass+=1))
-                echo -e "\nyamllint -s ${jinja_template%.j2}"
+                echo "[GENERATE] [OK] ${pdf_gen_cmd}"
                 if yamllint -s <(sed 's|ENC\[PKCS.*\]|opnfv|g' "${TMPF}"); then
                     ((pdf_yaml_pass+=1));
+                    echo "[YAMLLINT] [OK] yamllint -s ${jinja_template%.j2}"
+                else
+                    echo "[YAMLLINT] [ERROR] yamllint -s ${jinja_template%.j2}"
                 fi
             else
-                echo 'Result: FAIL'
+                echo "[GENERATE] [ERROR] ${pdf_gen_cmd}"
                 RC=1
             fi
             ((pdf_inst+=1))
+            echo ''
         done < <(find "${adapter}" -name '*.j2')
         SUMMARY+="${pdf_yaml_pass}/${pdf_inst_pass}/${pdf_inst};"
     done
 done < <(find 'labs' -name 'pod*.yaml')
-
 rm -f "${TMPF}"
-echo -e '\n\nNOTE: tuple fmt: (valid YAML output/sucessful parse/templates).\n'
-echo -e "${SUMMARY}" | sed -e 's/^/;/g' -e 's/;/;| /g' | column -t -s ';'
 
 cat <<EOF
+###################### Result Matrix ######################
+
+NOTE: tuple fmt: (valid YAML output/sucessful parse/templates).
+
+$(echo -e "${SUMMARY}" | sed -e 's/^/;/g' -e 's/;/;| /g' | column -t -s ';')
 
 To troubleshoot PDF parsing against a specific installer adapter,
 execute the following commands locally (e.g. for zte-pod2/joid):
diff --git a/config/utils/check-schema.sh b/config/utils/check-schema.sh
new file mode 100755 (executable)
index 0000000..321c5ce
--- /dev/null
@@ -0,0 +1,37 @@
+#!/bin/bash -e
+##############################################################################
+# 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
+##############################################################################
+
+export PATH=$PATH:/usr/local/bin/
+
+VALIDATE_SCHEMA='./config/utils/validate_schema.py'
+PDF_SCHEMA='./config/pdf/pod1.schema.yaml'
+RC=0
+
+while IFS= read -r lab_config; do
+    pdf_cmd="${VALIDATE_SCHEMA} -s ${PDF_SCHEMA} -y ${lab_config}"
+    echo "###################### ${lab_config} ######################"
+    pdf_out=$(${pdf_cmd} |& sed 's|ENC\[PKCS.*\]|opnfv|g')
+    if [ -z "${pdf_out}" ]; then
+        SUMMARY+=";${lab_config#labs/};OK;\n"
+        echo "[PDF] [OK] ${pdf_cmd}"
+    else
+        SUMMARY+=";${lab_config#labs/};ERROR;\n"
+        RC=1
+        echo "${pdf_out}"
+        echo "[PDF] [ERROR] ${pdf_cmd}"
+    fi
+    echo ''
+done < <(find 'labs' -name 'pod*.yaml')
+
+cat <<EOF
+###################### Schema Validation Matrix ######################
+
+$(echo -e "${SUMMARY}" | sed -e 's/;/;| /g' | column -t -s ';')
+EOF
+exit "${RC}"
diff --git a/config/utils/validate_schema.py b/config/utils/validate_schema.py
new file mode 100755 (executable)
index 0000000..cb40455
--- /dev/null
@@ -0,0 +1,27 @@
+#!/usr/bin/python
+##############################################################################
+# 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
+##############################################################################
+"""This module validates a PDF file against the schema."""
+import argparse
+import jsonschema
+import yaml
+
+PARSER = argparse.ArgumentParser()
+PARSER.add_argument("--yaml", "-y", type=str, required=True)
+PARSER.add_argument("--schema", "-s", type=str, required=True)
+ARGS = PARSER.parse_args()
+
+with open(ARGS.yaml) as _:
+    _DICT = yaml.safe_load(_)
+
+with open(ARGS.schema) as _:
+    _SCHEMA = yaml.safe_load(_)
+
+_VALIDATOR = jsonschema.Draft4Validator(_SCHEMA)
+for error in _VALIDATOR.iter_errors(_DICT):
+    raise RuntimeError(str(error))
index d8a6baf..c803522 100644 (file)
@@ -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
 
 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:
index 2db3865..9246c4f 100644 (file)
@@ -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
 
 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/idf-pod7.yaml b/labs/arm/idf-pod7.yaml
new file mode 100644 (file)
index 0000000..6b41363
--- /dev/null
@@ -0,0 +1,79 @@
+##############################################################################
+# Copyright (c) 2017 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
+##############################################################################
+---
+### ARM POD 7 installer descriptor file ###
+
+idf:
+  version: 0.1
+  net_config:
+    oob:
+      ip-range: 10.0.16.2-10.0.16.6
+      vlan: native
+    admin:
+      interface: 0
+      vlan: native
+      network: 192.168.11.0
+      mask: 24
+    mgmt:
+      interface: 1
+      vlan: 2343
+      network: 172.16.10.0
+      mask: 24
+    storage:
+      interface: 1
+      vlan: 2344
+      network: 10.2.0.0
+      mask: 24
+    private:
+      interface: 1
+      vlan: 2345
+      network: 10.1.0.0
+      mask: 24
+    public:
+      interface: 1
+      vlan: native
+      network: 10.0.16.0
+      mask: 24
+      gateway: 10.0.16.254
+      dns:
+        - 8.8.8.8
+        - 8.8.4.4
+  fuel:
+    jumphost:
+      bridges:
+        admin: 'admin15_br0'
+        mgmt: 'mgmt15_br0'
+        private: ~
+        public: 'public15_br0'
+    network:
+      node:
+        # Ordered-list, index should be in sync with node index in PDF
+        - interfaces: &interfaces_a
+            # Ordered-list, index should be in sync with interface index in PDF
+            - 'enP5s3'
+            - 'enP2p1s0f2'
+            - 'enP2p1s0f1'
+            - 'enP2p1s0f3'
+          busaddr: &busaddr_a
+            # Bus-info reported by `ethtool -i ethX`
+            - '0005:90:00.0'
+            - '0002:01:00.2'
+            - '0002:01:00.1'
+            - '0002:01:00.3'
+        - interfaces: *interfaces_a
+          busaddr: *busaddr_a
+        - interfaces: *interfaces_a
+          busaddr: *busaddr_a
+        - interfaces: &interfaces_b
+            - 'eth0'
+            - 'eth1'
+          busaddr: &busaddr_b
+            - 'e0700000.xgmac'
+            - 'e0900000.xgmac'
+        - interfaces: *interfaces_b
+          busaddr: *busaddr_b
index 7ee358f..3708b7f 100644 (file)
@@ -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,24 +47,25 @@ jumphost:
   interfaces:
     # Connected, used only for admin/PXE
     - mac_address: "68:05:ca:34:60:e3"
+      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: ''
-  fixed_ips:
-    admin: 192.168.11.1
-    mgmt: 172.16.10.1
-    public: 10.0.8.9
+      name: 'nic4'
 ##############################################################################
 nodes:
   - name: softiron-3
@@ -109,6 +83,7 @@ nodes:
         disk_capacity: 128G
         disk_type: ssd
         disk_interface: sata
+        disk_rotation: 0
       - name: 'disk2'
         disk_capacity: 2048G
         disk_type: hdd
@@ -123,18 +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: ''
-    fixed_ips:
-      admin: 192.168.11.2
-      mgmt: 172.16.10.141
-      public: 10.0.8.141
+        name: 'nic2'
   ############################################################################
   - name: softiron-4
     node: *nodeparams
-    disk: *disks
+    disks: *disks
     remote_management:
       <<: *remote_params
       address: 10.0.8.4
@@ -143,17 +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: ''
-    fixed_ips:
-      admin: 192.168.11.3
-      mgmt: 172.16.10.142
-      public: 10.0.8.142
+        name: 'nic2'
   ############################################################################
   - name: softiron-5
     node: *nodeparams
-    disk: *disks
+    disks: *disks
     remote_management:
       <<: *remote_params
       address: 10.0.8.5
@@ -162,17 +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: ''
-    fixed_ips:
-      admin: 192.168.11.4
-      mgmt: 172.16.10.143
-      public: 10.0.8.143
+        name: 'nic2'
   ############################################################################
   - name: softiron-6
     node: *nodeparams
-    disk: *disks
+    disks: *disks
     remote_management:
       <<: *remote_params
       address: 10.0.8.6
@@ -181,17 +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: ''
-    fixed_ips:
-      admin: 192.168.11.5
-      mgmt: 172.16.10.101
-      public: 10.0.8.101
+        name: 'nic2'
   ############################################################################
   - name: softiron-7
     node: *nodeparams
-    disk: *disks
+    disks: *disks
     remote_management:
       <<: *remote_params
       address: 10.0.8.7
@@ -200,10 +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: ''
-    fixed_ips:
-      admin: 192.168.11.6
-      mgmt: 172.16.10.102
-      public: 10.0.8.102
+        name: 'nic2'
index f4f92dd..dc53888 100644 (file)
@@ -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:
@@ -60,6 +33,7 @@ jumphost:
       disk_capacity: 120G
       disk_type: ssd
       disk_interface: sata
+      disk_rotation: 0
     ## /dev/sdb
     - name: disk2
       disk_capacity: 1T
@@ -86,24 +60,25 @@ jumphost:
   interfaces:
     ## eth0, Not connected for now
     - mac_address: "00:01:73:02:36:d4"
+      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: ''
-  fixed_ips:
-    admin: 192.168.11.1
-    mgmt: 172.16.10.1
-    public: 10.0.15.9
+      name: 'nic4'
 ##############################################################################
 nodes:
   - name: cn8890-24
@@ -121,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
@@ -130,34 +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'
-    fixed_ips:
-      admin: 192.168.11.2
-      mgmt: 172.16.10.142
-      public: 10.0.15.142
+        name: 'nic6'
   ############################################################################
   - name: cn8890-25
     node: *nodeparams
-    disk: *disks
+    disks: *disks
     remote_management:
       <<: *remote_params
       address: 10.0.1.55
@@ -166,29 +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'
-    fixed_ips:
-      admin: 192.168.11.3
-      mgmt: 172.16.10.143
-      public: 10.0.15.143
+        name: 'nic6'
   ############################################################################
   - name: cn8890-26
     node: *nodeparams
-    disk: *disks
+    disks: *disks
     remote_management:
       <<: *remote_params
       address: 10.0.1.56
@@ -197,29 +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'
-    fixed_ips:
-      admin: 192.168.11.4
-      mgmt: 172.16.10.144
-      public: 10.0.15.144
+        name: 'nic6'
   ############################################################################
   - name: cn8890-27
     node: *nodeparams
-    disk: *disks
+    disks: *disks
     remote_management:
       <<: *remote_params
       address: 10.0.1.57
@@ -228,29 +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'
-    fixed_ips:
-      admin: 192.168.11.5
-      mgmt: 172.16.10.145
-      public: 10.0.15.145
+        name: 'nic6'
   ############################################################################
   - name: cn8890-28
     node: *nodeparams
-    disk: *disks
+    disks: *disks
     remote_management:
       <<: *remote_params
       address: 10.0.1.58
@@ -259,22 +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'
-    fixed_ips:
-      admin: 192.168.11.6
-      mgmt: 172.16.10.146
-      public: 10.0.15.146
+        name: 'nic6'
diff --git a/labs/arm/pod7.yaml b/labs/arm/pod7.yaml
new file mode 100644 (file)
index 0000000..bb62479
--- /dev/null
@@ -0,0 +1,241 @@
+##############################################################################
+# 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 7 descriptor file ###
+
+version: 1.0
+details:
+  pod_owner: ENEA AB
+  contact: dan.lilliehorn@enea.com
+  lab: ENEA lab
+  location: Stockholm, Sweden
+  type: production
+  link: https://wiki.opnfv.org/display/pharos/Enea+Hosting
+##############################################################################
+jumphost:
+  name: jenkins-slave-arm-pod7
+  node:
+    type: baremetal
+    vendor: AppliedMicro
+    model: XGene 1
+    arch: aarch64
+    cpus: 1
+    cpu_cflags: fp asimd evtstrm cpuid
+    cores: 8
+    memory: 32G
+  disks:
+    # /dev/sda
+    - name: disk1
+      disk_capacity: 120G
+      disk_type: ssd
+      disk_interface: sata
+      disk_rotation: 0
+    # /dev/sdb
+    - name: disk2
+      disk_capacity: 1T
+      disk_type: hdd
+      disk_interface: sata
+      disk_rotation: 7200
+    # /dev/sdc
+    - name: disk3
+      disk_capacity: 1T
+      disk_type: hdd
+      disk_interface: sata
+      disk_rotation: 7200
+  os: ubuntu-16.04
+  remote_params: &remote_params
+    type: ipmi
+    versions:
+      - 2.0
+    user: admin
+    pass: admin
+  remote_management:
+    <<: *remote_params
+    address: 0.0.0.0
+    mac_address: "00:00:00:00:00:00"
+  interfaces:
+    # eth0, Not connected
+    - mac_address: "00:01:73:02:3b:28"
+      address: 192.168.11.1
+      speed: 1gb
+      features: ''
+      name: 'nic1'
+    # eth1, Connected for PXE
+    - mac_address: "00:01:73:02:3b:29"
+      speed: 1gb
+      features: ''
+      name: 'nic2'
+    # eth2, Not connected
+    - mac_address: "00:01:73:02:3b:2a"
+      speed: 1gb
+      features: ''
+      name: 'nic3'
+    # eth3, Connected for truck traffic
+    - mac_address: "00:01:73:02:3b:2b"
+      speed: 10gb
+      features: ''
+      name: 'nic4'
+##############################################################################
+nodes:
+  - name: cn8890-6
+    node: &nodeparams_a
+      type: baremetal
+      vendor: Cavium
+      model: ThunderX
+      arch: aarch64
+      cpus: 1
+      cpu_cflags: fp asimd evtstrm aes pmull sha1 sha2 crc32
+      cores: 48
+      memory: 128G
+    disks: &disks_a
+      - name: 'disk1'
+        disk_capacity: 500G
+        disk_type: hdd
+        disk_interface: sata
+        disk_rotation: 7200
+    remote_management:
+      <<: *remote_params
+      address: 10.0.16.2
+      mac_address: "40:8D:5C:BA:D2:32"
+    interfaces:
+      # enP5s3, Connected, used only for admin/PXE
+      - mac_address: "68:05:ca:3d:93:14"
+        speed: 1gb
+        features: ''
+        name: 'nic1'
+      # enP2p1s0f2, Connected, trunk for all other VLANs
+      - mac_address: "00:0f:b7:03:00:c1"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic2'
+      # enP2p1s0f1, Not connected
+      - mac_address: "00:0f:b7:03:00:c0"
+        speed: 1gb
+        features: ''
+        name: 'nic3'
+      # enP2p1s0f3, Not connected
+      - mac_address: "00:0f:b7:03:00:c2"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic4'
+  ############################################################################
+  - name: cn8890-8
+    node: *nodeparams_a
+    disks: *disks_a
+    remote_management:
+      <<: *remote_params
+      address: 10.0.16.3
+      mac_address: "40:8D:5C:BA:B9:60"
+    interfaces:
+      # enP5s3, Connected, used only for admin/PXE
+      - mac_address: "68:05:ca:3f:7f:f3"
+        speed: 1gb
+        features: ''
+        name: 'nic1'
+      # enP2p1s0f2, Connected, trunk for all other VLANs
+      - mac_address: "00:0f:b7:05:00:c1"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic2'
+      # enP2p1s0f1, Not connected
+      - mac_address: "00:0f:b7:05:00:c0"
+        speed: 1gb
+        features: ''
+        name: 'nic3'
+      # enP2p1s0f3, Not connected
+      - mac_address: "00:0f:b7:05:00:c2"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic4'
+  ############################################################################
+  - name: cn8890-10
+    node: *nodeparams_a
+    disks: *disks_a
+    remote_management:
+      <<: *remote_params
+      address: 10.0.16.4
+      mac_address: "40:8D:5C:BA:B9:65"
+    interfaces:
+      # enP5s3, Connected, used only for admin/PXE
+      - mac_address: "68:05:ca:3d:93:0f"
+        speed: 1gb
+        features: ''
+        name: 'nic1'
+      # enP2p1s0f2, Connected, trunk for all other VLANs
+      - mac_address: "00:0f:b7:07:00:c1"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic2'
+      # enP2p1s0f1, Not connected
+      - mac_address: "00:0f:b7:07:00:c0"
+        speed: 1gb
+        features: ''
+        name: 'nic3'
+      # enP2p1s0f3, Not connected
+      - mac_address: "00:0f:b7:07:00:c2"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic4'
+  ############################################################################
+  - name: softiron-1
+    node: &nodeparams_b
+      type: baremetal
+      vendor: American Megatrends Inc
+      model: Overdrive/Supercharger
+      arch: aarch64
+      cpus: 1
+      cpu_cflags: fp asimd evtstrm aes pmull sha1 sha2 crc32
+      cores: 8
+      memory: 32G
+    disks: &disks_b
+      # dev/sda
+      - name: 'disk1'
+        disk_capacity: 128G
+        disk_type: ssd
+        disk_interface: sata
+        disk_rotation: 0
+      # /dev/sdb
+      - name: 'disk2'
+        disk_capacity: 2T
+        disk_type: hdd
+        disk_interface: sata
+        disk_rotation: 7200
+    remote_management:
+      <<: *remote_params
+      address: 10.0.16.5
+      mac_address: "E0:FF:F7:00:04:21"
+    interfaces:
+      # eth0, Connected, used only for admin/PXE
+      - mac_address: "e0:ff:f7:00:05:96"
+        speed: 1gb
+        features: ''
+        name: 'nic1'
+      # eth1, Connected, trunk for all other VLANs
+      - mac_address: "e0:ff:f7:00:05:97"
+        speed: 1gb
+        features: ''
+        name: 'nic2'
+  ############################################################################
+  - name: softiron-2
+    node: *nodeparams_b
+    disks: *disks_b
+    remote_management:
+      <<: *remote_params
+      address: 10.0.16.6
+      mac_address: "E0:FF:F7:00:04:29"
+    interfaces:
+      # eth0, Connected, used only for admin/PXE
+      - mac_address: "e0:ff:f7:00:05:93"
+        speed: 1gb
+        features: ''
+        name: 'nic1'
+      # eth1, Connected, trunk for all other VLANs
+      - mac_address: "e0:ff:f7:00:05:94"
+        speed: 1gb
+        features: ''
+        name: 'nic2'
diff --git a/labs/bii/idf-pod1.yaml b/labs/bii/idf-pod1.yaml
new file mode 100644 (file)
index 0000000..8c358a9
--- /dev/null
@@ -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
index 159401b..117721b 100644 (file)
@@ -1,42 +1,13 @@
 ### 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
   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,12 @@ 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
+      name: 'nic1'
+    - mac_address: "44:a8:42:15:10:04"
+      address: 192.168.20.5
+      name: 'nic2'
 ###################################################
 nodes:
   - name: compute1
@@ -134,9 +106,9 @@ 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: 'nic1'
   ########################################
   - name: compute2
     node: *nodeparas
@@ -146,9 +118,9 @@ 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: 'nic1'
   ########################################
   - name: controller1
     node: *nodeparas
@@ -158,11 +130,12 @@ 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
+        name: 'nic1'
+      - mac_address: "44:a8:42:14:cd:0e"
+        address: 192.168.20.12
+        name: 'nic2'
   ########################################
   - name: controller2
     node: *nodeparas
@@ -172,11 +145,12 @@ 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
+        name: 'nic1'
+      - mac_address: "44:a8:42:15:1b:e7"
+        address: 192.168.20.13
+        name: 'nic2'
   ########################################
   - name: controller3
     node: *nodeparas
@@ -186,8 +160,9 @@ 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
+        name: 'nic1'
+      - mac_address: "44:a8:42:14:fc:1b"
+        address: 192.168.20.14
+        name: 'nic2'
index 9b4a98d..d904254 100644 (file)
@@ -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
 
 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:
index 76ca002..ae04b30 100644 (file)
@@ -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
@@ -84,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
 ##############################################################################
@@ -133,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
   ############################################################################
@@ -174,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
   ############################################################################
@@ -215,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
   ############################################################################
@@ -256,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
   ############################################################################
@@ -297,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
index c6477fa..8814c42 100644 (file)
@@ -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/huawei/idf-pod1.yaml b/labs/huawei/idf-pod1.yaml
new file mode 100644 (file)
index 0000000..44fb4a0
--- /dev/null
@@ -0,0 +1,44 @@
+##############################################################################
+# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD 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
+##############################################################################
+---
+### huawei-pod1 installer descriptor file ###
+
+idf:
+  version: 0.1
+  # netconfig
+  net_config:
+    mgmt:
+      interface: 1
+      vlan: native
+      network: 10.1.0.0
+      mask: 24
+    storage:
+      interface: 2
+      vlan: 102
+      network: 172.16.2.0
+      mask: 24
+    tenant:
+      interface: 2
+      vlan: 101
+      network: 172.16.1.0
+      mask: 24
+    external:
+      interface: 2
+      vlan: native
+      network: 192.168.10.0
+      mask: 24
+      gateway: 192.168.10.1
+      dns:
+        - 8.8.8.8
+        - 8.8.4.4
+
+  compass:
+    jumphost:
+    network:
+      node:
diff --git a/labs/huawei/pod1.yaml b/labs/huawei/pod1.yaml
new file mode 100644 (file)
index 0000000..f48d823
--- /dev/null
@@ -0,0 +1,192 @@
+##############################################################################
+# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD 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
+##############################################################################
+---
+### POD descriptor file ###
+
+details:
+  pod_owner: Tianwei Wu
+  contact: wutianwei1@hauwei.com
+  lab: Huawei Lab
+  location: Shanghai, China
+  type: production
+  link: https://wiki.opnfv.org/display/pharos/Huawei+Hosting
+
+# jumphost
+jumphost:
+  name: huawei-pod1-jump
+  node: &nodeparams
+    type: baremetal
+    vendor: huawei
+    model: Intel(R) Xeon(R)
+    arch: x86_64
+    cpus: 2
+    cpu_cflags: haswell
+    cores: 16
+    memory: 188G
+  disks: &disks
+    - name: 'disk1'
+      disk_capacity: 1.8T
+      disk_type: hdd
+      disk_interface: scsi
+      disk_rotation: 7200
+  os: ubuntu-14.04
+  remote_params: &remoteparas
+    type: ipmi
+    versions:
+      - 2.0
+    user: >
+        ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw
+        DQYJKoZIhvcNAQEBBQAEggEAOv/AsqePJWJjzf30Lwzo2FezlXwM43uvGqSV
+        yt79ut92tDsPsfb3SkV9biTT1/VELCB/1AqZnxpwNwERv0D7YLy5fmkYLsWo
+        SgOYlgQ5CmTPIBw7A67Vz6bCXjlplnHbhqR+3dYreH4ijHQgBWTvhTi8w584
+        9Z8e0+fSJfruV+UBTF9n0dEWK9nqRQqWlDWasztxwyNpTPp4gVQs0gs2SkeP
+        XtHFfwIBJtopNuWsIhLtu/Hs5ljttL354RYF1PIVrsi1Xobl7O/I/ykq8PGg
+        qkFveh4c9nRe/LQ+u8ggWKDSHJodvAcJm+YQTW1CcATA04cuc6bKq6Xaf1Fn
+        kHKB5zA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCKEo4HTTLDwyIixgCk
+        cHijgBA5aj2kBfsBvi99bXiDmet8]
+    pass: >
+        ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw
+        DQYJKoZIhvcNAQEBBQAEggEAhb8LIGPlO3PUXwUS4zpOOmg3Wu35ZcdKUaMh
+        dFaW30bPBsle6V7N+2p8kLtpkvTQHyo3X1vOwhrEKwBvRHJ+XmgQCvYLqLXN
+        qZgNXWwAa2iJz6PjNs/rmvmoLx1pC3smRJeLGCpVSG6cLKXI02clDmnWxjKB
+        3Sdhf/JKTLQgbsoTZYRSBGLM9/UC/Ox/n0kl8afuRfC88CytttnpyNWRBWZ6
+        VV41hxCqshHhBvXnskMS/NEWfYWS972FOZ7FFYid7ZV3h6SbO4JOR7+haMbM
+        ublE8m1abmm1T5SYE245avYj94miYTaPIjq0mkI66xo+6haAlTPqq3/QeUGf
+        e0X2YjA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCpodDnNWoVIL6jIRiP
+        6O85gBByiatZ0M0qtpNScQXGCRC5]
+  remote_management:
+    <<: *remoteparas
+    address: 172.16.130.28/24
+    mac_address: "E0:24:7F:02:15:A5"
+  interfaces:
+    - name: 'nic1'
+      speed: 1gb
+      address: 192.168.10.6/24
+      mac_address: "e0:24:7f:02:15:a3"
+      vlan: native
+    - name: 'nic2'
+      speed: 1gb
+      address: 10.1.0.1/24
+      mac_address: "e0:24:7f:02:15:a4"
+      vlan: native
+    - name: 'nic3'
+      speed: 1gb
+      mac_address: "90:e2:ba:06:47:04"
+      vlan: native
+    - name: 'nic4'
+      speed: 1gb
+      address: 172.16.130.50/24
+      mac_address: "90:e2:ba:06:47:05"
+      vlan: native
+# host1
+nodes:
+  - name: host1
+    node: *nodeparams
+    disks: *disks
+    remote_management:
+      <<: *remoteparas
+      address: 172.16.130.26/24
+      mac_address: "F8:4A:BF:55:A2:91"
+    interfaces:
+      - name: 'nic1'
+        speed: 1gb
+        mac_address: "f8:4a:bf:55:a2:8d"
+      - name: 'nic2'
+        speed: 1gb
+        mac_address: "f8:4a:bf:55:a2:8e"
+      - name: 'nic3'
+        speed: 1gb
+        mac_address: "f8:4a:bf:55:a2:8f"
+      - name: 'nic4'
+        speed: 1gb
+        mac_address: "f8:4a:bf:55:a2:90"
+  # host2
+  - name: host2
+    node: *nodeparams
+    disks: *disks
+    remote_management:
+      <<: *remoteparas
+      address: 172.16.130.27/24
+      mac_address: "D8:49:0B:DA:5A:BB"
+    interfaces:
+      - name: 'nic1'
+        speed: 1gb
+        mac_address: "d8:49:0b:da:5a:b7"
+      - name: 'nic2'
+        speed: 1gb
+        mac_address: "d8:49:0b:da:5a:b8"
+      - name: 'nic3'
+        speed: 1gb
+        mac_address: "d8:49:0b:da:5a:b9"
+      - name: 'nic4'
+        speed: 1gb
+        mac_address: "d8:49:0b:da:5a:ba"
+  # host3
+  - name: host3
+    node: *nodeparams
+    disks: *disks
+    remote_management:
+      <<: *remoteparas
+      address: 172.16.130.29/24
+      mac_address: "78:D7:52:A0:B1:9D"
+    interfaces:
+      - name: 'nic1'
+        speed: 1gb
+        mac_address: "78:d7:52:a0:b1:99"
+      - name: 'nic2'
+        speed: 1gb
+        mac_address: "78:d7:52:a0:b1:9a"
+      - name: 'nic3'
+        speed: 1gb
+        mac_address: "78:d7:52:a0:b1:9b"
+      - name: 'nic4'
+        speed: 1gb
+        mac_address: "78:d7:52:a0:b1:9c"
+  # host4
+  - name: host4
+    node: *nodeparams
+    disks: *disks
+    remote_management:
+      <<: *remoteparas
+      address: 172.16.130.30/24
+      mac_address: "D8:49:0B:DA:5B:61"
+    interfaces:
+      - name: 'nic1'
+        speed: 1gb
+        mac_address: "d8:49:0b:da:5b:5d"
+      - name: 'nic2'
+        speed: 1gb
+        mac_address: "d8:49:0b:da:5b:5e"
+      - name: 'nic3'
+        speed: 1gb
+        mac_address: "d8:49:0b:da:5b:5f"
+      - name: 'nic4'
+        speed: 1gb
+        mac_address: "d8:49:0b:da:5b:60"
+  # host5
+  - name: host5
+    node: *nodeparams
+    disks: *disks
+    remote_management:
+      <<: *remoteparas
+      address: 172.16.130.31/24
+      mac_address: "D8:49:0B:DA:56:89"
+    interfaces:
+      - name: 'nic1'
+        speed: 1gb
+        mac_address: "d8:49:0b:da:56:85"
+      - name: 'nic2'
+        speed: 1gb
+        mac_address: "d8:49:0b:da:56:86"
+      - name: 'nic3'
+        speed: 1gb
+        mac_address: "d8:49:0b:da:56:87"
+      - name: 'nic4'
+        speed: 1gb
+        mac_address: "d8:49:0b:da:56:88"
index cc95697..b1123b7 100644 (file)
@@ -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
index c3ad171..a2c0096 100644 (file)
@@ -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
index b7d05cf..59064f3 100644 (file)
@@ -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
index 6f68473..ab60bdb 100644 (file)
@@ -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 ###
 
@@ -25,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
@@ -41,19 +48,20 @@ jumphost:
     - mac_address: "00:25:b5:a0:00:1a"
       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'
-  fixed_ips:
-    admin: 192.168.11.1
-    mgmt: 10.167.4.1
-    public: 172.30.10.72
+      name: 'nic4'
 ##############################################################################
 nodes:
   - name: pod2-node1
@@ -75,19 +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'
-    fixed_ips:
-      admin: 192.168.11.2
-      mgmt: 10.167.4.2
-      public: 172.30.10.2
+        name: 'nic4'
   ############################################################################
   - name: pod2-node2
     node: *nodeparams
@@ -100,19 +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'
-    fixed_ips:
-      admin: 192.168.11.3
-      mgmt: 10.167.4.3
-      public: 172.30.10.3
+        name: 'nic4'
   ############################################################################
   - name: pod2-node3
     node: *nodeparams
@@ -125,19 +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'
-    fixed_ips:
-      admin: 192.168.11.4
-      mgmt: 10.167.4.4
-      public: 172.30.10.4
+        name: 'nic4'
   ############################################################################
   - name: pod2-node4
     node: *nodeparams
@@ -150,19 +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'
-    fixed_ips:
-      admin: 192.168.11.5
-      mgmt: 10.167.4.5
-      public: 172.30.10.5
+        name: 'nic4'
   ############################################################################
   - name: pod2-node5
     node: *nodeparams
@@ -175,16 +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'
-    fixed_ips:
-      admin: 192.168.11.6
-      mgmt: 10.167.4.6
-      public: 172.30.10.6
+        name: 'nic4'
index ffb1b90..60ab402 100644 (file)
@@ -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 ###
 
@@ -24,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
@@ -40,16 +47,16 @@ jumphost:
     - mac_address: "a4:bf:01:01:ad:71"
       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'
-  fixed_ips:
-    admin: 10.20.0.129
-    mgmt: 192.168.0.130
-    public: 172.30.13.89
+      name: 'nic3'
 nodes:
   - name: pod5-node1
     node: *nodeparas
@@ -62,16 +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'
-    fixed_ips:
-      admin: 10.20.0.130
-      mgmt: 192.168.0.131
-      public: 172.30.13.90
+        name: 'nic3'
   - name: pod5-node2
     node: *nodeparas
     disks: *disks
@@ -83,16 +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'
-    fixed_ips:
-      admin: 10.20.0.131
-      mgmt: 192.168.0.132
-      public: 172.30.13.91
+        name: 'nic3'
   - name: pod5-node3
     node: *nodeparas
     disks: *disks
@@ -104,16 +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'
-    fixed_ips:
-      admin: 10.20.0.132
-      mgmt: 192.168.0.133
-      public: 172.30.13.92
+        name: 'nic3'
   - name: pod5-node4
     node: *nodeparas
     disks: *disks
@@ -125,16 +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'
-    fixed_ips:
-      admin: 10.20.0.133
-      mgmt: 192.168.0.134
-      public: 172.30.13.93
+        name: 'nic3'
   - name: pod5-node5
     node: *nodeparas
     disks: *disks
@@ -146,13 +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'
-    fixed_ips:
-      admin: 10.20.0.134
-      mgmt: 192.168.0.135
-      public: 172.30.13.94
+        name: 'nic3'
index fc09db3..3bb9e03 100644 (file)
@@ -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
 
 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:
index e8d7f78..dbe14b9 100644 (file)
@@ -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
 
 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:
index d1bb156..e5e19f4 100644 (file)
@@ -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
 
 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:
index 950c2d8..1b4d1ad 100644 (file)
@@ -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:
@@ -99,15 +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
-  fixed_ips:
-    admin: 10.20.6.1
-    mgmt: 192.168.61.238
-    public: 172.60.0.238
+      address: 10.20.6.1
+      name: 'nic1'
 nodes:
   - name: pod1-node1
     node: &nodeparas
@@ -138,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
@@ -161,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
@@ -184,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
@@ -207,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
@@ -230,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'
index 5b3915f..f51d7f7 100644 (file)
@@ -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:
@@ -61,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
@@ -100,14 +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
-  fixed_ips:
-    admin: 10.20.7.1
-    public: 172.70.0.239
+      address: 10.20.7.1
+      name: 'nic1'
 nodes:
   - name: pod2-node1
     node: &nodeparas
@@ -138,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
@@ -161,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
@@ -184,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
@@ -207,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
@@ -230,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'
index b44602f..063b7df 100644 (file)
@@ -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:
@@ -99,14 +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
-  fixed_ips:
-    admin: 10.20.0.1
-    public: 172.10.0.240
+      address: 10.20.0.1
+      name: 'nic1'
 nodes:
   - name: pod3-node1
     node: &nodeparas
@@ -137,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
@@ -157,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
@@ -177,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
@@ -197,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
@@ -217,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'
index 7ffd20a..76d4aa9 100644 (file)
@@ -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,14 +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
-  fixed_ips:
-    admin: 10.20.7.1
-    public: 192.168.21.195
+      address: 10.20.7.1
+      name: 'nic1'
 nodes:
   - name: pod9-node1
     node: &nodeparas
@@ -93,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
@@ -117,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
@@ -131,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'