32 files changed, 10 insertions, 2 deletions
diff --git a/tests/vpp/func/honeycomb/__init__.robot b/tests/honeycomb/func/__init__.robot
index 80585a0e61..cb25ee909d 100644
--- a/tests/vpp/func/honeycomb/__init__.robot
+++ b/tests/honeycomb/func/__init__.robot
@@ -16,13 +16,21 @@
 | ${node}= | ${nodes['DUT1']}
 
 *** Settings ***
+| Library | resources.libraries.python.SetupFramework
+| Library | resources.libraries.python.SetupFramework.CleanupFramework
 | Library | resources/libraries/python/honeycomb/HcPersistence.py
 | Resource | resources/libraries/robot/shared/default.robot
+| Resource | resources/libraries/robot/shared/interfaces.robot
+| Resource | resources/libraries/robot/shared/default.robot
 | Resource | resources/libraries/robot/honeycomb/honeycomb.robot
 | ...
-| Suite Setup | Run Keywords | Configure all DUTs before test | AND
+| Suite Setup | Run Keywords | Setup Framework | ${nodes} | AND
+| ... | Setup All DUTs | ${nodes} | AND
+| ... | Update All Interface Data On All Nodes | ${nodes} | AND
+| ... | Configure all DUTs before test | AND
 | ... | Set Global Variable | ${node} | AND
 | ... | Stop Honeycomb service on DUTs | ${node} | AND
 | ... | Clear Honeycomb Log | ${node}
 | ...
