From 6417e5d0e7acd7ecf1fd89b2a5962f48ee9b102f Mon Sep 17 00:00:00 2001 From: selias Date: Wed, 30 Aug 2017 19:00:43 +0200 Subject: HC Test: add missing teardown to multi-IP traffic test Change-Id: I43cc3fffa2a5a8a7bcd965937fcd0bc3e5ac3b24 Signed-off-by: selias --- resources/libraries/python/honeycomb/HcAPIKwInterfaces.py | 12 ++++++++++++ .../honeycomb/mgmt-cfg-intip4-intip6-apihc-apivat-func.robot | 9 +++++++++ 2 files changed, 21 insertions(+) diff --git a/resources/libraries/python/honeycomb/HcAPIKwInterfaces.py b/resources/libraries/python/honeycomb/HcAPIKwInterfaces.py index 6f0bdda9fe..17ed3b8246 100644 --- a/resources/libraries/python/honeycomb/HcAPIKwInterfaces.py +++ b/resources/libraries/python/honeycomb/HcAPIKwInterfaces.py @@ -556,6 +556,9 @@ class InterfaceKeywords(object): :rtype: bytearray """ + interface = Topology.convert_interface_reference( + node, interface, "name") + path = ("interfaces", ("interface", "name", interface), "ietf-ip:ipv4", "address") return InterfaceKeywords._set_interface_properties( @@ -598,6 +601,9 @@ class InterfaceKeywords(object): :rtype: bytearray """ + interface = Topology.convert_interface_reference( + node, interface, "name") + path = ("interfaces", ("interface", "name", interface), "ietf-ip:ipv4", "neighbor") return InterfaceKeywords._set_interface_properties( @@ -696,6 +702,9 @@ class InterfaceKeywords(object): :rtype: bytearray """ + interface = Topology.convert_interface_reference( + node, interface, "name") + path = ("interfaces", ("interface", "name", interface), "ietf-ip:ipv6", "address") return InterfaceKeywords._set_interface_properties( @@ -738,6 +747,9 @@ class InterfaceKeywords(object): :rtype: bytearray """ + interface = Topology.convert_interface_reference( + node, interface, "name") + path = ("interfaces", ("interface", "name", interface), "ietf-ip:ipv6", "neighbor") return InterfaceKeywords._set_interface_properties( diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-intip4-intip6-apihc-apivat-func.robot b/tests/vpp/func/honeycomb/mgmt-cfg-intip4-intip6-apihc-apivat-func.robot index f0f6e4e6ad..4c5cb8fe45 100644 --- a/tests/vpp/func/honeycomb/mgmt-cfg-intip4-intip6-apihc-apivat-func.robot +++ b/tests/vpp/func/honeycomb/mgmt-cfg-intip4-intip6-apihc-apivat-func.robot @@ -170,6 +170,7 @@ | | ... | of source and destination IP addresses. Receive an ICMP reply\ | | ... | for every packet sent. | | ... +| | [Teardown] | Tear down Multiple IP Address Test | ${node} | ${dut_to_tg_if1} | | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | When Honeycomb sets interface IPv4 address with prefix @@ -291,3 +292,11 @@ | | ... | ${node} | ${interface} | 10::FF11 | ${64} | | And Honeycomb fails to add interface IPv6 address | | ... | ${node} | ${interface} | 10::FFFF | ${64} + +*** Keywords *** +| Tear down Multiple IP Address Test +| | [Arguments] | ${node} | ${interface} +| | Honeycomb removes interface IPv4 addresses | ${node} | ${interface} +| | Honeycomb removes interface IPv6 addresses | ${node} | ${interface} +| | Honeycomb clears all interface IPv4 neighbors | ${node} | ${interface} +| | Honeycomb clears all interface IPv6 neighbors | ${node} | ${interface} \ No newline at end of file -- cgit 1.2.3-korg