From f13401bd90a789e9a736dfdb7cbe80313f0304fd Mon Sep 17 00:00:00 2001
From: Peter Mikus <pmikus@cisco.com>
Date: Wed, 17 Jan 2018 07:52:53 +0100
Subject: Rename Ligato tests

- Rename Ligato tests
- Change l2bdbasemacstat to l2bdbasemaclrn

Change-Id: I8a24b04f1da285082ef6c3ac90c0be7f1d8588cc
Signed-off-by: Peter Mikus <pmikus@cisco.com>
(cherry picked from commit e81d599029f31fb433089eecf0d160ab01719383)
---
 ...eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc.yaml |  80 --------------
 ...eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc.yaml | 116 --------------------
 .../ch-eth-1drcl2xcbase-eth-4memif-2drcl2xc.yaml   |  72 -------------
 .../ch-eth-1drcl2xcbase-eth-8memif-4drcl2xc.yaml   | 108 -------------------
 ...cl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral.yaml |  64 +++++++++++
 ...cl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz.yaml |  82 ++++++++++++++
 ...cl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz.yaml | 118 +++++++++++++++++++++
 ...cl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain.yaml |  82 ++++++++++++++
 ...cl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain.yaml | 118 +++++++++++++++++++++
 ...th-1drcl2xcbase-eth-2memif-1drcl2xc-1paral.yaml |  54 ++++++++++
 ...th-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz.yaml |  72 +++++++++++++
 ...th-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz.yaml | 108 +++++++++++++++++++
 ...th-1drcl2xcbase-eth-4memif-2drcl2xc-1chain.yaml |  72 +++++++++++++
 ...th-1drcl2xcbase-eth-8memif-4drcl2xc-1chain.yaml | 108 +++++++++++++++++++
 ...eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc.yaml |  80 --------------
 ...eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc.yaml | 116 --------------------
 .../ho-eth-1drcl2xcbase-eth-2memif-2drcl2xc.yaml   |  72 -------------
 .../ho-eth-1drcl2xcbase-eth-2memif-4drcl2xc.yaml   | 108 -------------------
 ...eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc.yaml |  62 -----------
 .../pa-eth-1drcl2xcbase-eth-2memif-1drcl2xc.yaml   |  54 ----------
 20 files changed, 878 insertions(+), 868 deletions(-)
 delete mode 100644 resources/templates/kubernetes/configmaps/ch-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc.yaml
 delete mode 100644 resources/templates/kubernetes/configmaps/ch-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc.yaml
 delete mode 100644 resources/templates/kubernetes/configmaps/ch-eth-1drcl2xcbase-eth-4memif-2drcl2xc.yaml
 delete mode 100644 resources/templates/kubernetes/configmaps/ch-eth-1drcl2xcbase-eth-8memif-4drcl2xc.yaml
 create mode 100644 resources/templates/kubernetes/configmaps/eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral.yaml
 create mode 100644 resources/templates/kubernetes/configmaps/eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz.yaml
 create mode 100644 resources/templates/kubernetes/configmaps/eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz.yaml
 create mode 100644 resources/templates/kubernetes/configmaps/eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain.yaml
 create mode 100644 resources/templates/kubernetes/configmaps/eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain.yaml
 create mode 100644 resources/templates/kubernetes/configmaps/eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral.yaml
 create mode 100644 resources/templates/kubernetes/configmaps/eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz.yaml
 create mode 100644 resources/templates/kubernetes/configmaps/eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz.yaml
 create mode 100644 resources/templates/kubernetes/configmaps/eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain.yaml
 create mode 100644 resources/templates/kubernetes/configmaps/eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain.yaml
 delete mode 100644 resources/templates/kubernetes/configmaps/ho-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc.yaml
 delete mode 100644 resources/templates/kubernetes/configmaps/ho-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc.yaml
 delete mode 100644 resources/templates/kubernetes/configmaps/ho-eth-1drcl2xcbase-eth-2memif-2drcl2xc.yaml
 delete mode 100644 resources/templates/kubernetes/configmaps/ho-eth-1drcl2xcbase-eth-2memif-4drcl2xc.yaml
 delete mode 100644 resources/templates/kubernetes/configmaps/pa-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc.yaml
 delete mode 100644 resources/templates/kubernetes/configmaps/pa-eth-1drcl2xcbase-eth-2memif-1drcl2xc.yaml

