Merge "Add transformations and interfaces for DPDK"

2 files changed, 190 insertions, 2 deletions

diff --git a/labs/ericsson/pod2/fuel/config/dea-pod-override.yaml b/labs/ericsson/pod2/fuel/config/dea-pod-override.yaml
index b3f6beb..d86511d 100644
--- a/labs/ericsson/pod2/fuel/config/dea-pod-override.yaml
+++ b/labs/ericsson/pod2/fuel/config/dea-pod-override.yaml
@@ -14,6 +14,15 @@ interfaces_1:
   - management
   - storage
   - private
+interfaces_dpdk:
+  eno50:
+  - fuelweb_admin
+  ens2f0:
+  - private
+  ens1f0:
+  - public
+  - management
+  - storage
 transformations_1:
   transformations:
   - action: add-br
@@ -50,6 +59,91 @@ transformations_1:
   - action: add-port
     bridge: br-mesh
     name: ens1f0.300
+transformations_vlan:
+  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-prv
+    provider: ovs
+  - action: add-br
+    name: br-aux
+  - action: add-patch
+    bridges:
+    - br-prv
+    - br-aux
+    mtu: 65000
+    provider: ovs
+  - action: add-port
+    bridge: br-fw-admin
+    name: eno50
+  - action: add-port
+    bridge: br-mgmt
+    name: ens1f0.100
+  - action: add-port
+    bridge: br-storage
+    name: ens1f0.200
+  - action: add-port
+    bridge: br-aux
+    name: ens2f0
+  - action: add-port
+    bridge: br-ex
+    name: ens1f0.753
+transformations_dpdk:
+  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-prv
+    provider: ovs
+    vendor_specific:
+      datapath_type: netdev
+  - action: add-port
+    bridge: br-prv
+    name: ens2f0
+    provider: dpdkovs
+  - action: add-port
+    bridge: br-fw-admin
+    name: eno50
+  - action: add-port
+    bridge: br-mgmt
+    name: ens1f0.100
+  - action: add-port
+    bridge: br-storage
+    name: ens1f0.200
+  - action: add-port
+    bridge: br-ex
+    name: ens1f0.753
 fuel:
   ADMIN_NETWORK:
     dhcp_pool_end: 10.20.0.254
@@ -83,8 +177,8 @@ network:
     net_l23_provider: ovs
     segmentation_type: tun
     vlan_range:
-    - 1000
-    - 1030
+    - 3010
+    - 3040
   networks:
   - cidr: 10.118.101.0/24
     gateway: 10.118.101.1
diff --git a/labs/lf/pod2/fuel/config/dea-pod-override.yaml b/labs/lf/pod2/fuel/config/dea-pod-override.yaml
index 8024d5f..2e5b02f 100644
--- a/labs/lf/pod2/fuel/config/dea-pod-override.yaml
+++ b/labs/lf/pod2/fuel/config/dea-pod-override.yaml
@@ -30,6 +30,15 @@ interfaces_1:
   - private
   enp8s0:
   - public
+interfaces_dpdk:
+  enp6s0:
+  - fuelweb_admin
+  - management
+  - storage
+  enp7s0:
+  - private
+  enp8s0:
+  - public
 transformations_1:
   transformations:
   - action: add-br
@@ -88,6 +97,91 @@ transformations_2:
   - action: add-port
     bridge: br-mesh
     name: enp6s0.302
+transformations_vlan:
+  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-prv
+    provider: ovs
+  - action: add-br
+    name: br-aux
+  - action: add-patch
+    bridges:
+    - br-prv
+    - br-aux
+    mtu: 65000
+    provider: ovs
+  - action: add-port
+    bridge: br-fw-admin
+    name: enp6s0
+  - action: add-port
+    bridge: br-mgmt
+    name: enp6s0.100
+  - action: add-port
+    bridge: br-storage
+    name: enp6s0.200
+  - action: add-port
+    bridge: br-aux
+    name: enp7s0
+  - action: add-port
+    bridge: br-ex
+    name: enp8s0
+transformations_dpdk:
+  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-prv
+    provider: ovs
+    vendor_specific:
+      datapath_type: netdev
+  - action: add-port
+    bridge: br-prv
+    name: enp7s0
+    provider: dpdkovs
+  - action: add-port
+    bridge: br-fw-admin
+    name: enp6s0
+  - action: add-port
+    bridge: br-mgmt
+    name: enp6s0.100
+  - action: add-port
+    bridge: br-storage
+    name: enp6s0.200
+  - action: add-port
+    bridge: br-ex
+    name: enp6s0.753
 network:
   networking_parameters:
     base_mac: fa:16:3e:00:00:00