diff options
| author |   Michal Cmarada <michal.cmarada@pantheon.tech> | 2018-05-09 14:00:53 +0200 |
|---|---|---|
| committer | Michal Cmarada <michal.cmarada@pantheon.tech> | 2018-05-10 11:04:16 +0000 |
| commit | abd1c00c657242ac481526d7cccfb53b5a8d86bd (patch) | |
| tree | e7934cacae77f9bec4272290fae532eec6aa08bd /resources/libraries/python/honeycomb/Routing.py | |
| parent | 6e9d38fbad8198f8647e3e71d12b5859490c21f2 (diff) | |
HC2VPP-253 - Update routing csit jobs
this fixes test failures caused by HC2VPP routing
models bump (https://gerrit.fd.io/r/#/c/10954)
- updates tests for bgp routing
- updates tests for routing
- updates SLAAC test because of changes in rt-advertisements
Change-Id: Iacc37b42e6523f440d77241c18ca8e61d1d01f23
Signed-off-by: Michal Cmarada <michal.cmarada@pantheon.tech>
Diffstat (limited to 'resources/libraries/python/honeycomb/Routing.py')
| -rw-r--r-- | resources/libraries/python/honeycomb/Routing.py | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/resources/libraries/python/honeycomb/Routing.py b/resources/libraries/python/honeycomb/Routing.py index 520f53e676..8d8f7f4401 100644 --- a/resources/libraries/python/honeycomb/Routing.py +++ b/resources/libraries/python/honeycomb/Routing.py @@ -98,11 +98,10 @@ class RoutingKeywords(object): protocol = "vpp-protocol-attributes" full_data = { - "routing-protocol": [ + "control-plane-protocol": [ { "name": name, "description": "hc2vpp-csit test route", - "enabled": "true", "type": "static", protocol: { "primary-vrf": vrf @@ -116,7 +115,7 @@ class RoutingKeywords(object): ] } - path = "/routing-protocol/{0}".format(name) + path = "/control-plane-protocol/hc2vpp-ietf-routing:static/{0}".format(name) return RoutingKeywords._set_routing_table_properties( node, path, full_data) @@ -132,7 +131,7 @@ class RoutingKeywords(object): :rtype: bytearray """ - path = "/routing-protocol/{0}".format(name) + path = "/control-plane-protocol/hc2vpp-ietf-routing:static/{0}".format(name) return RoutingKeywords._set_routing_table_properties(node, path) @staticmethod @@ -150,7 +149,7 @@ class RoutingKeywords(object): :raises HoneycombError: If the operation fails. """ - path = "/routing-protocol/{0}".format(name) + path = "/control-plane-protocol/hc2vpp-ietf-routing:static/{0}".format(name) status_code, resp = HcUtil.\ get_honeycomb_data(node, "oper_routing_table", path) @@ -160,7 +159,7 @@ class RoutingKeywords(object): "routing tables. Status code: {0}.".format(status_code)) data = RoutingKeywords.clean_routing_oper_data( - resp['routing-protocol'][0]['static-routes'] + resp['control-plane-protocol'][0]['static-routes'] ['hc2vpp-ietf-{0}-unicast-routing:{0}'.format(ip_version)]['route']) return data @@ -219,21 +218,15 @@ class RoutingKeywords(object): interface = Topology.convert_interface_reference( node, interface, 'name') - interface_orig = interface interface = interface.replace('/', '%2F') - path = 'interface/' + interface + path = 'interface/' + interface + '/ipv6/ipv6-router-advertisements' if not slaac_data: status_code, _ = HcUtil.delete_honeycomb_data( node, 'config_slaac', path) else: data = { - 'interface': [ - { - 'name': interface_orig, - 'ipv6-router-advertisements': slaac_data - } - ] + 'ipv6-router-advertisements': slaac_data } status_code, _ = HcUtil.put_honeycomb_data( @@ -258,7 +251,7 @@ class RoutingKeywords(object): interface = Topology.convert_interface_reference( node, interface, 'name') interface = interface.replace('/', '%2F') - path = 'interface/' + interface + path = 'interface/' + interface + '/ipv6/ipv6-router-advertisements' status_code, resp = HcUtil.\ get_honeycomb_data(node, "config_slaac", path) @@ -268,7 +261,7 @@ class RoutingKeywords(object): "Not possible to get operational information about SLAAC. " "Status code: {0}.".format(status_code)) try: - dict_of_str = resp['interface'][0][ + dict_of_str = resp[ 'hc2vpp-ietf-ipv6-unicast-routing:ipv6-router-advertisements'] return {k: str(v) for k, v in dict_of_str.items()} except (KeyError, TypeError): |