-| Suite Teardown | Archive Honeycomb log file | ${node}
+| Suite Teardown | Run Keywords | Archive Honeycomb log file | ${node} | AND
+| ... | Cleanup Framework | ${nodes}
diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-acl-apihc-apivat-func.robot b/tests/honeycomb/func/mgmt-cfg-acl-apihc-apivat-func.robot
index 3f209e3562..3f209e3562 100644
--- a/tests/vpp/func/honeycomb/mgmt-cfg-acl-apihc-apivat-func.robot
+++ b/tests/honeycomb/func/mgmt-cfg-acl-apihc-apivat-func.robot
diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-apihcv6-func.robot b/tests/honeycomb/func/mgmt-cfg-apihcv6-func.robot
index e3b43cc4a9..e3b43cc4a9 100644
--- a/tests/vpp/func/honeycomb/mgmt-cfg-apihcv6-func.robot
+++ b/tests/honeycomb/func/mgmt-cfg-apihcv6-func.robot
diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-bgp-apihc-func.robot b/tests/honeycomb/func/mgmt-cfg-bgp-apihc-func.robot
index b5fed1e583..b5fed1e583 100644
--- a/tests/vpp/func/honeycomb/mgmt-cfg-bgp-apihc-func.robot
+++ b/tests/honeycomb/func/mgmt-cfg-bgp-apihc-func.robot
diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-dhcp-apihc-apivat-func.robot b/tests/honeycomb/func/mgmt-cfg-dhcp-apihc-apivat-func.robot
index 958b27fd32..958b27fd32 100644
--- a/tests/vpp/func/honeycomb/mgmt-cfg-dhcp-apihc-apivat-func.robot
+++ b/tests/honeycomb/func/mgmt-cfg-dhcp-apihc-apivat-func.robot
diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-int-apihcnc-func.robot b/tests/honeycomb/func/mgmt-cfg-int-apihcnc-func.robot
index 2ba904449a..2ba904449a 100644
--- a/tests/vpp/func/honeycomb/mgmt-cfg-int-apihcnc-func.robot
+++ b/tests/honeycomb/func/mgmt-cfg-int-apihcnc-func.robot
diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-int-subint-apihc-apivat-func.robot b/tests/honeycomb/func/mgmt-cfg-int-subint-apihc-apivat-func.robot
index b27c7f49f7..b27c7f49f7 100644
--- a/tests/vpp/func/honeycomb/mgmt-cfg-int-subint-apihc-apivat-func.robot
+++ b/tests/honeycomb/func/mgmt-cfg-int-subint-apihc-apivat-func.robot
diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-intip4-intip6-apihc-apivat-func.robot b/tests/honeycomb/func/mgmt-cfg-intip4-intip6-apihc-apivat-func.robot
index 9565564100..9565564100 100644
--- a/tests/vpp/func/honeycomb/mgmt-cfg-intip4-intip6-apihc-apivat-func.robot
+++ b/tests/honeycomb/func/mgmt-cfg-intip4-intip6-apihc-apivat-func.robot
diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-inttap-apihc-apivat-func.robot b/tests/honeycomb/func/mgmt-cfg-inttap-apihc-apivat-func.robot
index cffec5b246..cffec5b246 100644
--- a/tests/vpp/func/honeycomb/mgmt-cfg-inttap-apihc-apivat-func.robot
+++ b/tests/honeycomb/func/mgmt-cfg-inttap-apihc-apivat-func.robot
diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-intvhost-apihc-apivat-func.robot b/tests/honeycomb/func/mgmt-cfg-intvhost-apihc-apivat-func.robot
index c5cbe6ea4a..c5cbe6ea4a 100644
--- a/tests/vpp/func/honeycomb/mgmt-cfg-intvhost-apihc-apivat-func.robot
+++ b/tests/honeycomb/func/mgmt-cfg-intvhost-apihc-apivat-func.robot
diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-l2bd-apihc-apivat-func.robot b/tests/honeycomb/func/mgmt-cfg-l2bd-apihc-apivat-func.robot
index a869e96c11..a869e96c11 100644
--- a/tests/vpp/func/honeycomb/mgmt-cfg-l2bd-apihc-apivat-func.robot
+++ b/tests/honeycomb/func/mgmt-cfg-l2bd-apihc-apivat-func.robot
diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-l2fib-apihc-apivat-func.robot b/tests/honeycomb/func/mgmt-cfg-l2fib-apihc-apivat-func.robot
index 9aae85c7ac..9aae85c7ac 100644
--- a/tests/vpp/func/honeycomb/mgmt-cfg-l2fib-apihc-apivat-func.robot
+++ b/tests/honeycomb/func/mgmt-cfg-l2fib-apihc-apivat-func.robot
diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-lisp-apihc-apivat-func.robot b/tests/honeycomb/func/mgmt-cfg-lisp-apihc-apivat-func.robot
index 0198e8205c..0198e8205c 100644
--- a/tests/vpp/func/honeycomb/mgmt-cfg-lisp-apihc-apivat-func.robot
+++ b/tests/honeycomb/func/mgmt-cfg-lisp-apihc-apivat-func.robot
diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-lispgpe-apihc-apivat-func.robot b/tests/honeycomb/func/mgmt-cfg-lispgpe-apihc-apivat-func.robot
index a4d66b5581..a4d66b5581 100644
--- a/tests/vpp/func/honeycomb/mgmt-cfg-lispgpe-apihc-apivat-func.robot
+++ b/tests/honeycomb/func/mgmt-cfg-lispgpe-apihc-apivat-func.robot
diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-nsh-apihc-apivat-func.robot b/tests/honeycomb/func/mgmt-cfg-nsh-apihc-apivat-func.robot
index 46deef1692..46deef1692 100644
--- a/tests/vpp/func/honeycomb/mgmt-cfg-nsh-apihc-apivat-func.robot
+++ b/tests/honeycomb/func/mgmt-cfg-nsh-apihc-apivat-func.robot
diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-pbb-apihc-apivat-func.robot b/tests/honeycomb/func/mgmt-cfg-pbb-apihc-apivat-func.robot
index 4547c0c4bf..4547c0c4bf 100644
--- a/tests/vpp/func/honeycomb/mgmt-cfg-pbb-apihc-apivat-func.robot
+++ b/tests/honeycomb/func/mgmt-cfg-pbb-apihc-apivat-func.robot
diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-pluginacl-apihc-apivat-func.robot b/tests/honeycomb/func/mgmt-cfg-pluginacl-apihc-apivat-func.robot
index 302b22fa4e..302b22fa4e 100644
--- a/tests/vpp/func/honeycomb/mgmt-cfg-pluginacl-apihc-apivat-func.robot
+++ b/tests/honeycomb/func/mgmt-cfg-pluginacl-apihc-apivat-func.robot
diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-policer-apihc-func.robot b/tests/honeycomb/func/mgmt-cfg-policer-apihc-func.robot
index 1f4d2a9021..1f4d2a9021 100644
--- a/tests/vpp/func/honeycomb/mgmt-cfg-policer-apihc-func.robot
+++ b/tests/honeycomb/func/mgmt-cfg-policer-apihc-func.robot
diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-proxyarp-apihc-func.robot b/tests/honeycomb/func/mgmt-cfg-proxyarp-apihc-func.robot
index 1404633acd..1404633acd 100644
--- a/tests/vpp/func/honeycomb/mgmt-cfg-proxyarp-apihc-func.robot
+++ b/tests/honeycomb/func/mgmt-cfg-proxyarp-apihc-func.robot
diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-proxynd6-apihc-func.robot b/tests/honeycomb/func/mgmt-cfg-proxynd6-apihc-func.robot
index 4425750add..4425750add 100644
--- a/tests/vpp/func/honeycomb/mgmt-cfg-proxynd6-apihc-func.robot
+++ b/tests/honeycomb/func/mgmt-cfg-proxynd6-apihc-func.robot
diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-routing-apihc-apivat-func.robot b/tests/honeycomb/func/mgmt-cfg-routing-apihc-apivat-func.robot
index 540093fe07..540093fe07 100644
--- a/tests/vpp/func/honeycomb/mgmt-cfg-routing-apihc-apivat-func.robot
+++ b/tests/honeycomb/func/mgmt-cfg-routing-apihc-apivat-func.robot
diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-slaac-apihc-func.robot b/tests/honeycomb/func/mgmt-cfg-slaac-apihc-func.robot
index 8a54918032..8a54918032 100644
--- a/tests/vpp/func/honeycomb/mgmt-cfg-slaac-apihc-func.robot
+++ b/tests/honeycomb/func/mgmt-cfg-slaac-apihc-func.robot
diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-snat44-apihc-apivat-func.robot b/tests/honeycomb/func/mgmt-cfg-snat44-apihc-apivat-func.robot
index 2ce02c6aa1..2ce02c6aa1 100644
--- a/tests/vpp/func/honeycomb/mgmt-cfg-snat44-apihc-apivat-func.robot
+++ b/tests/honeycomb/func/mgmt-cfg-snat44-apihc-apivat-func.robot
diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-spanrx-apihc-apivat-func.robot b/tests/honeycomb/func/mgmt-cfg-spanrx-apihc-apivat-func.robot
index ccb674fbd7..ccb674fbd7 100644
--- a/tests/vpp/func/honeycomb/mgmt-cfg-spanrx-apihc-apivat-func.robot
+++ b/tests/honeycomb/func/mgmt-cfg-spanrx-apihc-apivat-func.robot
diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-vxlan-apihc-apivat-func.robot b/tests/honeycomb/func/mgmt-cfg-vxlan-apihc-apivat-func.robot
index 76615264c5..76615264c5 100644
--- a/tests/vpp/func/honeycomb/mgmt-cfg-vxlan-apihc-apivat-func.robot
+++ b/tests/honeycomb/func/mgmt-cfg-vxlan-apihc-apivat-func.robot
diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-vxlangpe-apihc-apivat-func.robot b/tests/honeycomb/func/mgmt-cfg-vxlangpe-apihc-apivat-func.robot
index 1d7cde0fd0..1d7cde0fd0 100644
--- a/tests/vpp/func/honeycomb/mgmt-cfg-vxlangpe-apihc-apivat-func.robot
+++ b/tests/honeycomb/func/mgmt-cfg-vxlangpe-apihc-apivat-func.robot
diff --git a/tests/vpp/func/honeycomb/mgmt-notif-apihcnc-func.robot b/tests/honeycomb/func/mgmt-notif-apihcnc-func.robot
index 5320a7fcb7..5320a7fcb7 100644
--- a/tests/vpp/func/honeycomb/mgmt-notif-apihcnc-func.robot
+++ b/tests/honeycomb/func/mgmt-notif-apihcnc-func.robot
diff --git a/tests/vpp/func/honeycomb/mgmt-statepersist-apihc-func.robot b/tests/honeycomb/func/mgmt-statepersist-apihc-func.robot
index b7fe610b18..b7fe610b18 100644
--- a/tests/vpp/func/honeycomb/mgmt-statepersist-apihc-func.robot
+++ b/tests/honeycomb/func/mgmt-statepersist-apihc-func.robot
diff --git a/tests/vpp/perf/honeycomb/__init__.robot b/tests/honeycomb/perf/__init__.robot
index b984993139..b984993139 100644
--- a/tests/vpp/perf/honeycomb/__init__.robot
+++ b/tests/honeycomb/perf/__init__.robot
diff --git a/tests/vpp/perf/honeycomb/localhostp1-tcp-netconf16t-crud-read.robot b/tests/honeycomb/perf/localhostp1-tcp-netconf16t-crud-read.robot
index c13851cc62..c13851cc62 100644
--- a/tests/vpp/perf/honeycomb/localhostp1-tcp-netconf16t-crud-read.robot
+++ b/tests/honeycomb/perf/localhostp1-tcp-netconf16t-crud-read.robot
diff --git a/tests/vpp/perf/honeycomb/localhostp1-tcp-netconf1t-crud-read.robot b/tests/honeycomb/perf/localhostp1-tcp-netconf1t-crud-read.robot
index d46fdf795b..d46fdf795b 100644
--- a/tests/vpp/perf/honeycomb/localhostp1-tcp-netconf1t-crud-read.robot
+++ b/tests/honeycomb/perf/localhostp1-tcp-netconf1t-crud-read.robot
diff --git a/tests/vpp/perf/honeycomb/localhostp1-tcp-netconf8t-crud-read.robot b/tests/honeycomb/perf/localhostp1-tcp-netconf8t-crud-read.robot
index 9928f15f1d..9928f15f1d 100644
--- a/tests/vpp/perf/honeycomb/localhostp1-tcp-netconf8t-crud-read.robot
+++ b/tests/honeycomb/perf/localhostp1-tcp-netconf8t-crud-read.robot