X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftemplates%2Fkubernetes%2Fconfigmaps%2Feth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain.yaml;fp=resources%2Ftemplates%2Fkubernetes%2Fconfigmaps%2Feth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain.yaml;h=317f282935be0423747d5e144dd89cf3a9c86a5d;hp=6209b120f53866458631cfee6ad52b3be2154ff7;hb=a37482cc9f9d339c08ca3472ff969d051a430ff2;hpb=5729b2d4248c03eae6d9ed6a6e4aa27cf6db0291

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
index 6209b120f5..317f282935 100644
--- a/resources/templates/kubernetes/configmaps/eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain.yaml
+++ b/resources/templates/kubernetes/configmaps/eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain.yaml
@@ -12,109 +12,141 @@ data:
       - "172.17.0.1:22379"
 
   sfc.conf: |
-    sfc_controller_config_version: 1
+    sfc_controller_config_version: 2
     description: $$TEST_NAME$$
+
     system_parameters:
       mtu: 9000
-    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
+
+    network_pod_to_node_map:
+      - pod: vnf1
+        node: vswitch
+      - pod: vnf2
+        node: vswitch
+      - pod: vnf3
+        node: vswitch
+      - pod: vnf4
+        node: vswitch
+
+    network_nodes:
+      - metadata:
+            name: vswitch
+        spec:
+            node_type: host
+            interfaces:
+            - name: $$VSWITCH_IF1$$
+              if_type: ethernet
+            - name: $$VSWITCH_IF2$$
+              if_type: ethernet
+
+    network_services:
+      - metadata:
+            name: my-network-service
+        spec:
+            network_pods:
+
+              - metadata:
+                  name: vnf1
+                spec:
+                  pod_type: vppcontainer
+                  interfaces:
+                    - name: port1
+                      if_type: memif
+                    - name: port2
+                      if_type: memif
+
+              - metadata:
+                  name: vnf2
+                spec:
+                  pod_type: vppcontainer
+                  interfaces:
+                    - name: port1
+                      if_type: memif
+                    - name: port2
+                      if_type: memif
+
+              - metadata:
+                  name: vnf3
+                spec:
+                  pod_type: vppcontainer
+                  interfaces:
+                    - name: port1
+                      if_type: memif
+                    - name: port2
+                      if_type: memif
+
+              - metadata:
+                  name: vnf4
+                spec:
+                  pod_type: vppcontainer
+                  interfaces:
+                    - name: port1
+                      if_type: memif
+                    - name: port2
+                      if_type: memif
+
+            connections:
+
+              - conn_type: l2mp # bridge eth1 to vnf1 port 1
+                pod_interfaces:
+                  - vnf1/port1
+                node_interfaces:
+                  - vswitch/$$VSWITCH_IF1$$
+                l2bd:
+                  name: eth1-vnf-port1
+                  bd_parms:
+                    flood: true
+                    unknown_unicast_flood: true
+                    forward: true
+                    learn: true
+
+              - conn_type: l2pp
+                pod_interfaces: # l2x the ports on vnf1
+                  - vnf1/port1
+                  - vnf1/port2
+
+              - conn_type: l2pp
+                conn_method: vswitch
+                pod_interfaces: # memif via vswitch between vnf1 to vnf2
+                  - vnf1/port2
+                  - vnf2/port1
+
+              - conn_type: l2pp
+                pod_interfaces: # l2x the ports on vnf2
+                  - vnf2/port1
+                  - vnf2/port2
+
+              - conn_type: l2pp
+                conn_method: vswitch
+                pod_interfaces: # memif via vswitch between vnf2 to vnf3
+                  - vnf2/port2
+                  - vnf3/port1
+
+              - conn_type: l2pp
+                pod_interfaces: # l2x the ports on vnf3
+                  - vnf3/port1
+                  - vnf3/port2
+
+              - conn_type: l2pp
+                conn_method: vswitch
+                pod_interfaces: # memif via vswitch between vnf3 to vnf4
+                  - vnf3/port2
+                  - vnf4/port1
+
+              - conn_type: l2pp
+                pod_interfaces: # l2x the ports on vnf4
+                  - vnf4/port1
+                  - vnf4/port2
+
+              - conn_type: l2mp # bridge eth2 to vnf4 port 2
+                pod_interfaces:
+                  - vnf4/port2
+                node_interfaces:
+                  - vswitch/$$VSWITCH_IF2$$
+                l2bd:
+                  name: eth2-vnf-port2
+                  bd_parms:
+                    flood: true
+                    unknown_unicast_flood: true
+                    forward: true
+                    learn: true