From 40f43968c59bfc40d899cb87bc454af442f17191 Mon Sep 17 00:00:00 2001 From: Michal Cmarada Date: Tue, 9 Apr 2019 08:12:05 +0200 Subject: update tests after ODL bump to Neon Change-Id: Ia733ad304c51b28f2a945e570120821254077189 Signed-off-by: Michal Cmarada --- resources/test_data/honeycomb/bgp.py | 99 ++++++++++++++++++++++++++++++-- resources/test_data/honeycomb/routing.py | 32 +++++------ 2 files changed, 108 insertions(+), 23 deletions(-) (limited to 'resources/test_data/honeycomb') diff --git a/resources/test_data/honeycomb/bgp.py b/resources/test_data/honeycomb/bgp.py index 52513f0813..f514d83289 100644 --- a/resources/test_data/honeycomb/bgp.py +++ b/resources/test_data/honeycomb/bgp.py @@ -119,6 +119,25 @@ route_data_ipv4 = { }] } +route_data_ipv4_oper = { + "bgp-inet:ipv4-route": [{ + "route-key": route_address_ipv4, + "path-id": route_id_ipv4, + "prefix": route_address_ipv4, + "attributes": { + "origin": { + "value": "igp" + }, + "local-pref": { + "pref": 100 + }, + "ipv4-next-hop": { + "global": "192.168.1.1" + } + } + }] +} + # IPv4 route for testing Update operation route_data_ipv4_update = { "bgp-inet:ipv4-route": [{ @@ -139,6 +158,24 @@ route_data_ipv4_update = { } }] } +route_data_ipv4_update_oper = { + "bgp-inet:ipv4-route": [{ + "route-key": route_address_ipv4, + "path-id": route_id_ipv4, + "prefix": route_address_ipv4, + "attributes": { + "origin": { + "value": "egp" + }, + "local-pref": { + "pref": 200 + }, + "ipv4-next-hop": { + "global": "192.168.1.2" + } + } + }] +} # IPv4 route for testing multiple routes route_address_ipv4_2 = "192.168.0.6/32" @@ -163,6 +200,25 @@ route_data_ipv4_2 = { }] } +route_data_ipv4_2_oper = { + "bgp-inet:ipv4-route": [{ + "route-key": route_address_ipv4_2, + "path-id": route_id_ipv4_2, + "prefix": route_address_ipv4_2, + "attributes": { + "origin": { + "value": "igp" + }, + "local-pref": { + "pref": 100 + }, + "ipv4-next-hop": { + "global": "192.168.1.2" + } + } + }] +} + # IPv6 route for CRUD test route_address_ipv6 = "3ffe:62::1/64" route_id_ipv6 = 0 @@ -285,6 +341,25 @@ dut1_route = { }] } +dut1_route_oper = { + "bgp-inet:ipv4-route": [{ + "route-key": dut1_route_address, + "path-id": dut1_route_id, + "prefix": dut1_route_address, + "attributes": { + "origin": { + "value": "igp" + }, + "local-pref": { + "pref": 100 + }, + "ipv4-next-hop": { + "global": "192.168.1.3" + } + } + }] +} + # IPv4 route in peer operational data rib_operational = { "loc-rib": {"tables": [ @@ -292,7 +367,7 @@ rib_operational = { "afi": "bgp-types:ipv4-address-family", "safi": "bgp-types:unicast-subsequent-address-family", "bgp-inet:ipv4-routes": { - "ipv4-route": dut1_route["bgp-inet:ipv4-route"] + "ipv4-route": dut1_route_oper["bgp-inet:ipv4-route"] } } ]} @@ -300,7 +375,6 @@ rib_operational = { route_operational = { "next-hop": {"next-hop-address": "192.168.1.3"}, - "vpp-ipv4-unicast-routing:vpp-ipv4-route": {}, "destination-prefix": dut1_route_address } @@ -326,6 +400,24 @@ dut1_route_ip6 = { } }] } +dut1_route_ip6_oper = { + "bgp-inet:ipv6-route": [{ + "route-key": dut1_route_ip6_prefix, + "path-id": dut1_route_ip6_id, + "prefix": dut1_route_ip6_prefix, + "attributes": { + "origin": { + "value": "igp" + }, + "local-pref": { + "pref": 100 + }, + "ipv6-next-hop": { + "global": "3ffe:63::1" + } + } + }] +} # IPv6 route in peer operational data rib_ip6_operational = { @@ -334,7 +426,7 @@ rib_ip6_operational = { "afi": "bgp-types:ipv6-address-family", "safi": "bgp-types:unicast-subsequent-address-family", "bgp-inet:ipv6-routes": { - "ipv6-route": dut1_route_ip6["bgp-inet:ipv6-route"] + "ipv6-route": dut1_route_ip6_oper["bgp-inet:ipv6-route"] } } ]} @@ -342,6 +434,5 @@ rib_ip6_operational = { route_ip6_operational = { "next-hop": {"next-hop-address": "3ffe:63::1"}, - "vpp-ipv6-unicast-routing:vpp-ipv6-route": {}, "destination-prefix": dut1_route_ip6_prefix } diff --git a/resources/test_data/honeycomb/routing.py b/resources/test_data/honeycomb/routing.py index 25fefe9426..2016ca54b5 100644 --- a/resources/test_data/honeycomb/routing.py +++ b/resources/test_data/honeycomb/routing.py @@ -67,7 +67,7 @@ def get_variables(node, ip_version, out_interface): "destination-prefix": "{0}/{1}".format(ipv4_base["dst_net"], ipv4_base["prefix_len"]), "next-hop": { - "next-hop-address" : ipv4_base["next_hop"], + "next-hop-address": ipv4_base["next_hop"], "outgoing-interface": out_interface }, "vpp-ipv4-unicast-routing:vpp-ipv4-route": {} @@ -151,16 +151,15 @@ def get_variables(node, ip_version, out_interface): "table1_oper": { "destination-prefix": "{0}/{1}".format(ipv4_base["dst_net"], ipv4_base["prefix_len"]), - "next-hop":{ + "next-hop": { "next-hop-address": ipv4_base["next_hop"], "outgoing-interface": out_interface - }, - "vpp-ipv4-unicast-routing:vpp-ipv4-route": {} + } }, "table2_oper": { "destination-prefix": "{0}/{1}".format(ipv4_base["dst_net"], ipv4_base["prefix_len"]), - "next-hop":{ + "next-hop": { "next-hop-list": { "next-hop": [ { @@ -177,32 +176,29 @@ def get_variables(node, ip_version, out_interface): } ] } - }, - "vpp-ipv4-unicast-routing:vpp-ipv4-route": {} + } }, "table3_oper": { "destination-prefix": "{0}/{1}".format(ipv4_base["dst_net"], ipv4_base["prefix_len"]), - "next-hop":{ + "next-hop": { "special-next-hop-enum": "blackhole" - }, - "vpp-ipv4-unicast-routing:vpp-ipv4-route": {} + } }, "table4_oper": { "destination-prefix": "{0}/{1}".format(ipv6_base["dst_net"], ipv6_base["prefix_len"]), - "next-hop":{ + "next-hop": { "next-hop-address": ipv6_base["next_hop"], "outgoing-interface": out_interface - }, - "vpp-ipv6-unicast-routing:vpp-ipv6-route": {} + } }, "table5_oper": { "destination-prefix": "{0}/{1}".format(ipv6_base["dst_net"], ipv6_base["prefix_len"]), - "next-hop":{ + "next-hop": { "next-hop-list": { "next-hop": [ { @@ -219,17 +215,15 @@ def get_variables(node, ip_version, out_interface): } ] } - }, - "vpp-ipv6-unicast-routing:vpp-ipv6-route": {} + } }, "table6_oper": { "destination-prefix": "{0}/{1}".format(ipv6_base["dst_net"], ipv6_base["prefix_len"]), - "next-hop":{ + "next-hop": { "special-next-hop-enum": "blackhole" - }, - "vpp-ipv6-unicast-routing:vpp-ipv6-route": {} + } } } -- cgit 1.2.3-korg