diff options
| author |   Michal Cmarada <mcmarada@cisco.com> | 2019-05-27 13:58:23 +0200 |
|---|---|---|
| committer | Michal Cmarada <mcmarada@cisco.com> | 2019-05-27 15:27:34 +0000 |
| commit | 5cbb3f1640bc490f52a16da31ef378bfab4af644 (patch) | |
| tree | 4d7dc2fdec86ec8c91db68b1f07046e825441cf4 /resources | |
| parent | 1fea09e6c0634ea7f02f9b94883a8261ff3769b1 (diff) | |
HC2VPP-411: migrate interfaces-state to interfaces
- new ietf-interfaces makes interfaces-state obsolete
- updates honeycomb tests to latest ietf-interfaces model
Change-Id: I5502a5ab23661429caca9498407d7121d423a1a3
Signed-off-by: Michal Cmarada <mcmarada@cisco.com>
Diffstat (limited to 'resources')
5 files changed, 7 insertions, 7 deletions
diff --git a/resources/libraries/python/honeycomb/HcAPIKwInterfaces.py b/resources/libraries/python/honeycomb/HcAPIKwInterfaces.py index e9ef13352b..662fedca10 100644 --- a/resources/libraries/python/honeycomb/HcAPIKwInterfaces.py +++ b/resources/libraries/python/honeycomb/HcAPIKwInterfaces.py @@ -160,7 +160,7 @@ class InterfaceKeywords(object): "Not possible to get operational information about the " "interfaces. Status code: {0}.".format(status_code)) try: - return resp["interfaces-state"]["interface"] + return resp["interfaces"]["interface"] except (KeyError, TypeError): return [] diff --git a/resources/libraries/robot/honeycomb/notifications.robot b/resources/libraries/robot/honeycomb/notifications.robot index f46f7eec66..c5a481739c 100644 --- a/resources/libraries/robot/honeycomb/notifications.robot +++ b/resources/libraries/robot/honeycomb/notifications.robot @@ -45,7 +45,7 @@ | | ... | \| GigabitEthernet0/8/0 \| up \| | | [Arguments] | ${interface} | ${state} | | ${reply}= | Get notification -| | Should contain | ${reply} | <interface-state-change +| | Should contain | ${reply} | <interface-change | | Should contain | ${reply} | <name>${interface}</name> | | Should contain | ${reply} | <admin-status>${state}</admin-status> diff --git a/resources/libraries/robot/honeycomb/port_mirroring.robot b/resources/libraries/robot/honeycomb/port_mirroring.robot index 64faa5e233..1ce233f57d 100644 --- a/resources/libraries/robot/honeycomb/port_mirroring.robot +++ b/resources/libraries/robot/honeycomb/port_mirroring.robot @@ -192,7 +192,7 @@ | | ${data}= | Get sub interface oper data | | ... | ${node} | ${dst_interface} | ${index} | | ${data}= | Set Variable -| | ... | ${data['subinterface-span:span-state']['mirrored-interfaces']['mirrored-interface']} +| | ... | ${data['subinterface-span:span']['mirrored-interfaces']['mirrored-interface']} | | Sort list | ${data} | | Sort list | ${src_interfaces} | | Lists should be equal | ${data} | ${src_interfaces} @@ -214,7 +214,7 @@ | | ${data}= | Get sub interface oper data | | ... | ${node} | ${dst_interface} | ${index} | | Variable should not exist -| | ... | ${data['subinterface-span:span-state']['mirrored-interfaces']['mirrored-interface']} +| | ... | ${data['subinterface-span:span']['mirrored-interfaces']['mirrored-interface']} | Honeycomb removes sub-interface SPAN configuration | | [Documentation] | Uses Honeycomb API to remove SPAN Operational Data\ @@ -252,4 +252,4 @@ | | ${data}= | Get sub interface oper data | | ... | ${node} | ${dst_interface} | ${index} | | Run keyword and expect error | *KeyError* | Set Variable -| | ... | ${data['subinterface-span:span-state']['mirrored-interfaces']['mirrored-interface']}
\ No newline at end of file +| | ... | ${data['subinterface-span:span']['mirrored-interfaces']['mirrored-interface']}
\ No newline at end of file diff --git a/resources/templates/honeycomb/oper_vpp_interfaces.url b/resources/templates/honeycomb/oper_vpp_interfaces.url index cae9e41b68..7f1a3d6c85 100644 --- a/resources/templates/honeycomb/oper_vpp_interfaces.url +++ b/resources/templates/honeycomb/oper_vpp_interfaces.url @@ -1 +1 @@ -/restconf/operational{odl_url_part}/ietf-interfaces:interfaces-state
\ No newline at end of file +/restconf/operational{odl_url_part}/ietf-interfaces:interfaces
\ No newline at end of file diff --git a/resources/test_data/honeycomb/netconf/triggers.py b/resources/test_data/honeycomb/netconf/triggers.py index 0db68dd1f0..7c5fade8dd 100644 --- a/resources/test_data/honeycomb/netconf/triggers.py +++ b/resources/test_data/honeycomb/netconf/triggers.py @@ -327,7 +327,7 @@ xmlns:a="urn:ietf:params:xml:ns:netconf:base:1.0" a:operation="replace"> <rpc message-id="m-27" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"> <get> <filter xmlns:ns0="urn:ietf:params:xml:ns:netconf:base:1.0" ns0:type="subtree"> -<interfaces-state xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"/> +<interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"/> </filter> </get> </rpc> |