diff options
| author |   Neale Ranns <nranns@cisco.com> | 2018-01-03 04:18:48 -0800 |
|---|---|---|
| committer |   Ole Trøan <otroan@employees.org> | 2018-01-09 16:38:19 +0000 |
| commit | f068c3ed296c49dfbfe17677fc1ad2428fb4e3e4 (patch) | |
| tree | eef3c7c502b68ccdff9c5d80d04850465e25ef01 /src/vnet/fib/fib_test.c | |
| parent | 0e8cb6c475b616a3296b08d25bcaa1eed3ab0084 (diff) | |
DVR: run L3 output features
- rename l2_bridged to is_dvr. Including on the ip.api
this was new in the 18.01 release so no compatability issues.
- steal the free space in vnet_buffer_opaque_t for use with flags.
- run the ipX-output feature arc from the DVR DPO
Change-Id: I040e5976d1dbe076fcdda3a40a7804f56337ce3f
Signed-off-by: Neale Ranns <nranns@cisco.com>
Diffstat (limited to 'src/vnet/fib/fib_test.c')
| -rw-r--r-- | src/vnet/fib/fib_test.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/vnet/fib/fib_test.c b/src/vnet/fib/fib_test.c index 555196d0092..9a8febb1396 100644 --- a/src/vnet/fib/fib_test.c +++ b/src/vnet/fib/fib_test.c @@ -28,7 +28,7 @@ #include <vnet/bfd/bfd_main.h> #include <vnet/dpo/interface_rx_dpo.h> #include <vnet/dpo/replicate_dpo.h> -#include <vnet/dpo/l2_bridge_dpo.h> +#include <vnet/dpo/dvr_dpo.h> #include <vnet/dpo/mpls_disposition.h> #include <vnet/mpls/mpls.h> @@ -550,7 +550,7 @@ fib_test_validate_lb_v (const load_balance_t *lb, exp->adj.adj); break; case FT_LB_L2: - FIB_TEST_I((DPO_L2_BRIDGE == dpo->dpoi_type), + FIB_TEST_I((DPO_DVR == dpo->dpoi_type), "bucket %d stacks on %U", bucket, format_dpo_type, dpo->dpoi_type); @@ -4116,25 +4116,25 @@ fib_test_v4 (void) format_ip_flow_hash_config, lb->lb_hash_config); /* - * A route via an L2 Bridge + * A route via DVR DPO */ fei = fib_table_entry_path_add(fib_index, &pfx_10_10_10_3_s_32, FIB_SOURCE_API, FIB_ENTRY_FLAG_NONE, - DPO_PROTO_ETHERNET, + DPO_PROTO_IP4, &zero_addr, tm->hw[0]->sw_if_index, ~0, 1, NULL, - FIB_ROUTE_PATH_FLAG_NONE); - dpo_id_t l2_dpo = DPO_INVALID; - l2_bridge_dpo_add_or_lock(tm->hw[0]->sw_if_index, &l2_dpo); + FIB_ROUTE_PATH_DVR); + dpo_id_t dvr_dpo = DPO_INVALID; + dvr_dpo_add_or_lock(tm->hw[0]->sw_if_index, DPO_PROTO_IP4, &dvr_dpo); fib_test_lb_bucket_t ip_o_l2 = { .type = FT_LB_L2, .adj = { - .adj = l2_dpo.dpoi_index, + .adj = dvr_dpo.dpoi_index, }, }; @@ -4146,13 +4146,13 @@ fib_test_v4 (void) fib_table_entry_path_remove(fib_index, &pfx_10_10_10_3_s_32, FIB_SOURCE_API, - DPO_PROTO_ETHERNET, + DPO_PROTO_IP4, &zero_addr, tm->hw[0]->sw_if_index, fib_index, 1, - FIB_ROUTE_PATH_FLAG_NONE); - dpo_reset(&l2_dpo); + FIB_ROUTE_PATH_DVR); + dpo_reset(&dvr_dpo); /* * CLEANUP @@ -4253,8 +4253,8 @@ fib_test_v4 (void) pool_elts(load_balance_map_pool)); FIB_TEST((lb_count == pool_elts(load_balance_pool)), "LB pool size is %d", pool_elts(load_balance_pool)); - FIB_TEST((0 == pool_elts(l2_bridge_dpo_pool)), "L2 DPO pool size is %d", - pool_elts(l2_bridge_dpo_pool)); + FIB_TEST((0 == pool_elts(dvr_dpo_pool)), "L2 DPO pool size is %d", + pool_elts(dvr_dpo_pool)); return 0; } |