Stop using network transformation

Due the bug in code we did not apply network transformation to created
environments, but still Fuel base on chosen segmentation type and
networks to NICs assigment has been generated network schema itself.
Since we don't use custom network schema we can remove transformation
defintions from dea pod overrides files. However there is a need to
configure NIC properties in case of dpdk deployment.

JIRA: FUEL-192

Change-Id: Ib7dab4d61910ac8c44b6d91e0c486c9693034823
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>

27 files changed, 148 insertions, 271 deletions

diff --git a/deploy/cloud/configure_nodes.py b/deploy/cloud/configure_nodes.py
index 20ecc1724..ea50307b1 100644
--- a/deploy/cloud/configure_nodes.py
+++ b/deploy/cloud/configure_nodes.py
@@ -45,9 +45,6 @@ class ConfigureNodes(object):
                 exec_cmd('fuel node set --node-id %s --role %s --env %s'
                          % (node_id, roles_blade[0], self.env_id))
 
-        # Download the unmodified default deployment configuration, because we
-        # need it for the network config.
-        self.download_deployment_config()
         for node_id, roles_blade in self.node_id_roles_dict.iteritems():
             # Modify node attributes
             self.download_attributes(node_id)
@@ -56,13 +53,18 @@ class ConfigureNodes(object):
             # Modify interfaces configuration
             self.download_interface_config(node_id)
             self.modify_node_interface(node_id, roles_blade)
-            self.modify_node_network_schemes(node_id, roles_blade)
             self.upload_interface_config(node_id)
 
+        # Currently not used, we use default deployment facts
+        # which are generated by fuel based on type segmentation
+        # and network to nic assignment
+        #
         # Download our modified deployment configuration, which includes our
         # changes to network topology etc.
-        self.download_deployment_config()
-        self.upload_deployment_config()
+        #self.download_deployment_config()
+        #for node_id, roles_blade in self.node_id_roles_dict.iteritems():
+        #    self.modify_node_network_schemes(node_id, roles_blade)
+        #self.upload_deployment_config()
 
     def modify_node_network_schemes(self, node_id, roles_blade):
         log('Modify network transformations for node %s' % node_id)
@@ -71,14 +73,14 @@ class ConfigureNodes(object):
         deployment_dir = '%s/deployment_%s' % (
             self.yaml_config_dir, self.env_id)
         backup(deployment_dir)
-        for node_file in glob.glob(deployment_dir + '/*_%s.yaml' % node_id):
-            with io.open(node_file) as stream:
-                node = yaml.load(stream)
+        node_file = ('%s/%s.yaml' % (deployment_dir, node_id))
+        with io.open(node_file) as stream:
+            node = yaml.load(stream)
 
-            node['network_scheme'].update(transformations)
+        node['network_scheme'].update(transformations)
 
-            with io.open(node_file, 'w') as stream:
-                yaml.dump(node, stream, default_flow_style=False)
+        with io.open(node_file, 'w') as stream:
+            yaml.dump(node, stream, default_flow_style=False)
 
     def download_deployment_config(self):
         log('Download deployment config for environment %s' % self.env_id)
@@ -129,6 +131,22 @@ class ConfigureNodes(object):
         with open(attributes_yaml, 'w') as stream:
             yaml.dump(result_attributes, stream, default_flow_style=False)
 
