CSIT-870 Kubernetes/Ligato integration

- Update overall Kubernetes/Ligato integration
- CSIT-871 Update infrastructure / images
- CSIT-872 Update of KubernetesUtils.py

Change-Id: I7833f56abd351c694d3d3e1c9c45e649aec892e1
Signed-off-by: Peter Mikus <pmikus@cisco.com>

23 files changed, 1086 insertions, 983 deletions

diff --git a/resources/templates/kubernetes/calico_v2.4.1.yaml b/resources/templates/kubernetes/calico_v2.6.3.yaml
index 921e6923ca..c77b19cccc 100644
--- a/resources/templates/kubernetes/calico_v2.4.1.yaml
+++ b/resources/templates/kubernetes/calico_v2.6.3.yaml
@@ -1,9 +1,9 @@
-# Calico Version v2.4.1
-# https://docs.projectcalico.org/v2.4/releases#v2.4.1
+# Calico Version v2.6.3
+# https://docs.projectcalico.org/v2.6/releases#v2.6.3
 # This manifest includes the following component versions:
-#   calico/node:v2.4.1
-#   calico/cni:v1.10.0
-#   calico/kube-policy-controller:v0.7.0
+#   calico/node:v2.6.3
+#   calico/cni:v1.11.1
+#   calico/kube-controllers:v1.0.1
 
 # This ConfigMap is used to configure a self-hosted Calico installation.
 kind: ConfigMap
@@ -66,6 +66,11 @@ spec:
     spec:
       # Only run this pod on the master.
       tolerations:
+      # this taint is set by all kubelets running `--cloud-provider=external`
+      # so we should tolerate it to schedule the calico pods
+      - key: node.cloudprovider.kubernetes.io/uninitialized
+        value: "true"
+        effect: NoSchedule
       - key: node-role.kubernetes.io/master
         effect: NoSchedule
       # Allow this pod to be rescheduled while the node is in "critical add-ons only" mode.
@@ -142,6 +147,11 @@ spec:
     spec:
       hostNetwork: true
       tolerations:
+      # this taint is set by all kubelets running `--cloud-provider=external`
+      # so we should tolerate it to schedule the calico pods
+      - key: node.cloudprovider.kubernetes.io/uninitialized
+        value: "true"
+        effect: NoSchedule
       - key: node-role.kubernetes.io/master
         effect: NoSchedule
       # Allow this pod to be rescheduled while the node is in "critical add-ons only" mode.
@@ -149,12 +159,15 @@ spec:
       - key: CriticalAddonsOnly
         operator: Exists
       serviceAccountName: calico-cni-plugin
+      # Minimize downtime during a rolling upgrade or deletion; tell Kubernetes to do a "force
+      # deletion": https://kubernetes.io/docs/concepts/workloads/pods/pod/#termination-of-pods.
+      terminationGracePeriodSeconds: 0
       containers:
         # Runs calico/node container on each Kubernetes node.  This
         # container programs network policy and routes on each
         # host.
         - name: calico-node
-          image: quay.io/calico/node:v2.4.1
+          image: quay.io/calico/node:v2.6.3
           env:
             # The location of the Calico etcd cluster.
             - name: ETCD_ENDPOINTS
@@ -171,6 +184,11 @@ spec:
             # Cluster type to identify the deployment type
             - name: CLUSTER_TYPE
               value: "kubeadm,bgp"
+            # Set noderef for node controller.
+            - name: CALICO_K8S_NODE_REF
+              valueFrom:
+                fieldRef:
+                  fieldPath: spec.nodeName
             # Disable file logging so `kubectl logs` works.
             - name: CALICO_DISABLE_FILE_LOGGING
               value: "true"
@@ -191,11 +209,11 @@ spec:
             # Set Felix logging to "info"
             - name: FELIX_LOGSEVERITYSCREEN
               value: "info"
-            - name: FELIX_HEALTHENABLED
-              value: "true"
             # Auto-detect the BGP IP address.
             - name: IP
               value: ""
+            - name: FELIX_HEALTHENABLED
+              value: "true"
           securityContext:
             privileged: true
           resources:
@@ -223,7 +241,7 @@ spec:
         # This container installs the Calico CNI binaries
         # and CNI network config file on each node.
         - name: install-cni
-          image: quay.io/calico/cni:v1.10.0
+          image: quay.io/calico/cni:v1.11.1
           command: ["/install-cni.sh"]
           env:
             # The location of the Calico etcd cluster.
@@ -261,46 +279,51 @@ spec:
 
 ---
 
-# This manifest deploys the Calico policy controller on Kubernetes.
-# See https://github.com/projectcalico/k8s-policy
+# This manifest deploys the Calico Kubernetes controllers.
+# See https://github.com/projectcalico/kube-controllers
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: calico-policy-controller
+  name: calico-kube-controllers
   namespace: kube-system
   labels:
-    k8s-app: calico-policy
+    k8s-app: calico-kube-controllers
 spec:
-  # The policy controller can only have a single active instance.
+  # The controllers can only have a single active instance.
   replicas: 1
   strategy:
     type: Recreate
   template:
     metadata:
-      name: calico-policy-controller
+      name: calico-kube-controllers
       namespace: kube-system
       labels:
-        k8s-app: calico-policy-controller
+        k8s-app: calico-kube-controllers
       annotations:
         # Mark this pod as a critical add-on; when enabled, the critical add-on scheduler
         # reserves resources for critical add-on pods so that they can be rescheduled after
         # a failure.  This annotation works in tandem with the toleration below.
         scheduler.alpha.kubernetes.io/critical-pod: ''
     spec:
-      # The policy controller must run in the host network namespace so that
+      # The controllers must run in the host network namespace so that
       # it isn't governed by policy that would prevent it from working.
       hostNetwork: true
       tolerations:
+      # this taint is set by all kubelets running `--cloud-provider=external`
+      # so we should tolerate it to schedule the calico pods
+      - key: node.cloudprovider.kubernetes.io/uninitialized
+        value: "true"
+        effect: NoSchedule
       - key: node-role.kubernetes.io/master
         effect: NoSchedule
       # Allow this pod to be rescheduled while the node is in "critical add-ons only" mode.
       # This, along with the annotation above marks this pod as a critical add-on.
       - key: CriticalAddonsOnly
         operator: Exists
-      serviceAccountName: calico-policy-controller
+      serviceAccountName: calico-kube-controllers
       containers:
-        - name: calico-policy-controller
-          image: quay.io/calico/kube-policy-controller:v0.7.0
+        - name: calico-kube-controllers
+          image: quay.io/calico/kube-controllers:v1.0.1
           env:
             # The location of the Calico etcd cluster.
             - name: ETCD_ENDPOINTS
@@ -312,12 +335,52 @@ spec:
             # service for API access.
             - name: K8S_API
               value: "https://kubernetes.default:443"
+            # Choose which controllers to run.
+            - name: ENABLED_CONTROLLERS
+              value: policy,profile,workloadendpoint,node
             # Since we're running in the host namespace and might not have KubeDNS
             # access, configure the container's /etc/hosts to resolve
             # kubernetes.default to the correct service clusterIP.
             - name: CONFIGURE_ETC_HOSTS
               value: "true"
+
 ---
+
+# This deployment turns off the old "policy-controller". It should remain at 0 replicas, and then
+# be removed entirely once the new kube-controllers deployment has been deployed above.
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: calico-policy-controller
+  namespace: kube-system
+  labels:
+    k8s-app: calico-policy-controller
+spec:
+  # Turn this deployment off in favor of the kube-controllers deployment above.
+  replicas: 0
+  strategy:
+    type: Recreate
+  template:
+    metadata:
+      name: calico-policy-controller
+      namespace: kube-system
+      labels:
+        k8s-app: calico-policy-controller
+    spec:
+      hostNetwork: true
+      serviceAccountName: calico-kube-controllers
+      containers:
+        - name: calico-policy-controller
+          image: quay.io/calico/kube-controllers:v1.0.1
+          env:
+            - name: ETCD_ENDPOINTS
+              valueFrom:
+                configMapKeyRef:
+                  name: calico-config
+                  key: etcd_endpoints
+
+---
+
 apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRoleBinding
 metadata:
@@ -330,12 +393,13 @@ subjects:
 - kind: ServiceAccount
   name: calico-cni-plugin
   namespace: kube-system
+
 ---
+
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
   name: calico-cni-plugin
-  namespace: kube-system
 rules:
   - apiGroups: [""]
     resources:
