From aa25184f3f0925b789de52296053dd51e2bf8684 Mon Sep 17 00:00:00 2001 From: Michal Cmarada Date: Mon, 8 Apr 2019 12:27:32 +0200 Subject: Fix l2 Honeycomb tests Change-Id: Ic75a9279fffe3a5d11211f4e57fc635d7d33ee5f Signed-off-by: Michal Cmarada --- .../mgmt-cfg-int-subint-apihc-apivat-func.robot | 2 +- .../func/mgmt-cfg-l2bd-apihc-apivat-func.robot | 8 ++--- .../func/mgmt-cfg-l2fib-apihc-apivat-func.robot | 38 +++++++++++----------- 3 files changed, 24 insertions(+), 24 deletions(-) (limited to 'tests/honeycomb') diff --git a/tests/honeycomb/func/mgmt-cfg-int-subint-apihc-apivat-func.robot b/tests/honeycomb/func/mgmt-cfg-int-subint-apihc-apivat-func.robot index 82bb5b2a8e..12483ad864 100644 --- a/tests/honeycomb/func/mgmt-cfg-int-subint-apihc-apivat-func.robot +++ b/tests/honeycomb/func/mgmt-cfg-int-subint-apihc-apivat-func.robot @@ -192,7 +192,7 @@ | | ... | ${node} | ${super_if} | ${sub_if_id} | ${sub_bd_settings} | | Then sub-interface bridge domain Operational Data From Honeycomb Should Be | | ... | ${node} | ${super_if} | ${sub_if_id} | ${sub_bd_settings} -| | And sub-interface bridge domain Operational Data From VAT Should Be +| | And Sub-interface bridge domain Operational Data From PAPI Should Be | | ... | ${node} | ${sub_if_name} | ${sub_bd_settings} | | And sub-interface Operational Data From VAT Should Be | | ... | ${node} | ${sub_if_name} | ${sub_if_1_oper} diff --git a/tests/honeycomb/func/mgmt-cfg-l2bd-apihc-apivat-func.robot b/tests/honeycomb/func/mgmt-cfg-l2bd-apihc-apivat-func.robot index a869e96c11..5f20c6c927 100644 --- a/tests/honeycomb/func/mgmt-cfg-l2bd-apihc-apivat-func.robot +++ b/tests/honeycomb/func/mgmt-cfg-l2bd-apihc-apivat-func.robot @@ -73,7 +73,7 @@ | | ... | ${node} | ${bd1_name} | ${bd_settings} | | When Honeycomb removes all bridge domains | ${node} | | Then Honeycomb should show no bridge domains | ${node} -| | And VAT should show no bridge domains | ${node} +| | And PAPI should show no bridge domains | ${node} | TC04: Honeycomb assigns interfaces to bridge domain | | [Documentation] | Check if Honeycomb can assign VPP interfaces to an\ @@ -89,7 +89,7 @@ | | ... | ${node} | ${0} | ${bd_settings} | | And Honeycomb should show interfaces assigned to bridge domain | | ... | ${node} | @{interfaces} | ${bd1_name} | ${if_settings} -| | And VAT should show interfaces assigned to bridge domain +| | And PAPI should show interfaces assigned to bridge domain | | ... | ${node} | ${0} | @{interfaces} | ${if_settings} | TC05: Honeycomb cannot remove bridge domain with an interface assigned @@ -102,7 +102,7 @@ | | ... | ${node} | ${0} | ${bd_settings} | | And Honeycomb should show interfaces assigned to bridge domain | | ... | ${node} | @{interfaces} | ${bd1_name} | ${if_settings} -| | And VAT should show interfaces assigned to bridge domain +| | And PAPI should show interfaces assigned to bridge domain | | ... | ${node} | ${0} | @{interfaces} | ${if_settings} | | When Run keyword and expect error | HoneycombError* Status code: 500. | | ... | Honeycomb removes all bridge domains | ${node} @@ -112,5 +112,5 @@ | | ... | ${node} | ${0} | ${bd_settings} | | And Honeycomb should show interfaces assigned to bridge domain | | ... | ${node} | @{interfaces} | ${bd1_name} | ${if_settings} -| | And VAT should show interfaces assigned to bridge domain +| | And PAPI should show interfaces assigned to bridge domain | | ... | ${node} | ${0} | @{interfaces} | ${if_settings} diff --git a/tests/honeycomb/func/mgmt-cfg-l2fib-apihc-apivat-func.robot b/tests/honeycomb/func/mgmt-cfg-l2fib-apihc-apivat-func.robot index 9aae85c7ac..d13bb6354f 100644 --- a/tests/honeycomb/func/mgmt-cfg-l2fib-apihc-apivat-func.robot +++ b/tests/honeycomb/func/mgmt-cfg-l2fib-apihc-apivat-func.robot @@ -60,13 +60,13 @@ | | ... | ${node} | ${interface} | ${if_bd_settings} | | Given L2 FIB Table from Honeycomb should be empty | | ... | ${node} | ${bd_name} -| | And L2 FIB Table from VAT should be empty +| | And L2 FIB Table from PAPI should be empty | | ... | ${node} | ${bd_index} | | When Honeycomb adds L2 FIB entry to bridge domain | | ... | ${node} | ${bd_name} | ${l2_fib_forward_cfg} | | Then L2 FIB Entry from Honeycomb should be | | ... | ${node} | ${bd_name} | ${l2_fib_forward_oper} -| | And L2 FIB entry from VAT should be +| | And L2 FIB entry from PAPI should be | | ... | ${node} | ${bd_index} | ${l2_fib_forward_vat} | TC02: Honeycomb adds L2 FIB entry (static, forward) @@ -80,13 +80,13 @@ | | ... | ${node} | ${interface} | ${if_bd_settings} | | And L2 FIB Table from Honeycomb should be empty | | ... | ${node} | ${bd_name} -| | And L2 FIB Table from VAT should be empty +| | And L2 FIB Table from PAPI should be empty | | ... | ${node} | ${bd_index} | | When Honeycomb adds L2 FIB entry to bridge domain | | ... | ${node} | ${bd_name} | ${l2_fib_static_forward_cfg} | | Then L2 FIB Entry from Honeycomb should be | | ... | ${node} | ${bd_name} | ${l2_fib_static_forward_oper} -| | And L2 FIB entry from VAT should be +| | And L2 FIB entry from PAPI should be | | ... | ${node} | ${bd_index} | ${l2_fib_static_forward_vat} | TC03: Honeycomb adds L2 FIB entry (static, filter) @@ -100,13 +100,13 @@ | | ... | ${node} | ${interface} | ${if_bd_settings} | | And L2 FIB Table from Honeycomb should be empty | | ... | ${node} | ${bd_name} -| | And L2 FIB Table from VAT should be empty +| | And L2 FIB Table from PAPI should be empty | | ... | ${node} | ${bd_index} | | When Honeycomb adds L2 FIB entry to bridge domain | | ... | ${node} | ${bd_name} | ${l2_fib_filter_cfg} | | Then L2 FIB Entry from Honeycomb should be | | ... | ${node} | ${bd_name} | ${l2_fib_filter_oper} -| | And L2 FIB entry from VAT should be +| | And L2 FIB entry from PAPI should be | | ... | ${node} | ${bd_index} | ${l2_fib_filter_vat} | TC04: Honeycomb adds and removes L2 FIB entry (forward) @@ -120,19 +120,19 @@ | | ... | ${node} | ${interface} | ${if_bd_settings} | | And L2 FIB Table from Honeycomb should be empty | | ... | ${node} | ${bd_name} -| | And L2 FIB Table from VAT should be empty +| | And L2 FIB Table from PAPI should be empty | | ... | ${node} | ${bd_index} | | When Honeycomb adds L2 FIB entry to bridge domain | | ... | ${node} | ${bd_name} | ${l2_fib_forward_cfg} | | Then L2 FIB Entry from Honeycomb should be | | ... | ${node} | ${bd_name} | ${l2_fib_forward_oper} -| | And L2 FIB entry from VAT should be +| | And L2 FIB entry from PAPI should be | | ... | ${node} | ${bd_index} | ${l2_fib_forward_vat} | | When Honeycomb removes L2 FIB entry | | ... | ${node} | ${bd_name} | ${l2_fib_forward_oper['phys-address']} | | Then L2 FIB Table from Honeycomb should be empty | | ... | ${node} | ${bd_name} -| | And L2 FIB Table from VAT should be empty +| | And L2 FIB Table from PAPI should be empty | | ... | ${node} | ${bd_index} | TC05: Honeycomb adds more than one L2 FIB entry @@ -145,7 +145,7 @@ | | ... | ${node} | ${interface} | ${if_bd_settings} | | And L2 FIB Table from Honeycomb should be empty | | ... | ${node} | ${bd_name} -| | And L2 FIB Table from VAT should be empty +| | And L2 FIB Table from PAPI should be empty | | ... | ${node} | ${bd_index} | | When Honeycomb adds L2 FIB entry to bridge domain | | ... | ${node} | ${bd_name} | ${l2_fib_forward_cfg} @@ -159,11 +159,11 @@ | | ... | ${node} | ${bd_name} | ${l2_fib_static_forward_oper} | | And L2 FIB Entry from Honeycomb should be | | ... | ${node} | ${bd_name} | ${l2_fib_filter_oper} -| | And L2 FIB entry from VAT should be +| | And L2 FIB entry from PAPI should be | | ... | ${node} | ${bd_index} | ${l2_fib_forward_vat} -| | And L2 FIB entry from VAT should be +| | And L2 FIB entry from PAPI should be | | ... | ${node} | ${bd_index} | ${l2_fib_static_forward_vat} -| | And L2 FIB entry from VAT should be +| | And L2 FIB entry from PAPI should be | | ... | ${node} | ${bd_index} | ${l2_fib_filter_vat} | TC06: Honeycomb fails to set wrong L2 FIB entry @@ -177,25 +177,25 @@ | | ... | ${node} | ${interface} | ${if_bd_settings} | | And L2 FIB Table from Honeycomb should be empty | | ... | ${node} | ${bd_name} -| | And L2 FIB Table from VAT should be empty +| | And L2 FIB Table from PAPI should be empty | | ... | ${node} | ${bd_index} | | When Honeycomb fails to add wrong L2 FIB entry | | ... | ${node} | ${bd_name} | ${l2_fib_forward_cfg_wrong_mac} | | Then L2 FIB Table from Honeycomb should be empty | | ... | ${node} | ${bd_name} -| | And L2 FIB Table from VAT should be empty +| | And L2 FIB Table from PAPI should be empty | | ... | ${node} | ${bd_index} | | When Honeycomb fails to add wrong L2 FIB entry | | ... | ${node} | ${bd_name} | ${l2_fib_forward_cfg_wrong_if} | | Then L2 FIB Table from Honeycomb should be empty | | ... | ${node} | ${bd_name} -| | And L2 FIB Table from VAT should be empty +| | And L2 FIB Table from PAPI should be empty | | ... | ${node} | ${bd_index} | | When Honeycomb fails to add wrong L2 FIB entry | | ... | ${node} | ${bd_name} | ${l2_fib_forward_cfg_wrong_action} | | Then L2 FIB Table from Honeycomb should be empty | | ... | ${node} | ${bd_name} -| | And L2 FIB Table from VAT should be empty +| | And L2 FIB Table from PAPI should be empty | | ... | ${node} | ${bd_index} | TC07: Honeycomb fails to modify existing L2 FIB entry @@ -209,7 +209,7 @@ | | ... | ${node} | ${interface} | ${if_bd_settings} | | And L2 FIB Table from Honeycomb should be empty | | ... | ${node} | ${bd_name} -| | And L2 FIB Table from VAT should be empty +| | And L2 FIB Table from PAPI should be empty | | ... | ${node} | ${bd_index} | | When Honeycomb adds L2 FIB entry to bridge domain | | ... | ${node} | ${bd_name} | ${l2_fib_forward_cfg} @@ -221,7 +221,7 @@ | | ... | ${l2_fib_forward_modified_cfg['outgoing-interface']} | | Then L2 FIB Entry from Honeycomb should be | | ... | ${node} | ${bd_name} | ${l2_fib_forward_oper} -| | And L2 FIB entry from VAT should be +| | And L2 FIB entry from PAPI should be | | ... | ${node} | ${bd_index} | ${l2_fib_forward_vat} *** Keywords *** -- cgit 1.2.3-korg