From 67d683ebfc222d63d79b883fe7cf94027dbde00c Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Fri, 9 Aug 2019 10:14:34 +0000 Subject: Clean: L2 bridge domain Signed-off-by: Peter Mikus Change-Id: I3721900b91a9c8e9db8766bdcb9771b6bcf95bca --- tests/honeycomb/perf/__init__.robot | 4 ++-- tests/vpp/device/l2bd/eth2p-ethicmpv4-l2bdbasemaclrn-dev.robot | 3 ++- tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr.robot | 3 ++- tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-ndrpdr.robot | 3 ++- tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale100kmaclrn-ndrpdr.robot | 3 ++- tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale10kmaclrn-ndrpdr.robot | 3 ++- tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale1mmaclrn-ndrpdr.robot | 3 ++- .../vpp/perf/l2/2n1l-10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr.robot | 3 ++- tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-ndrpdr.robot | 3 ++- .../vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale100kmaclrn-ndrpdr.robot | 3 ++- .../vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale10kmaclrn-ndrpdr.robot | 3 ++- tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale1mmaclrn-ndrpdr.robot | 3 ++- 12 files changed, 24 insertions(+), 13 deletions(-) (limited to 'tests') diff --git a/tests/honeycomb/perf/__init__.robot b/tests/honeycomb/perf/__init__.robot index ce2af61124..6b5e67f331 100644 --- a/tests/honeycomb/perf/__init__.robot +++ b/tests/honeycomb/perf/__init__.robot @@ -26,7 +26,7 @@ | Library | resources.libraries.python.honeycomb.Performance | Suite Setup | Setup suite for Honeycomb performance tests | Suite Teardown | Run Keywords -| ... | Stop VPP Service on DUT | ${node} +| ... | Stop VPP Service | ${node} | ... | AND | Archive Honeycomb Logs | ${node} | perf=${True} | ... | AND | Stop honeycomb service on DUTs | ${node} | ... | AND | Cleanup Framework | ${nodes} @@ -40,7 +40,7 @@ | | Get CPU Info from All Nodes | ${nodes} | | ${cores}= | Get Length | ${node['cpuinfo']} | | Set Global Variable | ${cores} -| | Stop VPP Service on DUT | ${node} +| | Stop VPP Service | ${node} | | Stop Honeycomb service on DUTs | ${node} | | Generate VPP Startup Configuration for Honeycomb Test on DUT | ${node} | | Configure Restconf binding address | ${node} diff --git a/tests/vpp/device/l2bd/eth2p-ethicmpv4-l2bdbasemaclrn-dev.robot b/tests/vpp/device/l2bd/eth2p-ethicmpv4-l2bdbasemaclrn-dev.robot index 4ec03f117f..3e71c71ed7 100644 --- a/tests/vpp/device/l2bd/eth2p-ethicmpv4-l2bdbasemaclrn-dev.robot +++ b/tests/vpp/device/l2bd/eth2p-ethicmpv4-l2bdbasemaclrn-dev.robot @@ -62,7 +62,8 @@ | | And Add PCI devices to all DUTs | | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs | with_trace=${True} -| | When Initialize L2 bridge domain in circular topology +| | When Initialize layer interface +| | And Initialize L2 bridge domain | | Then Send ICMPv4 bidirectionally and verify received packets | | ... | ${tg} | ${tg_if1} | ${tg_if2} diff --git a/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr.robot index 923c47514d..c49a478694 100644 --- a/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr.robot +++ b/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr.robot @@ -74,7 +74,8 @@ | | And Set Max Rate And Jumbo | | And Apply startup configuration on all VPP DUTs | | When Initialize AVF interfaces -| | And Initialize L2 bridge domain in circular topology +| | And Initialize layer interface +| | And Initialize L2 bridge domain | | Then Find NDR and PDR intervals using optimized search *** Test Cases *** diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-ndrpdr.robot index 4f5a506e71..afa2b2cdb5 100644 --- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-ndrpdr.robot +++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-ndrpdr.robot @@ -72,7 +72,8 @@ | | And Add PCI devices to all DUTs | | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs -| | And Initialize L2 bridge domain in circular topology +| | When Initialize layer interface +| | And Initialize L2 bridge domain | | Then Find NDR and PDR intervals using optimized search *** Test Cases *** diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale100kmaclrn-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale100kmaclrn-ndrpdr.robot index 7aecdf8e5f..687c16caec 100644 --- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale100kmaclrn-ndrpdr.robot +++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale100kmaclrn-ndrpdr.robot @@ -76,7 +76,8 @@ | | And Add PCI devices to all DUTs | | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs -| | When Initialize L2 bridge domain in circular topology +| | When Initialize layer interface +| | And Initialize L2 bridge domain | | Then Find NDR and PDR intervals using optimized search *** Test Cases *** diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale10kmaclrn-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale10kmaclrn-ndrpdr.robot index 0419d2be56..29f7a1f923 100644 --- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale10kmaclrn-ndrpdr.robot +++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale10kmaclrn-ndrpdr.robot @@ -76,7 +76,8 @@ | | And Add PCI devices to all DUTs | | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs -| | When Initialize L2 bridge domain in circular topology +| | When Initialize layer interface +| | And Initialize L2 bridge domain | | Then Find NDR and PDR intervals using optimized search *** Test Cases *** diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale1mmaclrn-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale1mmaclrn-ndrpdr.robot index 8c9d8b182b..7aca0f8a6a 100644 --- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale1mmaclrn-ndrpdr.robot +++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale1mmaclrn-ndrpdr.robot @@ -76,7 +76,8 @@ | | And Add PCI devices to all DUTs | | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs -| | When Initialize L2 bridge domain in circular topology +| | When Initialize layer interface +| | And Initialize L2 bridge domain | | Then Find NDR and PDR intervals using optimized search *** Test Cases *** diff --git a/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr.robot index a264898435..4865f69308 100644 --- a/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr.robot +++ b/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr.robot @@ -74,7 +74,8 @@ | | And Set Max Rate And Jumbo | | And Apply startup configuration on all VPP DUTs | | When Initialize AVF interfaces -| | And Initialize L2 bridge domain in circular topology +| | And Initialize layer interface +| | And Initialize L2 bridge domain | | Then Find NDR and PDR intervals using optimized search *** Test Cases *** diff --git a/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-ndrpdr.robot index 07963479e8..3c03ff194d 100644 --- a/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-ndrpdr.robot +++ b/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-ndrpdr.robot @@ -72,7 +72,8 @@ | | And Add PCI devices to all DUTs | | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs -| | And Initialize L2 bridge domain in circular topology +| | When Initialize layer interface +| | And Initialize L2 bridge domain | | Then Find NDR and PDR intervals using optimized search *** Test Cases *** diff --git a/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale100kmaclrn-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale100kmaclrn-ndrpdr.robot index d40db4a250..f76f4e0a41 100644 --- a/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale100kmaclrn-ndrpdr.robot +++ b/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale100kmaclrn-ndrpdr.robot @@ -76,7 +76,8 @@ | | And Add PCI devices to all DUTs | | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs -| | When Initialize L2 bridge domain in circular topology +| | When Initialize layer interface +| | And Initialize L2 bridge domain | | Then Find NDR and PDR intervals using optimized search *** Test Cases *** diff --git a/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale10kmaclrn-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale10kmaclrn-ndrpdr.robot index 03e4cd3140..bb814595e2 100644 --- a/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale10kmaclrn-ndrpdr.robot +++ b/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale10kmaclrn-ndrpdr.robot @@ -76,7 +76,8 @@ | | And Add PCI devices to all DUTs | | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs -| | When Initialize L2 bridge domain in circular topology +| | When Initialize layer interface +| | And Initialize L2 bridge domain | | Then Find NDR and PDR intervals using optimized search *** Test Cases *** diff --git a/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale1mmaclrn-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale1mmaclrn-ndrpdr.robot index 338066f4cf..db53a96f2c 100644 --- a/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale1mmaclrn-ndrpdr.robot +++ b/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale1mmaclrn-ndrpdr.robot @@ -76,7 +76,8 @@ | | And Add PCI devices to all DUTs | | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs -| | When Initialize L2 bridge domain in circular topology +| | When Initialize layer interface +| | And Initialize L2 bridge domain | | Then Find NDR and PDR intervals using optimized search *** Test Cases *** -- cgit 1.2.3-korg