diff options
| author |   Peter Mikus <pmikus@cisco.com> | 2018-09-27 07:27:52 +0000 |
|---|---|---|
| committer | Peter Mikus <pmikus@cisco.com> | 2018-10-02 11:00:32 +0000 |
| commit | a37482cc9f9d339c08ca3472ff969d051a430ff2 (patch) | |
| tree | 099167b674c2d5e23d7ff94fab0461b3264a8c28 /resources/templates/kubernetes/configmaps/eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain.yaml | |
| parent | 5729b2d4248c03eae6d9ed6a6e4aa27cf6db0291 (diff) | |
CSIT-1320 Update SFC-controller configurations to latest version
Change-Id: Ibaca5e848a8f4dcd2a50f873bea37bd99aa5d62c
Signed-off-by: Peter Mikus <pmikus@cisco.com>
Diffstat (limited to 'resources/templates/kubernetes/configmaps/eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain.yaml')
| -rw-r--r-- | resources/templates/kubernetes/configmaps/eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain.yaml | 130 |
1 files changed, 74 insertions, 56 deletions
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 index 2363d3c5c9..8d4c28d7cf 100644 --- a/resources/templates/kubernetes/configmaps/eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain.yaml +++ b/resources/templates/kubernetes/configmaps/eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain.yaml @@ -12,63 +12,81 @@ 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: 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 + network_pod_to_node_map: + - pod: vnf1 + node: vswitch + - pod: vnf2 + 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 + + connections: + + - conn_type: l2pp # l2x eth1 to vnf1 port 1 + pod_interfaces: + - vnf1/port1 + node_interfaces: + - vswitch/$$VSWITCH_IF1$$ + + - 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 # l2x eth2 to vnf2 port 2 + pod_interfaces: + - vnf2/port2 + node_interfaces: + - vswitch/$$VSWITCH_IF2$$ |