From 0fbf91708504994ca0e24c972bb605371540ac32 Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Mon, 8 Jan 2018 11:50:23 +0100 Subject: 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 --- ...-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-k8s-ndrpdrdisc.robot | 6 ++++++ ...-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-k8s-ndrpdrdisc.robot | 6 ++++++ ...-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-k8s-ndrpdrdisc.robot | 6 ++++++ ...-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-k8s-ndrpdrdisc.robot | 6 ++++++ 4 files changed, 24 insertions(+) (limited to 'tests/kubernetes') diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x520-ch-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-k8s-ndrpdrdisc.robot b/tests/kubernetes/perf/container_memif/10ge2p1x520-ch-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-k8s-ndrpdrdisc.robot index 2f5ee13f8d..cd054c822e 100644 --- a/tests/kubernetes/perf/container_memif/10ge2p1x520-ch-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-k8s-ndrpdrdisc.robot +++ b/tests/kubernetes/perf/container_memif/10ge2p1x520-ch-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-k8s-ndrpdrdisc.robot @@ -134,6 +134,8 @@ | | ${dut1_if2_name}= | Get interface name | ${dut1} | ${dut1_if2} | | ${dut2_if1_name}= | Get interface name | ${dut2} | ${dut2_if1} | | ${dut2_if2_name}= | Get interface name | ${dut2} | ${dut2_if2} +| | ${tg_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1} +| | ${tg_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2} | | Create Kubernetes VSWITCH startup config on all DUTs | ${get_framesize} | | ... | ${wt} | ${rxq} | | Create Kubernetes VNF'1' startup config on all DUTs @@ -156,10 +158,14 @@ | | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME} | | ... | $$VSWITCH_IF1$$=${dut1_if1_name} | | ... | $$VSWITCH_IF2$$=${dut1_if2_name} +| | ... | $$TG_IF1_MAC1$$=${tg_if1_mac} +| | ... | $$TG_IF2_MAC1$$=${tg_if2_mac} | | Apply Kubernetes resource on node | ${dut2} | | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME} | | ... | $$VSWITCH_IF1$$=${dut2_if1_name} | | ... | $$VSWITCH_IF2$$=${dut2_if2_name} +| | ... | $$TG_IF1_MAC1$$=${tg_if1_mac} +| | ... | $$TG_IF2_MAC1$$=${tg_if2_mac} | | Wait for Kubernetes PODs on all DUTs | ${nodes} | csit | | Set Kubernetes PODs affinity on all DUTs | ${nodes} | | Run Keyword If | '${search_type}' == 'NDR' diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x520-ch-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-k8s-ndrpdrdisc.robot b/tests/kubernetes/perf/container_memif/10ge2p1x520-ch-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-k8s-ndrpdrdisc.robot index f8cfac7260..cc4d0c9924 100644 --- a/tests/kubernetes/perf/container_memif/10ge2p1x520-ch-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-k8s-ndrpdrdisc.robot +++ b/tests/kubernetes/perf/container_memif/10ge2p1x520-ch-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-k8s-ndrpdrdisc.robot @@ -134,6 +134,8 @@ | | ${dut1_if2_name}= | Get interface name | ${dut1} | ${dut1_if2} | | ${dut2_if1_name}= | Get interface name | ${dut2} | ${dut2_if1} | | ${dut2_if2_name}= | Get interface name | ${dut2} | ${dut2_if2} +| | ${tg_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1} +| | ${tg_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2} | | Create Kubernetes VSWITCH startup config on all DUTs | ${get_framesize} | | ... | ${wt} | ${rxq} | | Create Kubernetes VNF'1' startup config on all DUTs @@ -170,10 +172,14 @@ | | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME} | | ... | $$VSWITCH_IF1$$=${dut1_if1_name} | | ... | $$VSWITCH_IF2$$=${dut1_if2_name} +| | ... | $$TG_IF1_MAC1$$=${tg_if1_mac} +| | ... | $$TG_IF2_MAC1$$=${tg_if2_mac} | | Apply Kubernetes resource on node | ${dut2} | | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME} | | ... | $$VSWITCH_IF1$$=${dut2_if1_name} | | ... | $$VSWITCH_IF2$$=${dut2_if2_name} +| | ... | $$TG_IF1_MAC1$$=${tg_if1_mac} +| | ... | $$TG_IF2_MAC1$$=${tg_if2_mac} | | Wait for Kubernetes PODs on all DUTs | ${nodes} | csit | | Set Kubernetes PODs affinity on all DUTs | ${nodes} | | Run Keyword If | '${search_type}' == 'NDR' diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x520-ho-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-k8s-ndrpdrdisc.robot b/tests/kubernetes/perf/container_memif/10ge2p1x520-ho-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-k8s-ndrpdrdisc.robot index 17e85f5abd..5fe0802edd 100644 --- a/tests/kubernetes/perf/container_memif/10ge2p1x520-ho-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-k8s-ndrpdrdisc.robot +++ b/tests/kubernetes/perf/container_memif/10ge2p1x520-ho-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-k8s-ndrpdrdisc.robot @@ -134,6 +134,8 @@ | | ${dut1_if2_name}= | Get interface name | ${dut1} | ${dut1_if2} | | ${dut2_if1_name}= | Get interface name | ${dut2} | ${dut2_if1} | | ${dut2_if2_name}= | Get interface name | ${dut2} | ${dut2_if2} +| | ${tg_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1} +| | ${tg_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2} | | Create Kubernetes VSWITCH startup config on all DUTs | ${get_framesize} | | ... | ${wt} | ${rxq} | | Create Kubernetes VNF'1' startup config on all DUTs @@ -156,10 +158,14 @@ | | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME} | | ... | $$VSWITCH_IF1$$=${dut1_if1_name} | | ... | $$VSWITCH_IF2$$=${dut1_if2_name} +| | ... | $$TG_IF1_MAC1$$=${tg_if1_mac} +| | ... | $$TG_IF2_MAC1$$=${tg_if2_mac} | | Apply Kubernetes resource on node | ${dut2} | | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME} | | ... | $$VSWITCH_IF1$$=${dut2_if1_name} | | ... | $$VSWITCH_IF2$$=${dut2_if2_name} +| | ... | $$TG_IF1_MAC1$$=${tg_if1_mac} +| | ... | $$TG_IF2_MAC1$$=${tg_if2_mac} | | Wait for Kubernetes PODs on all DUTs | ${nodes} | csit | | Set Kubernetes PODs affinity on all DUTs | ${nodes} | | Run Keyword If | '${search_type}' == 'NDR' diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x520-ho-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-k8s-ndrpdrdisc.robot b/tests/kubernetes/perf/container_memif/10ge2p1x520-ho-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-k8s-ndrpdrdisc.robot index 5695688008..88437b2a85 100644 --- a/tests/kubernetes/perf/container_memif/10ge2p1x520-ho-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-k8s-ndrpdrdisc.robot +++ b/tests/kubernetes/perf/container_memif/10ge2p1x520-ho-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-k8s-ndrpdrdisc.robot @@ -134,6 +134,8 @@ | | ${dut1_if2_name}= | Get interface name | ${dut1} | ${dut1_if2} | | ${dut2_if1_name}= | Get interface name | ${dut2} | ${dut2_if1} | | ${dut2_if2_name}= | Get interface name | ${dut2} | ${dut2_if2} +| | ${tg_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1} +| | ${tg_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2} | | Create Kubernetes VSWITCH startup config on all DUTs | ${get_framesize} | | ... | ${wt} | ${rxq} | | Create Kubernetes VNF'1' startup config on all DUTs @@ -170,10 +172,14 @@ | | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME} | | ... | $$VSWITCH_IF1$$=${dut1_if1_name} | | ... | $$VSWITCH_IF2$$=${dut1_if2_name} +| | ... | $$TG_IF1_MAC1$$=${tg_if1_mac} +| | ... | $$TG_IF2_MAC1$$=${tg_if2_mac} | | Apply Kubernetes resource on node | ${dut2} | | ... | ${sfc_profile}.yaml | $$TEST_NAME$$=${TEST NAME} | | ... | $$VSWITCH_IF1$$=${dut2_if1_name} | | ... | $$VSWITCH_IF2$$=${dut2_if2_name} +| | ... | $$TG_IF1_MAC1$$=${tg_if1_mac} +| | ... | $$TG_IF2_MAC1$$=${tg_if2_mac} | | Wait for Kubernetes PODs on all DUTs | ${nodes} | csit | | Set Kubernetes PODs affinity on all DUTs | ${nodes} | | Run Keyword If | '${search_type}' == 'NDR' -- cgit 1.2.3-korg