@@ -343,31 +407,36 @@ rules:
       - nodes
     verbs:
       - get
+
 ---
+
 apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: calico-cni-plugin
   namespace: kube-system
+
 ---
+
 apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRoleBinding
 metadata:
-  name: calico-policy-controller
+  name: calico-kube-controllers
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: calico-policy-controller
+  name: calico-kube-controllers
 subjects:
 - kind: ServiceAccount
-  name: calico-policy-controller
+  name: calico-kube-controllers
   namespace: kube-system
+
 ---
+
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
-  name: calico-policy-controller
-  namespace: kube-system
+  name: calico-kube-controllers
 rules:
   - apiGroups:
     - ""
@@ -376,12 +445,15 @@ rules:
       - pods
       - namespaces
       - networkpolicies
+      - nodes
     verbs:
       - watch
       - list
+
 ---
+
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: calico-policy-controller
+  name: calico-kube-controllers
   namespace: kube-system
diff --git a/resources/templates/kubernetes/configmaps/ch-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc.yaml b/resources/templates/kubernetes/configmaps/ch-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc.yaml
new file mode 100644
index 0000000000..e06146fe86
--- /dev/null
+++ b/resources/templates/kubernetes/configmaps/ch-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc.yaml
@@ -0,0 +1,72 @@
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: sfc-controller-cfg
+  namespace: csit
+data:
+  etcd.conf: |
+    insecure-transport: true
+    dial-timeout: 1000000000
+    endpoints:
+      - "172.17.0.1:22379"
+
+  sfc.conf: |
+    sfc_controller_config_version: 1
+    description: $$TEST_NAME$$
+    host_entities:
+      - name: vswitch
+    sfc_entities:
+      - name: vswitch-vnf1
+        description: vswitch to VNF1 - memif
+        type: 3
+        elements:
+          - container: vswitch
+            port_label: $$VSWITCH_IF1$$
+            etcd_vpp_switch_key: vswitch
+            type: 5
+          - container: vnf1
+            port_label: port1
+            etcd_vpp_switch_key: vswitch
+            type: 2
+      - name: vswitch-vnf2
+        description: VNF2 to vswitch - memif
+        type: 3
+        elements:
+          - container: vswitch
+            port_label: $$VSWITCH_IF2$$
+            etcd_vpp_switch_key: vswitch
+            type: 5
+          - container: vnf2
+            port_label: port2
+            etcd_vpp_switch_key: vswitch
+            type: 2
+      - name: vnf1-vnf2
+        description: vnf1 to vnf2 via vswitch - memifs
+        type: 8
+        elements:
+          - container: vnf1
+            port_label: port2
+            etcd_vpp_switch_key: vswitch
+            type: 2
+          - container: vnf2
+            port_label: port1
+            etcd_vpp_switch_key: vswitch
+            type: 2
+
+  vnf.conf: |
+    vnf_plugin_config_version: 1
+    description: VNF config
+    vnf_entities:
+      - name: vnf1
+        container: vnf1
+        l2xconnects:
+          - port_labels:
+            - port1
+            - port2
+      - name: vnf2
+        container: vnf2
+        l2xconnects:
+          - port_labels:
+            - port1
+            - port2
diff --git a/resources/templates/kubernetes/configmaps/ch-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc.yaml b/resources/templates/kubernetes/configmaps/ch-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc.yaml
new file mode 100644
index 0000000000..5cdf99e6ec
--- /dev/null
+++ b/resources/templates/kubernetes/configmaps/ch-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc.yaml
@@ -0,0 +1,108 @@
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: sfc-controller-cfg
+  namespace: csit
+data:
+  etcd.conf: |
+    insecure-transport: true
+    dial-timeout: 1000000000
+    endpoints:
+      - "172.17.0.1:22379"
+
+  sfc.conf: |
+    sfc_controller_config_version: 1
+    description: $$TEST_NAME$$
+    host_entities:
+      - name: vswitch
+    sfc_entities:
+      - name: vswitch-vnf1
+        description: vswitch to VNF1 - memif
+        type: 4
+        elements:
+          - container: vswitch
+            port_label: $$VSWITCH_IF1$$
+            etcd_vpp_switch_key: vswitch
+            type: 5
+          - container: vnf1
+            port_label: port1
+            etcd_vpp_switch_key: vswitch
+            type: 2
+      - name: vswitch-vnf4
+        description: VNF4 to vswitch - memif
+        type: 4
+        elements:
+          - container: vswitch
+            port_label: $$VSWITCH_IF2$$
+            etcd_vpp_switch_key: vswitch
+            type: 5
+          - container: vnf4
+            port_label: port2
+            etcd_vpp_switch_key: vswitch
+            type: 2
+      - name: vnf1-vnf2
+        description: vnf1 to vnf2 via vswitch - memifs
+        type: 8
+        elements:
+          - container: vnf1
+            port_label: port2
+            etcd_vpp_switch_key: vswitch
+            type: 2
+          - container: vnf2
+            port_label: port1
+            etcd_vpp_switch_key: vswitch
+            type: 2
+      - name: vnf2-vnf3
+        description: vnf2 to vnf3 via vswitch memifs
+        type: 8
+        elements:
+          - container: vnf2
+            port_label: port2
+            etcd_vpp_switch_key: vswitch
+            type: 2
+          - container: vnf3
+            port_label: port1
+            etcd_vpp_switch_key: vswitch
+            type: 2
+      - name: vnf3-vnf4
+        description: vnf3 to vnf4 via vswitch memifs
+        type: 8
+        elements:
+          - container: vnf3
+            port_label: port2
+            etcd_vpp_switch_key: vswitch
+            type: 2
+          - container: vnf4
+            port_label: port1
+            etcd_vpp_switch_key: vswitch
+            type: 2
+
+  vnf.conf: |
+    vnf_plugin_config_version: 1
+    description: VNF config
+    vnf_entities:
+      - name: vnf1
+        container: vnf1
+        l2xconnects:
+          - port_labels:
+            - port1
+            - port2
+      - name: vnf2
+        container: vnf2
+        l2xconnects:
+          - port_labels:
+            - port1
+            - port2
+      - name: vnf3
+        container: vnf3
+        l2xconnects:
+          - port_labels:
+            - port1
+            - port2
+      - name: vnf4
+        container: vnf4
+        l2xconnects:
+          - port_labels:
+            - port1
+            - port2
diff --git a/resources/templates/kubernetes/configmaps/ch-eth-1drcl2xcbase-eth-4memif-2drcl2xc.yaml b/resources/templates/kubernetes/configmaps/ch-eth-1drcl2xcbase-eth-4memif-2drcl2xc.yaml
new file mode 100644
index 0000000000..150772ca25
--- /dev/null
+++ b/resources/templates/kubernetes/configmaps/ch-eth-1drcl2xcbase-eth-4memif-2drcl2xc.yaml
@@ -0,0 +1,72 @@
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: sfc-controller-cfg
+  namespace: csit
+data:
+  etcd.conf: |
+    insecure-transport: true
+    dial-timeout: 1000000000
+    endpoints:
+      - "172.17.0.1:22379"
+
+  sfc.conf: |
+    sfc_controller_config_version: 1
+    description: $$TEST_NAME$$
+    host_entities:
+      - name: vswitch
+    sfc_entities:
+      - name: vswitch-vnf1
+        description: vswitch to VNF1 - memif
+        type: 4
+        elements:
+          - container: vswitch
+            port_label: $$VSWITCH_IF1$$
+            etcd_vpp_switch_key: vswitch
+            type: 5
+          - container: vnf1
+            port_label: port1
+            etcd_vpp_switch_key: vswitch
+            type: 2
+      - name: vswitch-vnf2
+        description: VNF2 to vswitch - memif
+        type: 4
+        elements:
+          - container: vswitch
+            port_label: $$VSWITCH_IF2$$
+            etcd_vpp_switch_key: vswitch
+            type: 5
+          - container: vnf2
+            port_label: port2
+            etcd_vpp_switch_key: vswitch
+            type: 2
+      - name: vnf1-vnf2
+        description: vnf1 to vnf2 via vswitch - memifs
+        type: 5
+        elements:
+          - container: vnf1
+            port_label: port2
+            etcd_vpp_switch_key: vswitch
+            type: 2
+          - container: vnf2
+            port_label: port1
+            etcd_vpp_switch_key: vswitch
+            type: 2
+
+  vnf.conf: |
+    vnf_plugin_config_version: 1
+    description: VNF config
+    vnf_entities:
+      - name: vnf1
+        container: vnf1
+        l2xconnects:
+          - port_labels:
+            - port1
+            - port2
+      - name: vnf2
+        container: vnf2
+        l2xconnects:
+          - port_labels:
+            - port1
+            - port2
diff --git a/resources/templates/kubernetes/configmaps/ch-eth-1drcl2xcbase-eth-8memif-4drcl2xc.yaml b/resources/templates/kubernetes/configmaps/ch-eth-1drcl2xcbase-eth-8memif-4drcl2xc.yaml
new file mode 100644
index 0000000000..a9f07775e5
--- /dev/null
+++ b/resources/templates/kubernetes/configmaps/ch-eth-1drcl2xcbase-eth-8memif-4drcl2xc.yaml
@@ -0,0 +1,108 @@
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: sfc-controller-cfg
+  namespace: csit
+data:
+  etcd.conf: |
+    insecure-transport: true
+    dial-timeout: 1000000000
+    endpoints:
+      - "172.17.0.1:22379"
+
+  sfc.conf: |
+    sfc_controller_config_version: 1
+    description: $$TEST_NAME$$
+    host_entities:
+      - name: vswitch
+    sfc_entities:
+      - name: vswitch-vnf1
+        description: vswitch to VNF1 - memif
+        type: 4
+        elements:
+          - container: vswitch
+            port_label: $$VSWITCH_IF1$$
+            etcd_vpp_switch_key: vswitch
+            type: 5
+          - container: vnf1
+            port_label: port1
+            etcd_vpp_switch_key: vswitch
+            type: 2
+      - name: vswitch-vnf4
+        description: VNF4 to vswitch - memif
+        type: 4
+        elements:
+          - container: vswitch
+            port_label: $$VSWITCH_IF2$$
+            etcd_vpp_switch_key: vswitch
+            type: 5
+          - container: vnf4
+            port_label: port2
+            etcd_vpp_switch_key: vswitch
+            type: 2
+      - name: vnf1-vnf2
+        description: vnf1 to vnf2 via vswitch - memifs
+        type: 5
+        elements:
+          - container: vnf1
+            port_label: port2
+            etcd_vpp_switch_key: vswitch
+            type: 2
+          - container: vnf2
+            port_label: port1
+            etcd_vpp_switch_key: vswitch
+            type: 2
+      - name: vnf2-vnf3
+        description: vnf2 to vnf3 via vswitch memifs
+        type: 5
+        elements:
+          - container: vnf2
+            port_label: port2
+            etcd_vpp_switch_key: vswitch
+            type: 2
+          - container: vnf3
+            port_label: port1
+            etcd_vpp_switch_key: vswitch
+            type: 2
+      - name: vnf3-vnf4
+        description: vnf3 to vnf4 via vswitch memifs
+        type: 5
+        elements:
+          - container: vnf3
+            port_label: port2
+            etcd_vpp_switch_key: vswitch
+            type: 2
+          - container: vnf4
+            port_label: port1
+            etcd_vpp_switch_key: vswitch
+            type: 2
+
+  vnf.conf: |
+    vnf_plugin_config_version: 1
+    description: VNF config
+    vnf_entities:
+      - name: vnf1
+        container: vnf1
+        l2xconnects:
+          - port_labels:
+            - port1
+            - port2
+      - name: vnf2
+        container: vnf2
+        l2xconnects:
+          - port_labels:
+            - port1
+            - port2
+      - name: vnf3
+        container: vnf3
+        l2xconnects:
+          - port_labels:
+            - port1
+            - port2
+      - name: vnf4
+        container: vnf4
+        l2xconnects:
+          - port_labels:
+            - port1
+            - port2
diff --git a/resources/templates/kubernetes/configmaps/ho-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc.yaml b/resources/templates/kubernetes/configmaps/ho-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc.yaml
new file mode 100644
index 0000000000..c9693aa9a1
--- /dev/null
+++ b/resources/templates/kubernetes/configmaps/ho-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc.yaml
@@ -0,0 +1,72 @@
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: sfc-controller-cfg
+  namespace: csit
+data:
+  etcd.conf: |
+    insecure-transport: true
+    dial-timeout: 1000000000
+    endpoints:
+      - "172.17.0.1:22379"
+
+  sfc.conf: |
+    sfc_controller_config_version: 1
+    description: $$TEST_NAME$$
+    host_entities:
+      - name: vswitch
+    sfc_entities:
+      - name: vswitch-vnf1
+        description: vswitch to VNF1 - memif
+        type: 3
+        elements:
+          - container: vswitch
+            port_label: $$VSWITCH_IF1$$
+            etcd_vpp_switch_key: vswitch
+            type: 5
+          - container: vnf1
+            port_label: port1
+            etcd_vpp_switch_key: vswitch
+            type: 2
+      - name: vswitch-vnf2
+        description: VNF2 to vswitch - memif
+        type: 3
+        elements:
+          - container: vswitch
+            port_label: $$VSWITCH_IF2$$
+            etcd_vpp_switch_key: vswitch
+            type: 5
+          - container: vnf2
+            port_label: port2
+            etcd_vpp_switch_key: vswitch
+            type: 2
+      - name: vnf1-vnf2
+        description: vnf1 to vnf2 via direct - memifs
+        type: 6
+        elements:
+          - container: vnf1
+            port_label: port2
+            etcd_vpp_switch_key: vswitch
+            type: 2
+          - container: vnf2
+            port_label: port1
+            etcd_vpp_switch_key: vswitch
+            type: 2
+
+  vnf.conf: |
+    vnf_plugin_config_version: 1
+    description: VNF config
+    vnf_entities:
+      - name: vnf1
+        container: vnf1
+        l2xconnects:
+          - port_labels:
+            - port1
+            - port2
+      - name: vnf2
+        container: vnf2
+        l2xconnects:
+          - port_labels:
+            - port1
+            - port2
diff --git a/resources/templates/kubernetes/configmaps/ho-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc.yaml b/resources/templates/kubernetes/configmaps/ho-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc.yaml
new file mode 100644
index 0000000000..4a2ba86977
--- /dev/null
+++ b/resources/templates/kubernetes/configmaps/ho-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc.yaml
@@ -0,0 +1,108 @@
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: sfc-controller-cfg
+  namespace: csit
+data:
+  etcd.conf: |
+    insecure-transport: true
+    dial-timeout: 1000000000
+    endpoints:
+      - "172.17.0.1:22379"
+
+  sfc.conf: |
+    sfc_controller_config_version: 1
+    description: $$TEST_NAME$$
+    host_entities:
+      - name: vswitch
+    sfc_entities:
+      - name: vswitch-vnf1
+        description: vswitch to VNF1 - memif
+        type: 3
+        elements:
+          - container: vswitch
+            port_label: $$VSWITCH_IF1$$
+            etcd_vpp_switch_key: vswitch
+            type: 5
+          - container: vnf1
+            port_label: port1
+            etcd_vpp_switch_key: vswitch
+            type: 2
+      - name: vswitch-vnf4
+        description: VNF4 to vswitch - memif
+        type: 3
+        elements:
+          - container: vswitch
+            port_label: $$VSWITCH_IF2$$
+            etcd_vpp_switch_key: vswitch
+            type: 5
+          - container: vnf4
+            port_label: port2
+            etcd_vpp_switch_key: vswitch
+            type: 2
+      - name: vnf1-vnf2
+        description: vnf1 to vnf2 via direct - memifs
+        type: 6
+        elements:
+          - container: vnf1
+            port_label: port2
+            etcd_vpp_switch_key: vswitch
+            type: 2
+          - container: vnf2
+            port_label: port1
+            etcd_vpp_switch_key: vswitch
+            type: 2
+      - name: vnf2-vnf3
+        description: vnf2 to vnf3 via direct - memifs
+        type: 6
+        elements:
+          - container: vnf2
+            port_label: port2
+            etcd_vpp_switch_key: vswitch
+            type: 2
+          - container: vnf3
+            port_label: port1
+            etcd_vpp_switch_key: vswitch
+            type: 2
+      - name: vnf3-vnf4
+        description: vnf3 to vnf4 via direct - memifs
+        type: 6
+        elements:
+          - container: vnf3
+            port_label: port2
+            etcd_vpp_switch_key: vswitch
+            type: 2
+          - container: vnf4
+            port_label: port1
+            etcd_vpp_switch_key: vswitch
+            type: 2
+
+  vnf.conf: |
+    vnf_plugin_config_version: 1
+    description: VNF config
+    vnf_entities:
+      - name: vnf1
+        container: vnf1
+        l2xconnects:
+          - port_labels:
+            - port1
+            - port2
+      - name: vnf2
+        container: vnf2
+        l2xconnects:
+          - port_labels:
+            - port1
+            - port2
+      - name: vnf3
+        container: vnf3
+        l2xconnects:
+          - port_labels:
+            - port1
+            - port2
+      - name: vnf4
+        container: vnf4
+        l2xconnects:
+          - port_labels:
+            - port1
+            - port2
diff --git a/resources/templates/kubernetes/configmaps/ho-eth-1drcl2xcbase-eth-2memif-2drcl2xc.yaml b/resources/templates/kubernetes/configmaps/ho-eth-1drcl2xcbase-eth-2memif-2drcl2xc.yaml
new file mode 100644
index 0000000000..9b4c189cac
--- /dev/null
+++ b/resources/templates/kubernetes/configmaps/ho-eth-1drcl2xcbase-eth-2memif-2drcl2xc.yaml
@@ -0,0 +1,72 @@
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: sfc-controller-cfg
+  namespace: csit
+data:
+  etcd.conf: |
+    insecure-transport: true
+    dial-timeout: 1000000000
+    endpoints:
+      - "172.17.0.1:22379"
+
+  sfc.conf: |
+    sfc_controller_config_version: 1
+    description: $$TEST_NAME$$
+    host_entities:
+      - name: vswitch
+    sfc_entities:
+      - name: vswitch-vnf1
+        description: vswitch to VNF1 - memif
+        type: 4
+        elements:
+          - container: vswitch
+            port_label: $$VSWITCH_IF1$$
+            etcd_vpp_switch_key: vswitch
+            type: 5
+          - container: vnf1
+            port_label: port1
+            etcd_vpp_switch_key: vswitch
+            type: 2
+      - name: vswitch-vnf2
+        description: VNF2 to vswitch - memif
+        type: 4
+        elements:
+          - container: vswitch
+            port_label: $$VSWITCH_IF2$$
+            etcd_vpp_switch_key: vswitch
+            type: 5
+          - container: vnf2
+            port_label: port2
+            etcd_vpp_switch_key: vswitch
+            type: 2
+      - name: vnf1-vnf2
+        description: vnf1 to vnf2 via vswitch - memifs
+        type: 6
+        elements:
+          - container: vnf1
+            port_label: port2
+            etcd_vpp_switch_key: vswitch
+            type: 2
+          - container: vnf2
+            port_label: port1
+            etcd_vpp_switch_key: vswitch
+            type: 2
+
+  vnf.conf: |
+    vnf_plugin_config_version: 1
+    description: VNF config
+    vnf_entities:
+      - name: vnf1
+        container: vnf1
+        l2xconnects:
+          - port_labels:
+            - port1
+            - port2
+      - name: vnf2
+        container: vnf2
+        l2xconnects:
+          - port_labels:
+            - port1
+            - port2
diff --git a/resources/templates/kubernetes/configmaps/ho-eth-1drcl2xcbase-eth-2memif-4drcl2xc.yaml b/resources/templates/kubernetes/configmaps/ho-eth-1drcl2xcbase-eth-2memif-4drcl2xc.yaml
new file mode 100644
index 0000000000..eeffa52784
--- /dev/null
+++ b/resources/templates/kubernetes/configmaps/ho-eth-1drcl2xcbase-eth-2memif-4drcl2xc.yaml
@@ -0,0 +1,108 @@
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: sfc-controller-cfg
+  namespace: csit
+data:
+  etcd.conf: |
+    insecure-transport: true
+    dial-timeout: 1000000000
+    endpoints:
+      - "172.17.0.1:22379"
+
+  sfc.conf: |
+    sfc_controller_config_version: 1
+    description: $$TEST_NAME$$
+    host_entities:
+      - name: vswitch
+    sfc_entities:
+      - name: vswitch-vnf1
+        description: vswitch to VNF1 - memif
+        type: 4
+        elements:
+          - container: vswitch
+            port_label: $$VSWITCH_IF1$$
+            etcd_vpp_switch_key: vswitch
+            type: 5
+          - container: vnf1
+            port_label: port1
+            etcd_vpp_switch_key: vswitch
+            type: 2
+      - name: vswitch-vnf4
+        description: VNF4 to vswitch - memif
+        type: 4
+        elements:
+          - container: vswitch
+            port_label: $$VSWITCH_IF2$$
+            etcd_vpp_switch_key: vswitch
+            type: 5
+          - container: vnf4
+            port_label: port2
+            etcd_vpp_switch_key: vswitch
+            type: 2
+      - name: vnf1-vnf2
+        description: vnf1 to vnf2 via vswitch - memifs
+        type: 6
+        elements:
+          - container: vnf1
+            port_label: port2
+            etcd_vpp_switch_key: vswitch
+            type: 2
+          - container: vnf2
+            port_label: port1
+            etcd_vpp_switch_key: vswitch
+            type: 2
+      - name: vnf2-vnf3
+        description: vnf2 to vnf3 via direct memifs
+        type: 6
+        elements:
+          - container: vnf2
+            port_label: port2
+            etcd_vpp_switch_key: vswitch
+            type: 2
+          - container: vnf3
+            port_label: port1
+            etcd_vpp_switch_key: vswitch
+            type: 2
+      - name: vnf3-vnf4
+        description: vnf3 to vnf4 via direct memifs
+        type: 6
+        elements:
+          - container: vnf3
+            port_label: port2
+            etcd_vpp_switch_key: vswitch
+            type: 2
+          - container: vnf4
+            port_label: port1
+            etcd_vpp_switch_key: vswitch
+            type: 2
+
+  vnf.conf: |
+    vnf_plugin_config_version: 1
+    description: VNF config
+    vnf_entities:
+      - name: vnf1
+        container: vnf1
+        l2xconnects:
+          - port_labels:
+            - port1
+            - port2
+      - name: vnf2
+        container: vnf2
+        l2xconnects:
+          - port_labels:
+            - port1
+            - port2
+      - name: vnf3
+        container: vnf3
+        l2xconnects:
+          - port_labels:
+            - port1
+            - port2
+      - name: vnf4
+        container: vnf4
+        l2xconnects:
+          - port_labels:
+            - port1
+            - port2
diff --git a/resources/templates/kubernetes/configmaps/pa-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc.yaml b/resources/templates/kubernetes/configmaps/pa-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc.yaml
new file mode 100644
index 0000000000..b3b2d6ec80
--- /dev/null
+++ b/resources/templates/kubernetes/configmaps/pa-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc.yaml
@@ -0,0 +1,62 @@
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: sfc-controller-cfg
+  namespace: csit
+data:
+  etcd.conf: |
+    insecure-transport: true
+    dial-timeout: 1000000000
+    endpoints:
+      - "172.17.0.1:22379"
+
+  sfc.conf: |
+    sfc_controller_config_version: 1
+    description: $$TEST_NAME$$
+    host_entities:
+      - name: vswitch
+    sfc_entities:
+      - name: vswitch-vnf1
+        description: vswitch to VNF1 - memif
+        type: 3
+        elements:
+          - container: vswitch
+            port_label: $$VSWITCH_IF1$$
+            etcd_vpp_switch_key: vswitch
+            l2fib_macs:
+              - "$$TG_IF1_MAC1$$"
+            type: 5
+          - container: vnf1
+            port_label: port1
+            etcd_vpp_switch_key: vswitch
+            l2fib_macs:
+              - "$$TG_IF2_MAC1$$"
+            type: 2
+      - name: vnf1-vswitch
+        description: VNF1 to vswitch - memif
+        type: 3
+        elements:
+          - container: vswitch
+            port_label: $$VSWITCH_IF2$$
+            etcd_vpp_switch_key: vswitch
+            l2fib_macs:
+              - "$$TG_IF2_MAC1$$"
+            type: 5
+          - container: vnf1
+            port_label: port2
+            etcd_vpp_switch_key: vswitch
+            l2fib_macs:
+              - "$$TG_IF1_MAC1$$"
+            type: 2
+
+  vnf.conf: |
+    vnf_plugin_config_version: 1
+    description: VNF config
+    vnf_entities:
+      - name: vnf1
+        container: vnf1
+        l2xconnects:
+          - port_labels:
+            - port1
+            - port2
\ No newline at end of file
diff --git a/resources/templates/kubernetes/configmaps/pa-eth-1drcl2xcbase-eth-2memif-1drcl2xc.yaml b/resources/templates/kubernetes/configmaps/pa-eth-1drcl2xcbase-eth-2memif-1drcl2xc.yaml
new file mode 100644
index 0000000000..ed23311278
--- /dev/null
+++ b/resources/templates/kubernetes/configmaps/pa-eth-1drcl2xcbase-eth-2memif-1drcl2xc.yaml
@@ -0,0 +1,54 @@
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: sfc-controller-cfg
+  namespace: csit
+data:
+  etcd.conf: |
+    insecure-transport: true
+    dial-timeout: 1000000000
+    endpoints:
+      - "172.17.0.1:22379"
+
+  sfc.conf: |
+    sfc_controller_config_version: 1
+    description: $$TEST_NAME$$
+    host_entities:
+      - name: vswitch
+    sfc_entities:
+      - name: vswitch-vnf1
+        description: vswitch to VNF1 - memif
+        type: 4
+        elements:
+          - container: vswitch
+            port_label: $$VSWITCH_IF1$$
+            etcd_vpp_switch_key: vswitch
+            type: 5
+          - container: vnf1
+            port_label: port1
+            etcd_vpp_switch_key: vswitch
+            type: 2
+      - name: vnf1-vswitch
+        description: VNF1 to vswitch - memif
+        type: 4
+        elements:
+          - container: vswitch
+            port_label: $$VSWITCH_IF2$$
+            etcd_vpp_switch_key: vswitch
+            type: 5
+          - container: vnf1
+            port_label: port2
+            etcd_vpp_switch_key: vswitch
+            type: 2
+
+  vnf.conf: |
+    vnf_plugin_config_version: 1
+    description: VNF config
+    vnf_entities:
+      - name: vnf1
+        container: vnf1
+        l2xconnects:
+          - port_labels:
+            - port1
+            - port2
diff --git a/resources/templates/kubernetes/configmaps/vnf-agent-cfg.yaml b/resources/templates/kubernetes/configmaps/vnf-agent-cfg.yaml
new file mode 100644
index 0000000000..77869d4111
--- /dev/null
+++ b/resources/templates/kubernetes/configmaps/vnf-agent-cfg.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: vnf-agent-cfg
+  namespace: csit
+data:
+  etcd.conf: |
+    insecure-transport: true
+    dial-timeout: 1000000000
+    endpoints:
+      - "172.17.0.1:22379"
+
+  kafka.conf: |
+    addrs:
+      - "172.17.0.1:9092"
\ No newline at end of file
diff --git a/resources/templates/kubernetes/configmaps/vswitch-agent-cfg.yaml b/resources/templates/kubernetes/configmaps/vswitch-agent-cfg.yaml
new file mode 100644
index 0000000000..5c97b4d64f
--- /dev/null
+++ b/resources/templates/kubernetes/configmaps/vswitch-agent-cfg.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: vswitch-agent-cfg
+  namespace: csit
+data:
+  etcd.conf: |
+    insecure-transport: true
+    dial-timeout: 1000000000
+    endpoints:
+      - "172.17.0.1:22379"
+
+  kafka.conf: |
+    addrs:
+      - "172.17.0.1:9092"
\ No newline at end of file
diff --git a/resources/templates/kubernetes/eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc.yaml b/resources/templates/kubernetes/eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc.yaml
deleted file mode 100644
index 726e9734ab..0000000000
--- a/resources/templates/kubernetes/eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc.yaml
+++ /dev/null
@@ -1,206 +0,0 @@
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: sfc-controller-cfg
-  namespace: csit
-data:
-  etcd.conf:
-    insecure-transport: true
-    dial-timeout: 1000000000
-    endpoints:
-      - "172.17.0.1:22379"
-
-  sfc.conf:
-    sfc_controller_config_version: 1
-    description: $$TEST_NAME$$
-    host_entities:
-      - name: vswitch
-    sfc_entities:
-      - name: vswitch-vnf1
-        description: vswitch to VNF1 - memif
-        type: 3
-        elements:
-          - container: vswitch
-            port_label: $$VSWITCH_IF1$$
-            etcd_vpp_switch_key: vswitch
-            type: 5
-          - container: vnf1
-            port_label: port1
-            etcd_vpp_switch_key: vswitch
-            type: 2
-      - name: vnf1-vswitch
-        description: VNF1 to vswitch - memif
-        type: 3
-        elements:
-          - container: vswitch
-            port_label: $$VSWITCH_IF2$$
-            etcd_vpp_switch_key: vswitch
-            type: 5
-          - container: vnf1
-            port_label: port2
-            etcd_vpp_switch_key: vswitch
-            type: 2
-
-  vnf.conf:
-    vnf_plugin_config_version: 1
-    description: VNF config
-    vnf_entities:
-      - name: vnf1
-        container: vnf1
-        l2xconnects:
-          - port_labels:
-            - port1
-            - port2
-
----
-apiVersion: v1
-kind: Pod
-metadata:
-  name: sfc-controller
-  namespace: csit
-spec:
-  containers:
-    - name: "sfc-controller"
-      image: prod_sfc_controller
-      imagePullPolicy: IfNotPresent
-      command:
-        - /bin/sfc-controller
-        - -etcdv3-config=/opt/sfc-controller/dev/etcd.conf
-        - -sfc-config=/opt/sfc-controller/dev/sfc.conf
-        - -vnf-config=/opt/sfc-controller/dev/vnf.conf
-      volumeMounts:
-        - name: controller-config
-          mountPath: /opt/sfc-controller/dev
-  volumes:
-    - name: controller-config
-      configMap:
-        name: sfc-controller-cfg
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: vswitch-agent-cfg
-  namespace: csit
-data:
-  etcd.conf:
-    insecure-transport: true
-    dial-timeout: 1000000000
-    endpoints:
-      - "172.17.0.1:22379"
-
-  kafka.conf:
-    addrs:
-      - "172.17.0.1:9092"
-
----
-apiVersion: v1
-kind: Pod
-metadata:
-  name: vswitch-vpp
-  namespace: csit
-spec:
-  hostNetwork: true
-  containers:
-    - name: "vswitch"
-      image: prod_vpp_agent_shrink
-      imagePullPolicy: IfNotPresent
-      securityContext:
-        privileged: true
-      ports:
-        - containerPort: 5002
-        - containerPort: 9191
-      readinessProbe:
-        httpGet:
-          path: /readiness
-          port: 9191
-        periodSeconds: 1
-      livenessProbe:
-        httpGet:
-          path: /liveness
-          port: 9191
-        periodSeconds: 1
-        initialDelaySeconds: 15
-      env:
-        - name: MICROSERVICE_LABEL
-          value: vswitch
-      volumeMounts:
-        - name: vpp-config
-          mountPath: /etc/vpp
-        - name: agent-config
-          mountPath: /opt/vpp-agent/dev
-        - name: memif-sockets
-          mountPath: /tmp
-  volumes:
-    - name: vpp-config
-      configMap:
-        name: vswitch-vpp-cfg
-    - name: agent-config
-      configMap:
-        name: vswitch-agent-cfg
-    - name: memif-sockets
-      hostPath:
-        path: /tmp
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: vnf-agent-cfg
-  namespace: csit
-data:
-  etcd.conf:
-    insecure-transport: true
-    dial-timeout: 1000000000
-    endpoints:
-      - "172.17.0.1:22379"
-
-  kafka.conf:
-    addrs:
-      - "172.17.0.1:9092"
-
----
-apiVersion: v1
-kind: Pod
-metadata:
-  name: vnf-vpp
-  namespace: csit
-spec:
-  containers:
-    - name: "vnf"
-      image: prod_vpp_agent_shrink
-      imagePullPolicy: IfNotPresent
-      securityContext:
-        privileged: true
-      ports:
-        - containerPort: 5002
-        - containerPort: 9191
-      readinessProbe:
-        httpGet:
-          path: /readiness
-          port: 9191
-        periodSeconds: 1
-      livenessProbe:
-        httpGet:
-          path: /liveness
-          port: 9191
-        initialDelaySeconds: 15
-      env:
-        - name: MICROSERVICE_LABEL
-          value: vnf1
-      volumeMounts:
-        - name: vpp-config
-          mountPath: /etc/vpp
-        - name: agent-config
-          mountPath: /opt/vpp-agent/dev
-        - name: memif-sockets
-          mountPath: /tmp
-  volumes:
-  - name: vpp-config
-    configMap:
-      name: vnf-vpp-cfg
-  - name: agent-config
-    configMap:
-      name: vnf-agent-cfg
-  - name: memif-sockets
-    hostPath:
-      path: /tmp
diff --git a/resources/templates/kubernetes/eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc.yaml b/resources/templates/kubernetes/eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc.yaml
deleted file mode 100644
index 5bf290d0ee..0000000000
--- a/resources/templates/kubernetes/eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc.yaml
+++ /dev/null
@@ -1,271 +0,0 @@
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: sfc-controller-cfg
-  namespace: csit
-data:
-  etcd.conf:
-    insecure-transport: true
-    dial-timeout: 1000000000
-    endpoints:
-      - "172.17.0.1:22379"
-
-  sfc.conf:
-    sfc_controller_config_version: 1
-    description: $$TEST_NAME$$
-    host_entities:
-      - name: vswitch
-    sfc_entities:
-      - name: vswitch-vnf1
-        description: vswitch to VNF1 - memif
-        type: 3
-        elements:
-          - container: vswitch
-            port_label: $$VSWITCH_IF1$$
-            etcd_vpp_switch_key: vswitch
-            type: 5
-          - container: vnf1
-            port_label: port1
-            etcd_vpp_switch_key: vswitch
-            type: 2
-      - name: vswitch-vnf2
-        description: VNF2 to vswitch - memif
-        type: 3
-        elements:
-          - container: vswitch
-            port_label: $$VSWITCH_IF2$$
-            etcd_vpp_switch_key: vswitch
-            type: 5
-          - container: vnf2
-            port_label: port2
-            etcd_vpp_switch_key: vswitch
-            type: 2
-      - name: vnf1-vnf2
-        description: vnf1 to vnf2 via vswitch - memifs
-        type: 2
-        elements:
-          - container: vnf1
-            port_label: port2
-            etcd_vpp_switch_key: vswitch
-            type: 2
-          - container: vnf2
-            port_label: port1
-            etcd_vpp_switch_key: vswitch
-            type: 2
-
-  vnf.conf:
-    vnf_plugin_config_version: 1
-    description: VNF config
-    vnf_entities:
-      - name: vnf1
-        container: vnf1
-        l2xconnects:
-          - port_labels:
-            - port1
-            - port2
-      - name: vnf2
-        container: vnf2
-        l2xconnects:
-          - port_labels:
-            - port1
-            - port2
-
----
-apiVersion: v1
-kind: Pod
-metadata:
-  name: sfc-controller
-  namespace: csit
-spec:
-  containers:
-    - name: "sfc-controller"
-      image: prod_sfc_controller
-      imagePullPolicy: IfNotPresent
-      command:
-        - /bin/sfc-controller
-        - -etcdv3-config=/opt/sfc-controller/dev/etcd.conf
-        - -sfc-config=/opt/sfc-controller/dev/sfc.conf
-        - -vnf-config=/opt/sfc-controller/dev/vnf.conf
-      volumeMounts:
-        - name: controller-config
-          mountPath: /opt/sfc-controller/dev
-  volumes:
-    - name: controller-config
-      configMap:
-        name: sfc-controller-cfg
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: vswitch-agent-cfg
-  namespace: csit
-data:
-  etcd.conf:
-    insecure-transport: true
-    dial-timeout: 1000000000
-    endpoints:
-      - "172.17.0.1:22379"
-
-  kafka.conf:
-    addrs:
-      - "172.17.0.1:9092"
-
----
-apiVersion: v1
-kind: Pod
-metadata:
-  name: vswitch-vpp
-  namespace: csit
-spec:
-  hostNetwork: true
-  containers:
-    - name: "vswitch"
-      image: prod_vpp_agent_shrink
-      imagePullPolicy: IfNotPresent
-      securityContext:
-        privileged: true
-      ports:
-        - containerPort: 5002
-        - containerPort: 9191
-      readinessProbe:
-        httpGet:
-          path: /readiness
-          port: 9191
-        periodSeconds: 1
-      livenessProbe:
-        httpGet:
-          path: /liveness
-          port: 9191
-        periodSeconds: 1
-        initialDelaySeconds: 15
-      env:
-        - name: MICROSERVICE_LABEL
-          value: vswitch
-      volumeMounts:
-        - name: vpp-config
-          mountPath: /etc/vpp
-        - name: agent-config
-          mountPath: /opt/vpp-agent/dev
-        - name: memif-sockets
-          mountPath: /tmp
-  volumes:
-    - name: vpp-config
-      configMap:
-        name: vswitch-vpp-cfg
-    - name: agent-config
-      configMap:
-        name: vswitch-agent-cfg
-    - name: memif-sockets
-      hostPath:
-        path: /tmp
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: vnf-agent-cfg
-  namespace: csit
-data:
-  etcd.conf:
-    insecure-transport: true
-    dial-timeout: 1000000000
-    endpoints:
-      - "172.17.0.1:22379"
-
-  kafka.conf:
-    addrs:
-      - "172.17.0.1:9092"
-
----
-apiVersion: v1
-kind: Pod
-metadata:
-  name: vnf1-vpp
-  namespace: csit
-spec:
-  containers:
-    - name: "vnf1"
-      image: prod_vpp_agent_shrink
-      imagePullPolicy: IfNotPresent
-      securityContext:
-        privileged: true
-      ports:
-        - containerPort: 5002
-        - containerPort: 9191
-      readinessProbe:
-        httpGet:
-          path: /readiness
-          port: 9191
-        periodSeconds: 1
-      livenessProbe:
-        httpGet:
-          path: /liveness
-          port: 9191
-        initialDelaySeconds: 15
-      env:
-        - name: MICROSERVICE_LABEL
-          value: vnf1
-      volumeMounts:
-        - name: vpp-config
-          mountPath: /etc/vpp
-        - name: agent-config
-          mountPath: /opt/vpp-agent/dev
-        - name: memif-sockets
-          mountPath: /tmp
-  volumes:
-  - name: vpp-config
-    configMap:
-      name: vnf1-vpp-cfg
-  - name: agent-config
-    configMap:
-      name: vnf-agent-cfg
-  - name: memif-sockets
-    hostPath:
-      path: /tmp
-
----
-apiVersion: v1
-kind: Pod
-metadata:
-  name: vnf2-vpp
-  namespace: csit
-spec:
-  containers:
-    - name: "vnf2"
-      image: prod_vpp_agent_shrink
-      imagePullPolicy: IfNotPresent
-      securityContext:
-        privileged: true
-      ports:
-        - containerPort: 5002
-        - containerPort: 9191
-      readinessProbe:
-        httpGet:
-          path: /readiness
-          port: 9191
-        periodSeconds: 1
-      livenessProbe:
-        httpGet:
-          path: /liveness
-          port: 9191
-        initialDelaySeconds: 15
-      env:
-        - name: MICROSERVICE_LABEL
-          value: vnf2
-      volumeMounts:
-        - name: vpp-config
-          mountPath: /etc/vpp
-        - name: agent-config
-          mountPath: /opt/vpp-agent/dev
-        - name: memif-sockets
-          mountPath: /tmp
-  volumes:
-  - name: vpp-config
-    configMap:
-      name: vnf2-vpp-cfg
-  - name: agent-config
-    configMap:
-      name: vnf-agent-cfg
-  - name: memif-sockets
-    hostPath:
-      path: /tmp
diff --git a/resources/templates/kubernetes/eth-1drcl2xcbase-eth-2memif-1drcl2xc.yaml b/resources/templates/kubernetes/eth-1drcl2xcbase-eth-2memif-1drcl2xc.yaml
deleted file mode 100644
index 7514eeb181..0000000000
--- a/resources/templates/kubernetes/eth-1drcl2xcbase-eth-2memif-1drcl2xc.yaml
+++ /dev/null
@@ -1,206 +0,0 @@
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: sfc-controller-cfg
-  namespace: csit
-data:
-  etcd.conf:
-    insecure-transport: true
-    dial-timeout: 1000000000
-    endpoints:
-      - "172.17.0.1:22379"
-
-  sfc.conf:
-    sfc_controller_config_version: 1
-    description: $$TEST_NAME$$
-    host_entities:
-      - name: vswitch
-    sfc_entities:
-      - name: vswitch-vnf1
-        description: vswitch to VNF1 - memif
-        type: 4
-        elements:
-          - container: vswitch
-            port_label: $$VSWITCH_IF1$$
-            etcd_vpp_switch_key: vswitch
-            type: 5
-          - container: vnf1
-            port_label: port1
-            etcd_vpp_switch_key: vswitch
-            type: 2
-      - name: vnf1-vswitch
-        description: VNF1 to vswitch - memif
-        type: 4
-        elements:
-          - container: vswitch
-            port_label: $$VSWITCH_IF2$$
-            etcd_vpp_switch_key: vswitch
-            type: 5
-          - container: vnf1
-            port_label: port2
-            etcd_vpp_switch_key: vswitch
-            type: 2
-
-  vnf.conf:
-    vnf_plugin_config_version: 1
-    description: VNF config
-    vnf_entities:
-      - name: vnf1
-        container: vnf1
-        l2xconnects:
-          - port_labels:
-            - port1
-            - port2
-
----
-apiVersion: v1
-kind: Pod
-metadata:
-  name: sfc-controller
-  namespace: csit
-spec:
-  containers:
-    - name: "sfc-controller"
-      image: prod_sfc_controller
-      imagePullPolicy: IfNotPresent
-      command:
-        - /bin/sfc-controller
-        - -etcdv3-config=/opt/sfc-controller/dev/etcd.conf
-        - -sfc-config=/opt/sfc-controller/dev/sfc.conf
-        - -vnf-config=/opt/sfc-controller/dev/vnf.conf
-      volumeMounts:
-        - name: controller-config
-          mountPath: /opt/sfc-controller/dev
-  volumes:
-    - name: controller-config
-      configMap:
-        name: sfc-controller-cfg
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: vswitch-agent-cfg
-  namespace: csit
-data:
-  etcd.conf:
-    insecure-transport: true
-    dial-timeout: 1000000000
-    endpoints:
-      - "172.17.0.1:22379"
-
-  kafka.conf:
-    addrs:
-      - "172.17.0.1:9092"
-
----
-apiVersion: v1
-kind: Pod
-metadata:
-  name: vswitch-vpp
-  namespace: csit
-spec:
-  hostNetwork: true
-  containers:
-    - name: "vswitch"
-      image: prod_vpp_agent_shrink
-      imagePullPolicy: IfNotPresent
-      securityContext:
-        privileged: true
-      ports:
-        - containerPort: 5002
-        - containerPort: 9191
-      readinessProbe:
-        httpGet:
-          path: /readiness
-          port: 9191
-        periodSeconds: 1
-      livenessProbe:
-        httpGet:
-          path: /liveness
-          port: 9191
-        periodSeconds: 1
-        initialDelaySeconds: 15
-      env:
-        - name: MICROSERVICE_LABEL
-          value: vswitch
-      volumeMounts:
-        - name: vpp-config
-          mountPath: /etc/vpp
-        - name: agent-config
-          mountPath: /opt/vpp-agent/dev
-        - name: memif-sockets
-          mountPath: /tmp
-  volumes:
-    - name: vpp-config
-      configMap:
-        name: vswitch-vpp-cfg
-    - name: agent-config
-      configMap:
-        name: vswitch-agent-cfg
-    - name: memif-sockets
-      hostPath:
-        path: /tmp
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: vnf-agent-cfg
-  namespace: csit
-data:
-  etcd.conf:
-    insecure-transport: true
-    dial-timeout: 1000000000
-    endpoints:
-      - "172.17.0.1:22379"
-
-  kafka.conf:
-    addrs:
-      - "172.17.0.1:9092"
-
----
-apiVersion: v1
-kind: Pod
-metadata:
-  name: vnf-vpp
-  namespace: csit
-spec:
-  containers:
-    - name: "vnf"
-      image: prod_vpp_agent_shrink
-      imagePullPolicy: IfNotPresent
-      securityContext:
-        privileged: true
-      ports:
-        - containerPort: 5002
-        - containerPort: 9191
-      readinessProbe:
-        httpGet:
-          path: /readiness
-          port: 9191
-        periodSeconds: 1
-      livenessProbe:
-        httpGet:
-          path: /liveness
-          port: 9191
-        initialDelaySeconds: 15
-      env:
-        - name: MICROSERVICE_LABEL
-          value: vnf1
-      volumeMounts:
-        - name: vpp-config
-          mountPath: /etc/vpp
-        - name: agent-config
-          mountPath: /opt/vpp-agent/dev
-        - name: memif-sockets
-          mountPath: /tmp
-  volumes:
-  - name: vpp-config
-    configMap:
-      name: vnf-vpp-cfg
-  - name: agent-config
-    configMap:
-      name: vnf-agent-cfg
-  - name: memif-sockets
-    hostPath:
-      path: /tmp
diff --git a/resources/templates/kubernetes/eth-1drcl2xcbase-eth-4memif-2drcl2xc.yaml b/resources/templates/kubernetes/eth-1drcl2xcbase-eth-4memif-2drcl2xc.yaml
deleted file mode 100644
index f2b03e670a..0000000000
--- a/resources/templates/kubernetes/eth-1drcl2xcbase-eth-4memif-2drcl2xc.yaml
+++ /dev/null
@@ -1,271 +0,0 @@
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: sfc-controller-cfg
-  namespace: csit
-data:
-  etcd.conf:
-    insecure-transport: true
-    dial-timeout: 1000000000
-    endpoints:
-      - "172.17.0.1:22379"
-
-  sfc.conf:
-    sfc_controller_config_version: 1
-    description: $$TEST_NAME$$
-    host_entities:
-      - name: vswitch
-    sfc_entities:
-      - name: vswitch-vnf1
-        description: vswitch to VNF1 - memif
-        type: 4
-        elements:
-          - container: vswitch
-            port_label: $$VSWITCH_IF1$$
-            etcd_vpp_switch_key: vswitch
-            type: 5
-          - container: vnf1
-            port_label: port1
-            etcd_vpp_switch_key: vswitch
-            type: 2
-      - name: vswitch-vnf2
-        description: VNF2 to vswitch - memif
-        type: 4
-        elements:
-          - container: vswitch
-            port_label: $$VSWITCH_IF2$$
-            etcd_vpp_switch_key: vswitch
-            type: 5
-          - container: vnf2
-            port_label: port2
-            etcd_vpp_switch_key: vswitch
-            type: 2
-      - name: vnf1-vnf2
-        description: vnf1 to vnf2 via vswitch - memifs
-        type: 5
-        elements:
-          - container: vnf1
-            port_label: port2
-            etcd_vpp_switch_key: vswitch
-            type: 2
-          - container: vnf2
-            port_label: port1
-            etcd_vpp_switch_key: vswitch
-            type: 2
-
-  vnf.conf:
-    vnf_plugin_config_version: 1
-    description: VNF config
-    vnf_entities:
-      - name: vnf1
-        container: vnf1
-        l2xconnects:
-          - port_labels:
-            - port1
-            - port2
-      - name: vnf2
-        container: vnf2
-        l2xconnects:
-          - port_labels:
-            - port1
-            - port2
-
----
-apiVersion: v1
-kind: Pod
-metadata:
-  name: sfc-controller
-  namespace: csit
-spec:
-  containers:
-    - name: "sfc-controller"
-      image: prod_sfc_controller
-      imagePullPolicy: IfNotPresent
-      command:
-        - /bin/sfc-controller
-        - -etcdv3-config=/opt/sfc-controller/dev/etcd.conf
-        - -sfc-config=/opt/sfc-controller/dev/sfc.conf
-        - -vnf-config=/opt/sfc-controller/dev/vnf.conf
-      volumeMounts:
-        - name: controller-config
-          mountPath: /opt/sfc-controller/dev
-  volumes:
-    - name: controller-config
-      configMap:
-        name: sfc-controller-cfg
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: vswitch-agent-cfg
-  namespace: csit
-data:
-  etcd.conf:
-    insecure-transport: true
-    dial-timeout: 1000000000
-    endpoints:
-      - "172.17.0.1:22379"
-
-  kafka.conf:
-    addrs:
-      - "172.17.0.1:9092"
-
----
-apiVersion: v1
-kind: Pod
-metadata:
-  name: vswitch-vpp
-  namespace: csit
-spec:
-  hostNetwork: true
-  containers:
-    - name: "vswitch"
-      image: prod_vpp_agent_shrink
-      imagePullPolicy: IfNotPresent
-      securityContext:
-        privileged: true
-      ports:
-        - containerPort: 5002
-        - containerPort: 9191
-      readinessProbe:
-        httpGet:
-          path: /readiness
-          port: 9191
-        periodSeconds: 1
-      livenessProbe:
-        httpGet:
-          path: /liveness
-          port: 9191
-        periodSeconds: 1
-        initialDelaySeconds: 15
-      env:
-        - name: MICROSERVICE_LABEL
-          value: vswitch
-      volumeMounts:
-        - name: vpp-config
-          mountPath: /etc/vpp
-        - name: agent-config
-          mountPath: /opt/vpp-agent/dev
-        - name: memif-sockets
-          mountPath: /tmp
-  volumes:
-    - name: vpp-config
-      configMap:
-        name: vswitch-vpp-cfg
-    - name: agent-config
-      configMap:
-        name: vswitch-agent-cfg
-    - name: memif-sockets
-      hostPath:
-        path: /tmp
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: vnf-agent-cfg
-  namespace: csit
-data:
-  etcd.conf:
-    insecure-transport: true
-    dial-timeout: 1000000000
-    endpoints:
-      - "172.17.0.1:22379"
-
-  kafka.conf:
-    addrs:
-      - "172.17.0.1:9092"
-
----
-apiVersion: v1
-kind: Pod
-metadata:
-  name: vnf1-vpp
-  namespace: csit
-spec:
-  containers:
-    - name: "vnf1"
-      image: prod_vpp_agent_shrink
-      imagePullPolicy: IfNotPresent
-      securityContext:
-        privileged: true
-      ports:
-        - containerPort: 5002
-        - containerPort: 9191
-      readinessProbe:
-        httpGet:
-          path: /readiness
-          port: 9191
-        periodSeconds: 1
-      livenessProbe:
-        httpGet:
-          path: /liveness
-          port: 9191
-        initialDelaySeconds: 15
-      env:
-        - name: MICROSERVICE_LABEL
-          value: vnf1
-      volumeMounts:
-        - name: vpp-config
-          mountPath: /etc/vpp
-        - name: agent-config
-          mountPath: /opt/vpp-agent/dev
-        - name: memif-sockets
-          mountPath: /tmp
-  volumes:
-  - name: vpp-config
-    configMap:
-      name: vnf1-vpp-cfg
-  - name: agent-config
-    configMap:
-      name: vnf-agent-cfg
-  - name: memif-sockets
-    hostPath:
-      path: /tmp
-
----
-apiVersion: v1
-kind: Pod
-metadata:
-  name: vnf2-vpp
-  namespace: csit
-spec:
-  containers:
-    - name: "vnf2"
-      image: prod_vpp_agent_shrink
-      imagePullPolicy: IfNotPresent
-      securityContext:
-        privileged: true
-      ports:
-        - containerPort: 5002
-        - containerPort: 9191
-      readinessProbe:
-        httpGet:
-          path: /readiness
-          port: 9191
-        periodSeconds: 1
-      livenessProbe:
-        httpGet:
-          path: /liveness
-          port: 9191
-        initialDelaySeconds: 15
-      env:
-        - name: MICROSERVICE_LABEL
-          value: vnf2
-      volumeMounts:
-        - name: vpp-config
-          mountPath: /etc/vpp
-        - name: agent-config
-          mountPath: /opt/vpp-agent/dev
-        - name: memif-sockets
-          mountPath: /tmp
-  volumes:
-  - name: vpp-config
-    configMap:
-      name: vnf2-vpp-cfg
-  - name: agent-config
-    configMap:
-      name: vnf-agent-cfg
-  - name: memif-sockets
-    hostPath:
-      path: /tmp
diff --git a/resources/templates/kubernetes/csit.yaml b/resources/templates/kubernetes/namespaces/csit.yaml
index 4ae72063e7..4ae72063e7 100644
--- a/resources/templates/kubernetes/csit.yaml
+++ b/resources/templates/kubernetes/namespaces/csit.yaml
diff --git a/resources/templates/kubernetes/pods/contiv-sfc-controller.yaml b/resources/templates/kubernetes/pods/contiv-sfc-controller.yaml
new file mode 100644
index 0000000000..4fa946dcf3
--- /dev/null
+++ b/resources/templates/kubernetes/pods/contiv-sfc-controller.yaml
@@ -0,0 +1,22 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: sfc-controller
+  namespace: csit
+spec:
+  containers:
+    - name: "sfc-controller"
+      image: ligato/prod_sfc_controller
+      imagePullPolicy: IfNotPresent
+      command:
+        - /bin/sfc-controller
+        - -etcdv3-config=/opt/sfc-controller/dev/etcd.conf
+        - -sfc-config=/opt/sfc-controller/dev/sfc.conf
+        - -vnf-config=/opt/sfc-controller/dev/vnf.conf
+      volumeMounts:
+        - name: controller-config
+          mountPath: /opt/sfc-controller/dev
+  volumes:
+    - name: controller-config
+      configMap:
+        name: sfc-controller-cfg
\ No newline at end of file
diff --git a/resources/templates/kubernetes/pods/contiv-vnf.yaml b/resources/templates/kubernetes/pods/contiv-vnf.yaml
new file mode 100644
index 0000000000..5ef89b5716
--- /dev/null
+++ b/resources/templates/kubernetes/pods/contiv-vnf.yaml
@@ -0,0 +1,45 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: $$VNF$$-vpp
+  namespace: csit
+spec:
+  containers:
+    - name: $$VNF$$
+      image: prod_vpp_agent
+      imagePullPolicy: IfNotPresent
+      securityContext:
+        privileged: true
+      ports:
+        - containerPort: 5002
+        - containerPort: 9191
+      readinessProbe:
+        httpGet:
+          path: /readiness
+          port: 9191
+        periodSeconds: 1
+      livenessProbe:
+        httpGet:
+          path: /liveness
+          port: 9191
+        initialDelaySeconds: 15
+      env:
+        - name: MICROSERVICE_LABEL
+          value: $$VNF$$
+      volumeMounts:
+        - name: vpp-config
+          mountPath: /etc/vpp
+        - name: agent-config
+          mountPath: /opt/vpp-agent/dev
+        - name: memif-sockets
+          mountPath: /tmp
+  volumes:
+  - name: vpp-config
+    configMap:
+      name: $$VNF$$-vpp-cfg
+  - name: agent-config
+    configMap:
+      name: vnf-agent-cfg
+  - name: memif-sockets
+    hostPath:
+      path: /tmp
\ No newline at end of file
diff --git a/resources/templates/kubernetes/pods/contiv-vswitch.yaml b/resources/templates/kubernetes/pods/contiv-vswitch.yaml
new file mode 100644
index 0000000000..ed0f449e2d
--- /dev/null
+++ b/resources/templates/kubernetes/pods/contiv-vswitch.yaml
@@ -0,0 +1,52 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: vswitch-vpp
+  namespace: csit
+spec:
+  hostNetwork: true
+  containers:
+    - name: "vswitch"
+      image: prod_vpp_agent
+      imagePullPolicy: IfNotPresent
+      securityContext:
+        privileged: true
+      ports:
+        - containerPort: 5002
+        - containerPort: 9191
+      readinessProbe:
+        httpGet:
+          path: /readiness
+          port: 9191
+        periodSeconds: 1
+      livenessProbe:
+        httpGet:
+          path: /liveness
+          port: 9191
+        periodSeconds: 1
+        initialDelaySeconds: 15
+      env:
+        - name: MICROSERVICE_LABEL
+          value: vswitch
+      volumeMounts:
+        - name: vpp-config
+          mountPath: /etc/vpp
+        - name: agent-config
+          mountPath: /opt/vpp-agent/dev
+        - name: memif-sockets
+          mountPath: /tmp
+        - name: device-uio
+          mountPath: /dev
+  volumes:
+  - name: vpp-config
+    configMap:
+      name: vswitch-vpp-cfg
+  - name: agent-config
+    configMap:
+      name: vswitch-agent-cfg
+  - name: memif-sockets
+    hostPath:
+      path: /tmp
+  - name: device-uio
+    hostPath:
+      path: /dev
diff --git a/resources/templates/kubernetes/etcd.yaml b/resources/templates/kubernetes/pods/etcdv3.yaml
index 66c1a57fad..f5f6b32435 100644
--- a/resources/templates/kubernetes/etcd.yaml
+++ b/resources/templates/kubernetes/pods/etcdv3.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Pod
 metadata:
-  name: etcdv3-server
+  name: etcdv3
   namespace: csit
 spec:
   hostNetwork: true
diff --git a/resources/templates/kubernetes/kafka.yaml b/resources/templates/kubernetes/pods/kafka.yaml
index 55d165f31b..0bb8f1e5d7 100644
--- a/resources/templates/kubernetes/kafka.yaml
+++ b/resources/templates/kubernetes/pods/kafka.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Pod
 metadata:
-  name: kafka-server
+  name: kafka
   namespace: csit
 spec:
   hostNetwork: true