# ===================
| TC01: Honeycomb persists configuration through restart of both Honeycomb and VPP
| | [Documentation] | Checks if Honeycomb maintains configuration after both\
-| | ... | Honeycomb and VPP are restarted.
+| | ... | Restart Honeycomb and VPP.
| | [Tags] | HC_FUNC
| | [Teardown]
| | ... | Restart Honeycomb And VPP And Clear Persisted Configuration | ${node}
| | Given Multi-Feature Persistence test configuration | ${node} | ${interface}
| | And Multi-Feature persistence Test Verification | ${node} | ${interface}
| | And Log persisted configuration on node | ${node}
-| | When Honeycomb and VPP are restarted | ${node}
+| | When Restart Honeycomb and VPP | ${node}
| | Then Multi-Feature persistence Test Verification | ${node} | ${interface}
| TC02: Honeycomb reverts to defaults if persistence files are invalid
| | Given Multi-Feature Persistence test configuration | ${node} | ${interface}
| | And Multi-Feature persistence Test Verification | ${node} | ${interface}
| | And Log persisted configuration on node | ${node}
-| | When Honeycomb is restarted | ${node}
+| | When Restart Honeycomb | ${node}
| | Then Multi-Feature persistence Test Verification | ${node} | ${interface}
| TC04: Honeycomb persists configuration through restart of VPP
| | Given Multi-Feature Persistence test configuration | ${node} | ${interface}
| | And Multi-Feature persistence Test Verification | ${node} | ${interface}
| | And Log persisted configuration on node | ${node}
-| | When VPP is restarted | ${node}
+| | When Restart VPP | ${node}
| | Then Multi-Feature persistence Test Verification | ${node} | ${interface}
# single-feature cases
| | ... | Restart Honeycomb And VPP And Clear Persisted Configuration | ${node}
| | Given Interface Persistence Setup | ${node}
| | And Interface Persistence Check | ${node}
-| | When Honeycomb and VPP are restarted | ${node}
+| | When Restart Honeycomb and VPP | ${node}
| | Then Interface Persistence Check | ${node}
| TC06: Persist configuration of IP addresses and neighbors - HC restart
| | ... | Restart Honeycomb And VPP And Clear Persisted Configuration | ${node}
| | Given Interface Persistence Setup | ${node}
| | And Interface Persistence Check | ${node}
-| | When Honeycomb is restarted | ${node}
+| | When Restart Honeycomb | ${node}
| | Then Interface Persistence Check | ${node}
| TC07: Persist configuration of IP addresses and neighbors - VPP restart
| | ... | Restart Honeycomb And VPP And Clear Persisted Configuration | ${node}
| | Given Interface Persistence Setup | ${node}
| | And Interface Persistence Check | ${node}
-| | When VPP is restarted | ${node}
+| | When Restart VPP | ${node}
| | Then Interface Persistence Check | ${node}
| TC08: Honeycomb persists configuration of bridge domains - HC and VPP restart
| | [Teardown]
| | ... | Restart Honeycomb And VPP And Clear Persisted Configuration | ${node}
| | Given Bridge Domain Persistence Setup | ${node}
-| | When Honeycomb and VPP are restarted | ${node}
+| | When Restart Honeycomb and VPP | ${node}
| | Then Bridge Domain Persistence Check | ${node}
| TC09: Honeycomb persists configuration of bridge domains - HC restart
| | [Teardown]
| | ... | Restart Honeycomb And VPP And Clear Persisted Configuration | ${node}
| | Given Bridge Domain Persistence Setup | ${node}
-| | When Honeycomb is restarted | ${node}
+| | When Restart Honeycomb | ${node}
| | Then Bridge Domain Persistence Check | ${node}
| TC10: Honeycomb persists configuration of bridge domains - VPP restart
| | [Teardown]
| | ... | Restart Honeycomb And VPP And Clear Persisted Configuration | ${node}
| | Given Bridge Domain Persistence Setup | ${node}
-| | When VPP is restarted | ${node}
+| | When Restart VPP | ${node}
| | Then Bridge Domain Persistence Check | ${node}
#TODO: All other features