[Ericsson-POD1/2] Updating the dea override

Change-Id: I7476f4901ab0b82bf397f16543b495449f52abf5
Signed-off-by: Nikolas Hermanns <nikolas.hermanns@ericsson.com>

2 files changed, 57 insertions, 63 deletions

diff --git a/labs/ericsson/pod1/fuel/config/dea-pod-override.yaml b/labs/ericsson/pod1/fuel/config/dea-pod-override.yaml
index cadf4a3..f26050c 100644
--- a/labs/ericsson/pod1/fuel/config/dea-pod-override.yaml
+++ b/labs/ericsson/pod1/fuel/config/dea-pod-override.yaml
@@ -1,10 +1,11 @@
 dea-pod-override-config-metadata:
   title: 'Deployment Environment Adapter POD override for Ericsson, POD1'
-  version: '0.1'
+# DEA API version supported
+  version: '0.2'
   created: 'Mon Dec  12 2016'
-  comment: 'DASMs last kick'
+  comment: ''
 environment:
-  name: FUEL-BM-POD1
+  name: ERICSSON-POD1
 interfaces_1:
   eno1:
   - fuelweb_admin
@@ -13,55 +14,35 @@ interfaces_1:
   - management
   - storage
   - private
-transformations_1:
-  transformations:
-  - action: add-br
-    name: br-fw-admin
-  - action: add-br
-    name: br-mgmt
-  - action: add-br
-    name: br-storage
-  - action: add-br
-    name: br-ex
-  - action: add-br
-    name: br-floating
-    provider: ovs
-  - action: add-patch
-    bridges:
-    - br-floating
-    - br-ex
-    mtu: 65000
-    provider: ovs
-  - action: add-br
-    name: br-mesh
-  - action: add-port
-    bridge: br-fw-admin
-    name: eno1
-  - action: add-port
-    bridge: br-mgmt
-    name: ens2f0.81
-  - action: add-port
-    bridge: br-storage
-    name: ens2f0.82
-  - action: add-port
-    bridge: br-ex
-    name: ens2f0.80
-  - action: add-port
-    bridge: br-mesh
-    name: ens2f0.83
+interfaces_vlan:
+  eno1:
+  - fuelweb_admin
+  ens2f0:
+  - private  - public
+  - management
+  - storage
+interfaces_dpdk:
+  eno1:
+  - fuelweb_admin
+  ens2f0:
+  - private
+  - interface_properties:
+      dpdk:
+        enabled: true
+  - public
+  - management
+  - storage
 fuel:
   ADMIN_NETWORK:
     dhcp_pool_end: 10.20.0.254
     dhcp_pool_start: 10.20.0.12
     ipaddress: 10.20.0.2
     netmask: 255.255.255.0
-  DNS_DOMAIN: domain.tld
-  DNS_SEARCH: domain.tld
+    ssh_network: 0.0.0.0/0
+  DNS_DOMAIN: opnfvericsson.se
+  DNS_SEARCH: opnfvericsson.se
   DNS_UPSTREAM: 8.8.8.8
-  FUEL_ACCESS:
-    password: admin
-    user: admin
-  HOSTNAME: fuel
+  HOSTNAME: fuel-ericsson-pod1
   NTP1: 0.se.pool.ntp.org
   NTP2: 1.se.pool.ntp.org
   NTP3: 2.se.pool.ntp.org
@@ -186,33 +167,43 @@ settings:
   editable:
     external_dns:
       dns_list:
-        description: List of upstream DNS servers, separated by comma
+        description: List of upstream DNS servers
         label: DNS list
+        max: 3
         regex:
-          error: Invalid IP address list
-          source: ^\*$|^(?:\d|1?\d\d|2[0-4]\d|25[0-5])(?:\.(?:\d|1?\d\d|2[0-4]\d|25[0-5])){3}(?:\s*,\s*(?:\d|1?\d\d|2[0-4]\d|25[0-5])(?:\.(?:\d|1?\d\d|2[0-4]\d|25[0-5])){3})*$
-        type: text
-        value: 8.8.8.8,8.8.4.4
+          error: Invalid IP address
+          source: ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$
+        type: text_list
+        value:
+        - 8.8.8.8
         weight: 10
       metadata:
+        group: network
         label: Host OS DNS Servers
-        weight: 90
+        weight: 30
     external_ntp:
       metadata:
+        group: network
         label: Host OS NTP Servers
-        weight: 100
+        weight: 40
       ntp_list:
-        description: List of upstream NTP servers, separated by comma
+        description: List of upstream NTP servers
         label: NTP server list
         regex:
-          error: Invalid NTP server list
-          source: ^\s*(?:(?:\w+(?:-+\w+)*\.)+[a-z]+|\d{1,3}(?:\.\d{1,3}){3})\s*(?:,\s*(?:(?:\w+(?:-+\w+)*\.)+[a-z]+|\d{1,3}(\.\d{1,3}){3})\s*)*$
-        type: text
-        value: 0.se.pool.ntp.org,1.se.pool.ntp.org,2.se.pool.ntp.org
+          error: Invalid NTP server
+          source: ^[a-zA-Z\d]+[-\.\da-zA-Z]*$
+        type: text_list
+        value:
+        - 0.se.pool.ntp.org
+        - 1.se.pool.ntp.org
+        - 2.se.pool.ntp.org
         weight: 10
     syslog:
       metadata:
+        enabled: false
+        group: logging
         label: Syslog
+        toggleable: true
         weight: 50
       syslog_port:
         description: Remote syslog port
@@ -226,6 +217,9 @@ settings:
       syslog_server:
         description: Remote syslog hostname
         label: Hostname
+        regex:
+          error: Invalid hostname
+          source: ^[a-zA-Z\d]+[-\.\da-zA-Z]*$
         type: text
         value: ''
         weight: 10
diff --git a/labs/ericsson/pod2/fuel/config/dea-pod-override.yaml b/labs/ericsson/pod2/fuel/config/dea-pod-override.yaml
index 7b13318..e02138a 100644
--- a/labs/ericsson/pod2/fuel/config/dea-pod-override.yaml
+++ b/labs/ericsson/pod2/fuel/config/dea-pod-override.yaml
@@ -1,11 +1,11 @@
 dea-pod-override-config-metadata:
-  title: 'Deployment Environment Adapter POD override for Ericsson-1, POD-2'
+  title: 'Deployment Environment Adapter POD override for ERICSSON-POD2'
 # DEA API version supported
   version: '0.2'
   created: 'Mon Dec 12 2016'
-  comment: 'DASMs last Kick'
+  comment: ''
 environment:
-  name: FUEL-BM1-POD2
+  name: ERICSSON-POD2
 interfaces_1:
   eno49:
   - fuelweb_admin
@@ -40,10 +40,10 @@ fuel:
     ipaddress: 10.20.0.2
     netmask: 255.255.255.0
     ssh_network: 0.0.0.0/0
-  DNS_DOMAIN: opnfvericsson.ca
-  DNS_SEARCH: opnfvericsson.ca
+  DNS_DOMAIN: opnfvericsson.se
+  DNS_SEARCH: opnfvericsson.se
   DNS_UPSTREAM: 8.8.8.8
-  HOSTNAME: fuel-bm1-pod2
+  HOSTNAME: fuel-ericsson-pod2
   NTP1: 0.se.pool.ntp.org
   NTP2: 1.se.pool.ntp.org
   NTP3: 2.se.pool.ntp.org