(limited to 'resources')

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
deleted file mode 100644
index 46f7953734..0000000000
--- a/resources/templates/kubernetes/configmaps/ch-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc.yaml
+++ /dev/null
@@ -1,80 +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
-            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: vswitch-vnf2
-        description: VNF2 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: vnf2
-            port_label: port2
-            etcd_vpp_switch_key: vswitch
-            l2fib_macs:
-              - "$$TG_IF1_MAC1$$"
-            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-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc.yaml b/resources/templates/kubernetes/configmaps/ch-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc.yaml
deleted file mode 100644
index e03feddc81..0000000000
--- a/resources/templates/kubernetes/configmaps/ch-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc.yaml
+++ /dev/null
@@ -1,116 +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
-            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: vswitch-vnf4
-        description: VNF4 to vswitch - memif
-        type: 4
-        elements:
-          - container: vswitch
-            port_label: $$VSWITCH_IF2$$
-            etcd_vpp_switch_key: vswitch
-            l2fib_macs:
-              - "$$TG_IF2_MAC1$$"
-            type: 5
-          - container: vnf4
-            port_label: port2
-            etcd_vpp_switch_key: vswitch
-            l2fib_macs:
-              - "$$TG_IF1_MAC1$$"
-            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/ch-eth-1drcl2xcbase-eth-4memif-2drcl2xc.yaml b/resources/templates/kubernetes/configmaps/ch-eth-1drcl2xcbase-eth-4memif-2drcl2xc.yaml
deleted file mode 100644
index 150772ca25..0000000000
--- a/resources/templates/kubernetes/configmaps/ch-eth-1drcl2xcbase-eth-4memif-2drcl2xc.yaml
+++ /dev/null
@@ -1,72 +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
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
deleted file mode 100644
index a9f07775e5..0000000000
--- a/resources/templates/kubernetes/configmaps/ch-eth-1drcl2xcbase-eth-8memif-4drcl2xc.yaml
+++ /dev/null
@@ -1,108 +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-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/eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral.yaml b/resources/templates/kubernetes/configmaps/eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral.yaml
new file mode 100644
index 0000000000..6bb7fc8044
--- /dev/null
+++ b/resources/templates/kubernetes/configmaps/eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral.yaml
@@ -0,0 +1,64 @@
+---
+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
+        bd_parms:
+          flood: true
+          unknown_unicast_flood: true
+          forward: true
+          learn: true
+        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
+        bd_parms:
+          flood: true
+          unknown_unicast_flood: true
+          forward: true
+          learn: true
+        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/eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz.yaml b/resources/templates/kubernetes/configmaps/eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz.yaml
new file mode 100644
index 0000000000..c20fcb335d
--- /dev/null
+++ b/resources/templates/kubernetes/configmaps/eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz.yaml
@@ -0,0 +1,82 @@
+---
+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
+        bd_parms:
+          flood: true
+          unknown_unicast_flood: true
+          forward: true
+          learn: true
+        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
+        bd_parms:
+          flood: true
+          unknown_unicast_flood: true
+          forward: true
+          learn: true
+        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/eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz.yaml b/resources/templates/kubernetes/configmaps/eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz.yaml
new file mode 100644
index 0000000000..5458fa40db
--- /dev/null
+++ b/resources/templates/kubernetes/configmaps/eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz.yaml
@@ -0,0 +1,118 @@
+---
+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
+        bd_parms:
+          flood: true
+          unknown_unicast_flood: true
+          forward: true
+          learn: true
+        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
+        bd_parms:
+          flood: true
+          unknown_unicast_flood: true
+          forward: true
+          learn: true
+        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/eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain.yaml b/resources/templates/kubernetes/configmaps/eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain.yaml
new file mode 100644
index 0000000000..3fc07dd783
--- /dev/null
+++ b/resources/templates/kubernetes/configmaps/eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain.yaml
@@ -0,0 +1,82 @@
+---
+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
+        bd_parms:
+          flood: true
+          unknown_unicast_flood: true
+          forward: true
+          learn: true
+        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
+        bd_parms:
+          flood: true
+          unknown_unicast_flood: true
+          forward: true
+          learn: true
+        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/eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain.yaml b/resources/templates/kubernetes/configmaps/eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain.yaml
new file mode 100644
index 0000000000..909373945d
--- /dev/null
+++ b/resources/templates/kubernetes/configmaps/eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain.yaml
@@ -0,0 +1,118 @@
+---
+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
+        bd_parms:
+          flood: true
+          unknown_unicast_flood: true
+          forward: true
+          learn: true
+        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
+        bd_parms:
+          flood: true
+          unknown_unicast_flood: true
+          forward: true
+          learn: true
+        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/eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral.yaml b/resources/templates/kubernetes/configmaps/eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral.yaml
new file mode 100644
index 0000000000..ed23311278
--- /dev/null
+++ b/resources/templates/kubernetes/configmaps/eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral.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/eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz.yaml b/resources/templates/kubernetes/configmaps/eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz.yaml
new file mode 100644
index 0000000000..9b4c189cac
--- /dev/null
+++ b/resources/templates/kubernetes/configmaps/eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz.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/eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz.yaml b/resources/templates/kubernetes/configmaps/eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz.yaml
new file mode 100644
index 0000000000..eeffa52784
--- /dev/null
+++ b/resources/templates/kubernetes/configmaps/eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz.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/eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain.yaml b/resources/templates/kubernetes/configmaps/eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain.yaml
new file mode 100644
index 0000000000..150772ca25
--- /dev/null
+++ b/resources/templates/kubernetes/configmaps/eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain.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/eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain.yaml b/resources/templates/kubernetes/configmaps/eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain.yaml
new file mode 100644
index 0000000000..a9f07775e5
--- /dev/null
+++ b/resources/templates/kubernetes/configmaps/eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain.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
deleted file mode 100644
index e672846e66..0000000000
--- a/resources/templates/kubernetes/configmaps/ho-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc.yaml
+++ /dev/null
@@ -1,80 +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
-            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: vswitch-vnf2
-        description: VNF2 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: vnf2
-            port_label: port2
-            etcd_vpp_switch_key: vswitch
-            l2fib_macs:
-              - "$$TG_IF1_MAC1$$"
-            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
deleted file mode 100644
index 4b3d301a2f..0000000000
--- a/resources/templates/kubernetes/configmaps/ho-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc.yaml
+++ /dev/null
@@ -1,116 +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
-            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: vswitch-vnf4
-        description: VNF4 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: vnf4
-            port_label: port2
-            etcd_vpp_switch_key: vswitch
-            l2fib_macs:
-              - "$$TG_IF1_MAC1$$"
-            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
deleted file mode 100644
index 9b4c189cac..0000000000
--- a/resources/templates/kubernetes/configmaps/ho-eth-1drcl2xcbase-eth-2memif-2drcl2xc.yaml
+++ /dev/null
@@ -1,72 +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: 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
deleted file mode 100644
index eeffa52784..0000000000
--- a/resources/templates/kubernetes/configmaps/ho-eth-1drcl2xcbase-eth-2memif-4drcl2xc.yaml
+++ /dev/null
@@ -1,108 +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-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
deleted file mode 100644
index b3b2d6ec80..0000000000
--- a/resources/templates/kubernetes/configmaps/pa-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc.yaml
+++ /dev/null
@@ -1,62 +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
-            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
deleted file mode 100644
index ed23311278..0000000000
--- a/resources/templates/kubernetes/configmaps/pa-eth-1drcl2xcbase-eth-2memif-1drcl2xc.yaml
+++ /dev/null
@@ -1,54 +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
-- 
cgit 1.2.3-korg