+    # interface configuration can
+    # looks like this:
+    #
+    # interfaces_dpdk:
+    #   ens3:
+    #   - fuelweb_admin
+    #   ens4:
+    #   - storage
+    #   - management
+    #   ens5:
+    #   - interface_properties:
+    #       dpdk:
+    #         enabled: true
+    #   - private
+    #   ens6:
+    #   - public
     def modify_node_interface(self, node_id, roles_blade):
         log('Modify interface config for node %s' % node_id)
         interface_yaml = ('%s/node_%s/interfaces.yaml'
@@ -150,11 +168,21 @@ class ConfigureNodes(object):
         for interface in interfaces:
             interface['assigned_networks'] = []
             if interface['name'] in interface_config:
-                for net_name in interface_config[interface['name']]:
+                for prop in interface_config[interface['name']]:
                     net = {}
-                    net['id'] = net_name_id[net_name]
-                    net['name'] = net_name
-                    interface['assigned_networks'].append(net)
+                    #net name
+                    if isinstance(prop, six.string_types):
+                        net['id'] = net_name_id[prop]
+                        net['name'] = prop
+                        interface['assigned_networks'].append(net)
+                    #network properties
+                    elif isinstance(prop, dict):
+                        if not 'interface_properties' in prop:
+                            log('Interface configuration contain unknow dict: %s' % prop)
+                            continue
+                        interface['interface_properties'] = \
+                        self._merge_dicts(interface.get('interface_properties', {}),
+                                          prop.get('interface_properties', {}))
 
         with io.open(interface_yaml, 'w') as stream:
             yaml.dump(interfaces, stream, default_flow_style=False)
diff --git a/deploy/config/labs/devel-pipeline/default/fuel/config/dea-pod-override.yaml b/deploy/config/labs/devel-pipeline/default/fuel/config/dea-pod-override.yaml
index 985a2920c..32b2cfb22 100644
--- a/deploy/config/labs/devel-pipeline/default/fuel/config/dea-pod-override.yaml
+++ b/deploy/config/labs/devel-pipeline/default/fuel/config/dea-pod-override.yaml
@@ -25,42 +25,29 @@ interfaces_1:
   - private
   ens6:
   - public
-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: ens3
-  - action: add-port
-    bridge: br-mgmt
-    name: ens4
-  - action: add-port
-    bridge: br-storage
-    name: ens3.102
-  - action: add-port
-    bridge: br-mesh
-    name: ens5.103
-  - action: add-port
-    bridge: br-ex
-    name: ens6
+interfaces_dpdk:
+  ens3:
+  - fuelweb_admin
+  - storage
+  ens4:
+  - management
+  ens5:
+  - private
+  - interface_properties:
+      dpdk:
+        enabled: true
+  ens6:
+  - public
+interfaces_vlan:
+  ens3:
+  - fuelweb_admin
+  - storage
+  ens4:
+  - management
+  ens5:
+  - private
+  ens6:
+  - public
 fuel:
   ADMIN_NETWORK:
     dhcp_pool_end: 10.20.0.254
diff --git a/deploy/config/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml b/deploy/config/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml
index ce3b62af9..cb80e3855 100644
--- a/deploy/config/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml
+++ b/deploy/config/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml
@@ -25,42 +25,29 @@ interfaces_1:
   - private
   ens6:
   - public
-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: ens3
-  - action: add-port
-    bridge: br-mgmt
-    name: ens4
-  - action: add-port
-    bridge: br-storage
-    name: ens3.102
-  - action: add-port
-    bridge: br-mesh
-    name: ens5.103
-  - action: add-port
-    bridge: br-ex
-    name: ens6
+interfaces_dpdk:
+  ens3:
+  - fuelweb_admin
+  - storage
+  ens4:
+  - management
+  ens5:
+  - private
+  - interface_properties:
+      dpdk:
+        enabled: true
+  ens6:
+  - public
+interfaces_vlan:
+  ens3:
+  - fuelweb_admin
+  - storage
+  ens4:
+  - management
+  ens5:
+  - private
+  ens6:
+  - public
 fuel:
   ADMIN_NETWORK:
     dhcp_pool_end: 10.20.0.254
diff --git a/deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dea-pod-override.yaml b/deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dea-pod-override.yaml
index 736e9af3c..92cc0e616 100644
--- a/deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dea-pod-override.yaml
+++ b/deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dea-pod-override.yaml
@@ -25,42 +25,29 @@ interfaces_1:
   - private
   ens6:
   - public
-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: ens3
-  - action: add-port
-    bridge: br-mgmt
-    name: ens4
-  - action: add-port
-    bridge: br-storage
-    name: ens3.102
-  - action: add-port
-    bridge: br-mesh
-    name: ens5.103
-  - action: add-port
-    bridge: br-ex
-    name: ens6
+interfaces_dpdk:
+  ens3:
+  - fuelweb_admin
+  - storage
+  ens4:
+  - management
+  ens5:
+  - private
+  - interface_properties:
+      dpdk:
+        enabled: true
+  ens6:
+  - public
+interfaces_vlan:
+  ens3:
+  - fuelweb_admin
+  - storage
+  ens4:
+  - management
+  ens5:
+  - private
+  ens6:
+  - public
 fuel:
   ADMIN_NETWORK:
     dhcp_pool_end: 10.20.0.254
diff --git a/deploy/config/labs/devel-pipeline/intel-sc/fuel/config/dea-pod-override.yaml b/deploy/config/labs/devel-pipeline/intel-sc/fuel/config/dea-pod-override.yaml
index eed982d01..ed7c63fac 100644
--- a/deploy/config/labs/devel-pipeline/intel-sc/fuel/config/dea-pod-override.yaml
+++ b/deploy/config/labs/devel-pipeline/intel-sc/fuel/config/dea-pod-override.yaml
@@ -25,42 +25,29 @@ interfaces_1:
   - private
   ens6:
   - public
-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: ens3
-  - action: add-port
-    bridge: br-mgmt
-    name: ens4
-  - action: add-port
-    bridge: br-storage
-    name: ens3.102
-  - action: add-port
-    bridge: br-mesh
-    name: ens5.103
-  - action: add-port
-    bridge: br-ex
-    name: ens6
+interfaces_dpdk:
+  ens3:
+  - fuelweb_admin
+  - storage
+  ens4:
+  - management
+  ens5:
+  - private
+  - interface_properties:
+      dpdk:
+        enabled: true
+  ens6:
+  - public
+interfaces_vlan:
+  ens3:
+  - fuelweb_admin
+  - storage
+  ens4:
+  - management
+  ens5:
+  - private
+  ens6:
+  - public
 fuel:
   ADMIN_NETWORK:
     dhcp_pool_end: 10.20.0.254
diff --git a/deploy/scenario/README b/deploy/scenario/README
index 3472f6630..e32262d0d 100644
--- a/deploy/scenario/README
+++ b/deploy/scenario/README
@@ -93,23 +93,18 @@ dea-override-config:
   - id: 1
     interfaces: interfaces_1
     role: mongo,controller,opendaylight
-    transformations: transformations_1
   - id: 2
     interfaces: interfaces_1
     role: mongo,controller
-    transformations: transformations_1
   - id: 3
     interfaces: interfaces_1
     role: mongo,controller
-    transformations: transformations_1
   - id: 4
     interfaces: interfaces_1
     role: ceph-osd,compute
-    transformations: transformations_1
   - id: 5
     interfaces: interfaces_1
     role: ceph-osd,compute
-    transformations: transformations_1
 
   settings:
     editable:
diff --git a/deploy/scenario/ha_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_heat_ceilometer_scenario.yaml
index 8ab5f9277..4051c478a 100644
--- a/deploy/scenario/ha_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/ha_heat_ceilometer_scenario.yaml
@@ -41,23 +41,18 @@ dea-override-config:
   - id: 1
     interfaces: interfaces_1
     role: controller
-    transformations: transformations_1
   - id: 2
     interfaces: interfaces_1
     role: mongo, controller
-    transformations: transformations_1
   - id: 3
     interfaces: interfaces_1
     role: ceph-osd,controller
-    transformations: transformations_1
   - id: 4
     interfaces: interfaces_1
     role: ceph-osd,compute
-    transformations: transformations_1
   - id: 5
     interfaces: interfaces_1
     role: ceph-osd,compute
-    transformations: transformations_1
 
 dha-override-config:
   nodes:
diff --git a/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario.yaml
index 828569bb7..1217f7273 100644
--- a/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario.yaml
@@ -46,23 +46,18 @@ dea-override-config:
   - id: 1
     interfaces: interfaces_1
     role: controller,mongo
-    transformations: transformations_1
   - id: 2
     interfaces: interfaces_1
     role: controller
-    transformations: transformations_1
   - id: 3
     interfaces: interfaces_1
     role: controller
-    transformations: transformations_1
   - id: 4
     interfaces: interfaces_1
     role: compute,ceph-osd
-    transformations: transformations_1
   - id: 5
     interfaces: interfaces_1
     role: compute,ceph-osd
-    transformations: transformations_1
 
   settings:
     editable:
diff --git a/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario.yaml
index 6ececba6c..82b343ead 100644
--- a/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario.yaml
@@ -54,26 +54,21 @@ dea-override-config:
     net_segment_type: vlan
   nodes:
   - id: 1
-    interfaces: interfaces_dpdk
+    interfaces: interfaces_vlan
     role: controller
-    transformations: transformations_vlan
   - id: 2
-    interfaces: interfaces_dpdk
+    interfaces: interfaces_vlan
     role: mongo,controller
-    transformations: transformations_vlan
   - id: 3
-    interfaces: interfaces_dpdk
+    interfaces: interfaces_vlan
     role: ceph-osd,controller
-    transformations: transformations_vlan
   - id: 4
     interfaces: interfaces_dpdk
     role: ceph-osd,compute
-    transformations: transformations_dpdk
     attributes: attributes_1
   - id: 5
     interfaces: interfaces_dpdk
     role: ceph-osd,compute
-    transformations: transformations_dpdk
     attributes: attributes_1
 
   attributes_1:
diff --git a/deploy/scenario/ha_odl-bgpvpn_scenario.yaml b/deploy/scenario/ha_odl-bgpvpn_scenario.yaml
index 2257cbb70..7d52e77e2 100644
--- a/deploy/scenario/ha_odl-bgpvpn_scenario.yaml
+++ b/deploy/scenario/ha_odl-bgpvpn_scenario.yaml
@@ -59,23 +59,18 @@ dea-override-config:
   - id: 1
     interfaces: interfaces_1
     role: controller,opendaylight
-    transformations: transformations_1
   - id: 2
     interfaces: interfaces_1
     role: mongo,controller
-    transformations: transformations_1
   - id: 3
     interfaces: interfaces_1
     role: ceph-osd,controller
-    transformations: transformations_1
   - id: 4
     interfaces: interfaces_1
     role: ceph-osd,compute
-    transformations: transformations_1
   - id: 5
     interfaces: interfaces_1
     role: ceph-osd,compute
-    transformations: transformations_1
 
 
 dha-override-config:
diff --git a/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario.yaml
index 0d16a3d65..90c89aedc 100644
--- a/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario.yaml
@@ -60,23 +60,18 @@ dea-override-config:
   - id: 1
     interfaces: interfaces_1
     role: controller,opendaylight
-    transformations: transformations_1
   - id: 2
     interfaces: interfaces_1
     role: mongo,controller
-    transformations: transformations_1
   - id: 3
     interfaces: interfaces_1
     role: ceph-osd,controller
-    transformations: transformations_1
   - id: 4
     interfaces: interfaces_1
     role: ceph-osd,compute
-    transformations: transformations_1
   - id: 5
     interfaces: interfaces_1
     role: ceph-osd,compute
-    transformations: transformations_1
 
 dha-override-config:
   nodes:
diff --git a/deploy/scenario/ha_odl-l2_sfc_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_odl-l2_sfc_heat_ceilometer_scenario.yaml
index a900720f9..e6aef2aba 100644
--- a/deploy/scenario/ha_odl-l2_sfc_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/ha_odl-l2_sfc_heat_ceilometer_scenario.yaml
@@ -76,23 +76,18 @@ dea-override-config:
   - id: 1
     interfaces: interfaces_1
     role: controller,opendaylight
-    transformations: transformations_1
   - id: 2
     interfaces: interfaces_1
     role: mongo,controller
-    transformations: transformations_1
   - id: 3
     interfaces: interfaces_1
     role: ceph-osd,controller
-    transformations: transformations_1
   - id: 4
     interfaces: interfaces_1
     role: ceph-osd,compute
-    transformations: transformations_1
   - id: 5
     interfaces: interfaces_1
     role: ceph-osd,compute
-    transformations: transformations_1
 dha-override-config:
   nodes:
   - id: 1
diff --git a/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario.yaml
index e222582d2..0dda3b3ca 100644
--- a/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario.yaml
@@ -66,23 +66,18 @@ dea-override-config:
   - id: 1
     interfaces: interfaces_1
     role: controller,opendaylight
-    transformations: transformations_1
   - id: 2
     interfaces: interfaces_1
     role: mongo,controller
-    transformations: transformations_1
   - id: 3
     interfaces: interfaces_1
     role: ceph-osd,controller
-    transformations: transformations_1
   - id: 4
     interfaces: interfaces_1
     role: ceph-osd,compute
-    transformations: transformations_1
   - id: 5
     interfaces: interfaces_1
     role: ceph-osd,compute
-    transformations: transformations_1
   settings:
     editable:
       public_network_assignment:
diff --git a/deploy/scenario/ha_onos_nofeature_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_onos_nofeature_heat_ceilometer_scenario.yaml
index cb46af569..f813458d0 100644
--- a/deploy/scenario/ha_onos_nofeature_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/ha_onos_nofeature_heat_ceilometer_scenario.yaml
@@ -67,23 +67,18 @@ dea-override-config:
   - id: 1
     interfaces: interfaces_1
     role: controller,onos
-    transformations: transformations_1
   - id: 2
     interfaces: interfaces_1
     role: mongo,controller
-    transformations: transformations_1
   - id: 3
     interfaces: interfaces_1
     role: ceph-osd,controller
-    transformations: transformations_1
   - id: 4
     interfaces: interfaces_1
     role: ceph-osd,compute
-    transformations: transformations_1
   - id: 5
     interfaces: interfaces_1
     role: ceph-osd,compute
-    transformations: transformations_1
   settings:
     editable:
       public_network_assignment:
diff --git a/deploy/scenario/ha_onos_sfc_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_onos_sfc_heat_ceilometer_scenario.yaml
index e9dd0e196..32fbfcf6c 100644
--- a/deploy/scenario/ha_onos_sfc_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/ha_onos_sfc_heat_ceilometer_scenario.yaml
@@ -47,23 +47,18 @@ dea-override-config:
   - id: 1
     interfaces: interfaces_1
     role: controller,onos
-    transformations: transformations_1
   - id: 2
     interfaces: interfaces_1
     role: mongo,controller
-    transformations: transformations_1
   - id: 3
     interfaces: interfaces_1
     role: ceph-osd,controller
-    transformations: transformations_1
   - id: 4
     interfaces: interfaces_1
     role: ceph-osd,compute
-    transformations: transformations_1
   - id: 5
     interfaces: interfaces_1
     role: ceph-osd,compute
-    transformations: transformations_1
   settings:
     editable:
       public_network_assignment:
diff --git a/deploy/scenario/ha_vlan_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_vlan_heat_ceilometer_scenario.yaml
index dc7868b56..d1d5191f0 100644
--- a/deploy/scenario/ha_vlan_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/ha_vlan_heat_ceilometer_scenario.yaml
@@ -45,23 +45,18 @@ dea-override-config:
   - id: 1
     interfaces: interfaces_1
     role: controller
-    transformations: transformations_1
   - id: 2
     interfaces: interfaces_1
     role: mongo,controller
-    transformations: transformations_1
   - id: 3
     interfaces: interfaces_1
     role: ceph-osd,controller
-    transformations: transformations_1
   - id: 4
     interfaces: interfaces_1
     role: ceph-osd,compute
-    transformations: transformations_1
   - id: 5
     interfaces: interfaces_1
     role: ceph-osd,compute
-    transformations: transformations_1
 
   settings:
     editable:
diff --git a/deploy/scenario/no-ha_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_heat_ceilometer_scenario.yaml
index c21585979..3dd5f841e 100644
--- a/deploy/scenario/no-ha_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/no-ha_heat_ceilometer_scenario.yaml
@@ -41,19 +41,15 @@ dea-override-config:
   - id: 1
     interfaces: interfaces_1
     role: mongo,controller
-    transformations: transformations_1
   - id: 2
     interfaces: interfaces_1
     role: ceph-osd,compute
-    transformations: transformations_1
   - id: 3
     interfaces: interfaces_1
     role: ceph-osd,compute
-    transformations: transformations_1
   - id: 4
     interfaces: interfaces_1
     role: ceph-osd,compute
-    transformations: transformations_1
 
 dha-override-config:
 #  disks:
diff --git a/deploy/scenario/no-ha_nfv-kvm_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_nfv-kvm_heat_ceilometer_scenario.yaml
index 779c6e14a..4661a263d 100644
--- a/deploy/scenario/no-ha_nfv-kvm_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/no-ha_nfv-kvm_heat_ceilometer_scenario.yaml
@@ -48,19 +48,15 @@ dea-override-config:
   - id: 1
     interfaces: interfaces_1
     role: mongo,controller
-    transformations: transformations_1
   - id: 2
     interfaces: interfaces_1
     role: ceph-osd
-    transformations: transformations_1
   - id: 3
     interfaces: interfaces_1
     role: compute
-    transformations: transformations_1
   - id: 4
     interfaces: interfaces_1
     role: compute
-    transformations: transformations_1
 
   settings:
     editable:
diff --git a/deploy/scenario/no-ha_nfv-kvm_nfv-ovs_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_nfv-kvm_nfv-ovs_heat_ceilometer_scenario.yaml
index 56251215a..87364e83a 100644
--- a/deploy/scenario/no-ha_nfv-kvm_nfv-ovs_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/no-ha_nfv-kvm_nfv-ovs_heat_ceilometer_scenario.yaml
@@ -55,19 +55,15 @@ dea-override-config:
   - id: 1
     interfaces: interfaces_1
     role: mongo,controller
-    transformations: transformations_1
   - id: 2
     interfaces: interfaces_1
     role: ceph-osd,compute
-    transformations: transformations_2
   - id: 3
     interfaces: interfaces_1
     role: ceph-osd,compute
-    transformations: transformations_2
   - id: 4
     interfaces: interfaces_1
     role: ceph-osd,compute
-    transformations: transformations_2
   settings:
     editable:
       additional_components:
diff --git a/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario.yaml
index f7b69a50f..c1dca2e10 100644
--- a/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario.yaml
@@ -54,23 +54,19 @@ dea-override-config:
     net_segment_type: vlan
   nodes:
   - id: 1
-    interfaces: interfaces_dpdk
+    interfaces: interfaces_vlan
     role: mongo,controller
-    transformations: transformations_vlan
   - id: 2
     interfaces: interfaces_dpdk
     role: ceph-osd,compute
-    transformations: transformations_dpdk
     attributes: attributes_1
   - id: 3
     interfaces: interfaces_dpdk
     role: ceph-osd,compute
-    transformations: transformations_dpdk
     attributes: attributes_1
   - id: 4
     interfaces: interfaces_dpdk
     role: ceph-osd,compute
-    transformations: transformations_dpdk
     attributes: attributes_1
 
   attributes_1:
diff --git a/deploy/scenario/no-ha_odl-bgpvpn_scenario.yaml b/deploy/scenario/no-ha_odl-bgpvpn_scenario.yaml
index 333ff5af5..6f21ea2c8 100644
--- a/deploy/scenario/no-ha_odl-bgpvpn_scenario.yaml
+++ b/deploy/scenario/no-ha_odl-bgpvpn_scenario.yaml
@@ -59,20 +59,16 @@ dea-override-config:
   nodes:
   - id: 1
     interfaces: interfaces_1
-    role: mongo,controller,opendaylight
-    transformations: transformations_1
+    role: mongo,controller
   - id: 2
     interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
+    role: ceph-osd,opendaylight
   - id: 3
     interfaces: interfaces_1
     role: ceph-osd,compute
-    transformations: transformations_1
   - id: 4
     interfaces: interfaces_1
     role: ceph-osd,compute
-    transformations: transformations_1
 
 dha-override-config:
 #  disks:
diff --git a/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario.yaml
index 55af51f9e..f8787d780 100644
--- a/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario.yaml
@@ -60,20 +60,16 @@ dea-override-config:
   nodes:
   - id: 1
     interfaces: interfaces_1
-    role: mongo,controller,opendaylight
-    transformations: transformations_1
+    role: mongo,controller
   - id: 2
     interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
+    role: ceph-osd,opendaylight
   - id: 3
     interfaces: interfaces_1
     role: ceph-osd,compute
-    transformations: transformations_1
   - id: 4
     interfaces: interfaces_1
     role: ceph-osd,compute
-    transformations: transformations_1
 
 dha-override-config:
 #  disks:
diff --git a/deploy/scenario/no-ha_odl-l2_sfc_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_odl-l2_sfc_heat_ceilometer_scenario.yaml
index 58fdd07b8..a8d9ed848 100644
--- a/deploy/scenario/no-ha_odl-l2_sfc_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/no-ha_odl-l2_sfc_heat_ceilometer_scenario.yaml
@@ -76,20 +76,16 @@ dea-override-config:
   nodes:
   - id: 1
     interfaces: interfaces_1
-    role: mongo,controller,opendaylight
-    transformations: transformations_1
+    role: mongo,controller
   - id: 2
     interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
+    role: ceph-osd,opendaylight
   - id: 3
     interfaces: interfaces_1
     role: ceph-osd,compute
-    transformations: transformations_1
   - id: 4
     interfaces: interfaces_1
     role: ceph-osd,compute
-    transformations: transformations_1
 
 dha-override-config:
 #  disks:
diff --git a/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario.yaml
index bb0e28db2..5f800abad 100644
--- a/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario.yaml
@@ -65,20 +65,16 @@ dea-override-config:
   nodes:
   - id: 1
     interfaces: interfaces_1
-    role: mongo,controller,opendaylight
-    transformations: transformations_1
+    role: mongo,controller
   - id: 2
     interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
+    role: ceph-osd,opendaylight
   - id: 3
     interfaces: interfaces_1
     role: ceph-osd,compute
-    transformations: transformations_1
   - id: 4
     interfaces: interfaces_1
     role: ceph-osd,compute
-    transformations: transformations_1
   settings:
     editable:
       public_network_assignment:
diff --git a/deploy/scenario/no-ha_onos_nofeature_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_onos_nofeature_heat_ceilometer_scenario.yaml
index c6f07a73c..f5c00f0c9 100644
--- a/deploy/scenario/no-ha_onos_nofeature_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/no-ha_onos_nofeature_heat_ceilometer_scenario.yaml
@@ -68,19 +68,15 @@ dea-override-config:
   - id: 1
     interfaces: interfaces_1
     role: mongo,controller,onos
-    transformations: transformations_1
   - id: 2
     interfaces: interfaces_1
     role: ceph-osd,compute
-    transformations: transformations_1
   - id: 3
     interfaces: interfaces_1
     role: ceph-osd,compute
-    transformations: transformations_1
   - id: 4
     interfaces: interfaces_1
     role: ceph-osd,compute
-    transformations: transformations_1
   settings:
     editable:
       public_network_assignment:
diff --git a/deploy/scenario/no-ha_onos_sfc_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_onos_sfc_heat_ceilometer_scenario.yaml
index 80d73b335..587346ef4 100644
--- a/deploy/scenario/no-ha_onos_sfc_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/no-ha_onos_sfc_heat_ceilometer_scenario.yaml
@@ -48,19 +48,15 @@ dea-override-config:
   - id: 1
     interfaces: interfaces_1
     role: mongo,controller,onos
-    transformations: transformations_1
   - id: 2
     interfaces: interfaces_1
     role: ceph-osd,compute
-    transformations: transformations_1
   - id: 3
     interfaces: interfaces_1
     role: ceph-osd,compute
-    transformations: transformations_1
   - id: 4
     interfaces: interfaces_1
     role: ceph-osd,compute
-    transformations: transformations_1
   settings:
     editable:
       public_network_assignment:
diff --git a/deploy/scenario/no-ha_vlan_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_vlan_heat_ceilometer_scenario.yaml
index 5df530f42..567ea9867 100644
--- a/deploy/scenario/no-ha_vlan_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/no-ha_vlan_heat_ceilometer_scenario.yaml
@@ -45,19 +45,15 @@ dea-override-config:
   - id: 1
     interfaces: interfaces_1
     role: mongo,controller
-    transformations: transformations_1
   - id: 2
     interfaces: interfaces_1
     role: ceph-osd,compute
-    transformations: transformations_1
   - id: 3
     interfaces: interfaces_1
     role: ceph-osd,compute
-    transformations: transformations_1
   - id: 4
     interfaces: interfaces_1
     role: ceph-osd,compute
-    transformations: transformations_1
   settings:
     editable:
       additional_components: