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 --- tests/honeycomb/func/__init__.robot | 4 +++- tests/nsh_sfc/func/__init__.robot | 8 +++++--- tests/vpp/func/__init__.robot | 1 - tests/vpp/func/ip4/eth2p-ethip4-ip4base-func.robot | 4 +++- tests/vpp/perf/__init__.robot | 1 - 5 files changed, 11 insertions(+), 7 deletions(-) (limited to 'tests') diff --git a/tests/honeycomb/func/__init__.robot b/tests/honeycomb/func/__init__.robot index 89c5dc90a2..8fc5f20aa9 100644 --- a/tests/honeycomb/func/__init__.robot +++ b/tests/honeycomb/func/__init__.robot @@ -25,7 +25,9 @@ | Resource | resources/libraries/robot/honeycomb/honeycomb.robot | ... | Suite Setup | Run Keywords | Setup Framework | ${nodes} | AND -| ... | Setup All DUTs | ${nodes} | AND +| ... | Restart Vpp Service On All Duts | ${nodes} | AND +| ... | Verify Vpp On All Duts | ${nodes} | AND +| ... | VPP Enable Traces On All Duts | ${nodes} | AND | ... | Update All Interface Data On All Nodes | ${nodes} | AND | ... | Configure all DUTs before test | AND | ... | Set Global Variable | ${node} | AND diff --git a/tests/nsh_sfc/func/__init__.robot b/tests/nsh_sfc/func/__init__.robot index 707244ccb4..7f1391ca30 100644 --- a/tests/nsh_sfc/func/__init__.robot +++ b/tests/nsh_sfc/func/__init__.robot @@ -15,6 +15,8 @@ | Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/shared/interfaces.robot | Library | resources.libraries.python.SFC.SetupSFCTest -| Suite Setup | Run Keywords | Setup NSH SFC test | ${nodes} -| ... | AND | Setup All DUTs | ${nodes} -| ... | AND | Update All Interface Data On All Nodes | ${nodes} +| Suite Setup | Run Keywords | Setup NSH SFC test | ${nodes} | AND +| ... | Restart Vpp Service On All Duts | ${nodes} | AND +| ... | Verify Vpp On All Duts | ${nodes} | AND +| ... | VPP Enable Traces On All Duts | ${nodes} | AND +| ... | Update All Interface Data On All Nodes | ${nodes} diff --git a/tests/vpp/func/__init__.robot b/tests/vpp/func/__init__.robot index 563d1ea363..c0060ab4a2 100644 --- a/tests/vpp/func/__init__.robot +++ b/tests/vpp/func/__init__.robot @@ -20,7 +20,6 @@ | ... | AND | Setup Framework | ${nodes} | ... | AND | Install Vpp On All Duts | ${nodes} | ${VPP_PKG_DIR} | ... | AND | Verify Vpp On All Duts | ${nodes} -| ... | AND | Setup All DUTs | ${nodes} | ... | AND | Update All Interface Data On All Nodes | ${nodes} | Suite Teardown | Cleanup Framework | ${nodes} diff --git a/tests/vpp/func/ip4/eth2p-ethip4-ip4base-func.robot b/tests/vpp/func/ip4/eth2p-ethip4-ip4base-func.robot index 5262fa13e0..1b4f8cdb4a 100644 --- a/tests/vpp/func/ip4/eth2p-ethip4-ip4base-func.robot +++ b/tests/vpp/func/ip4/eth2p-ethip4-ip4base-func.robot @@ -19,7 +19,9 @@ | Resource | resources/libraries/robot/ip/ip4.robot | Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | SKIP_VPP_PATCH | Suite Setup | Run Keywords -| ... | Configure all DUTs before test | AND +| ... | Restart Vpp Service On All Duts | ${nodes} | AND +| ... | Verify Vpp On All Duts | ${nodes} | AND +| ... | VPP Enable Traces On All Duts | ${nodes} | AND | ... | Configure all TGs for traffic script | AND | ... | Update All Interface Data On All Nodes | ${nodes} | AND | ... | Configure DUT nodes for IPv4 testing diff --git a/tests/vpp/perf/__init__.robot b/tests/vpp/perf/__init__.robot index 37ff3a8192..25ed403d8a 100644 --- a/tests/vpp/perf/__init__.robot +++ b/tests/vpp/perf/__init__.robot @@ -24,7 +24,6 @@ | ... | AND | Install Vpp on All Duts | ${nodes} | ${packages_dir} | ... | AND | Verify Vpp on All Duts | ${nodes} | ... | AND | Verify UIO Driver on all DUTs | ${nodes} -| ... | AND | Setup All DUTs | ${nodes} | ... | AND | Show Vpp Version on All Duts | ${nodes} | ... | AND | Get CPU Layout from All nodes | ${nodes} | ... | AND | Update All Interface Data on All Nodes | ${nodes} -- cgit 1.2.3-korg