diff options
| author |   Peter Mikus <pmikus@cisco.com> | 2018-01-08 11:50:23 +0100 |
|---|---|---|
| committer | Peter Mikus <pmikus@cisco.com> | 2018-01-09 09:58:37 +0000 |
| commit | 0fbf91708504994ca0e24c972bb605371540ac32 (patch) | |
| tree | 909135e1db71de0f926e7fce310c30ccaedfcb0b /resources | |
| parent | 02f802c766066e165a96f867795ebba7536bdf6e (diff) | |
Add static MAC entries to configuration
- Add static MAC entries to sfc_controller configuration of all l2bdbase
tests.
Change-Id: I38ba32246ed20204c5be1f98b0454b71dcff2e00
Signed-off-by: Peter Mikus <pmikus@cisco.com>
Diffstat (limited to 'resources')
5 files changed, 38 insertions, 2 deletions
diff --git a/resources/libraries/python/KubernetesUtils.py b/resources/libraries/python/KubernetesUtils.py index 89c5bd2a57..8d658c65bc 100644 --- a/resources/libraries/python/KubernetesUtils.py +++ b/resources/libraries/python/KubernetesUtils.py @@ -322,6 +322,10 @@ class KubernetesUtils(object): "{nspace} $p; done".format(nspace=nspace) ssh.exec_command(cmd) + cmd = "kubectl exec {nspace} etcdv3 -- etcdctl --endpoints "\ + "\"localhost:22379\" get \"/\" --prefix=true".format(nspace=nspace) + ssh.exec_command(cmd) + @staticmethod def get_kubernetes_logs_on_all_duts(nodes, nspace): """Get Kubernetes logs from all PODs in namespace on all DUTs. 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 index e06146fe86..46f7953734 100644 --- a/resources/templates/kubernetes/configmaps/ch-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc.yaml +++ b/resources/templates/kubernetes/configmaps/ch-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc.yaml @@ -24,10 +24,14 @@ data: - 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 @@ -36,14 +40,18 @@ data: - 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: 8 + type: 5 elements: - container: vnf1 port_label: 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 index 5cdf99e6ec..3dbc2ce9cd 100644 --- a/resources/templates/kubernetes/configmaps/ch-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc.yaml +++ b/resources/templates/kubernetes/configmaps/ch-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc.yaml @@ -24,10 +24,14 @@ data: - 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 @@ -36,14 +40,18 @@ data: - 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: 8 + type: 5 elements: - container: vnf1 port_label: 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 index c9693aa9a1..e672846e66 100644 --- a/resources/templates/kubernetes/configmaps/ho-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc.yaml +++ b/resources/templates/kubernetes/configmaps/ho-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc.yaml @@ -24,10 +24,14 @@ data: - 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 @@ -36,10 +40,14 @@ data: - 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 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 index 4a2ba86977..4b3d301a2f 100644 --- a/resources/templates/kubernetes/configmaps/ho-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc.yaml +++ b/resources/templates/kubernetes/configmaps/ho-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc.yaml @@ -24,10 +24,14 @@ data: - 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 @@ -36,10 +40,14 @@ data: - 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 |