From 2e250ffd8711be1247353d403a68573c0d232e8e Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Mon, 6 May 2019 15:29:52 +0000 Subject: Remove old VPP Restart sequence Change-Id: I7f71a9709ad55ce03d73e23cc8a9f5064947ed51 Signed-off-by: Peter Mikus --- resources/libraries/robot/ip/ip6.robot | 4 +++- resources/libraries/robot/shared/default.robot | 13 ++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) (limited to 'resources/libraries/robot') diff --git a/resources/libraries/robot/ip/ip6.robot b/resources/libraries/robot/ip/ip6.robot index 73d486ed8f..a780144443 100644 --- a/resources/libraries/robot/ip/ip6.robot +++ b/resources/libraries/robot/ip/ip6.robot @@ -172,7 +172,9 @@ | Configure IPv6 on all DUTs in topology | | [Documentation] | Setup IPv6 address on all DUTs | | [Arguments] | ${nodes} | ${nodes_addr} -| | Configure all DUTs before test +| | Restart Vpp Service On All Duts | ${nodes} +| | Verify Vpp On All Duts | ${nodes} +| | VPP Enable Traces On All Duts | ${nodes} | | ${interfaces}= | Nodes Set Ipv6 Addresses | ${nodes} | ${nodes_addr} | | :FOR | ${interface} | IN | @{interfaces} | | | Set Interface State | @{interface} | up | if_type=name diff --git a/resources/libraries/robot/shared/default.robot b/resources/libraries/robot/shared/default.robot index 09ca17d8a2..81ebc8300c 100644 --- a/resources/libraries/robot/shared/default.robot +++ b/resources/libraries/robot/shared/default.robot @@ -37,11 +37,6 @@ | Resource | resources/libraries/robot/vm/qemu.robot *** Keywords *** -| Configure all DUTs before test -| | [Documentation] | Setup all DUTs in topology before test execution. -| | ... -| | Setup All DUTs | ${nodes} - | Configure all TGs for traffic script | | [Documentation] | Prepare all TGs before traffic scripts execution. | | ... @@ -460,7 +455,9 @@ | Set up functional test | | [Documentation] | Common test setup for functional tests. | | ... -| | Configure all DUTs before test +| | Restart Vpp Service On All Duts | ${nodes} +| | Verify Vpp On All Duts | ${nodes} +| | VPP Enable Traces On All Duts | ${nodes} | | Save VPP PIDs | | Configure all TGs for traffic script | | Update All Interface Data On All Nodes | ${nodes} @@ -480,7 +477,9 @@ # much | | [Documentation] | Common test setup for vpp-device tests. | | ... -| | Configure all DUTs before test +| | Restart Vpp Service On All Duts | ${nodes} +| | Verify Vpp On All Duts | ${nodes} +| | VPP Enable Traces On All Duts | ${nodes} | | Save VPP PIDs | | Configure all TGs for traffic script | | Update All Interface Data On All Nodes | ${nodes} | skip_tg_udev=${True} -- cgit 1.2.3-korg