feature: convert all feature nodes to new feature infra

Change-Id: I34c527ba910fb282a95458b78d1d684eb337905e
Signed-off-by: Damjan Marion <damarion@cisco.com>

1 files changed, 8 insertions, 66 deletions

diff --git a/vpp/vpp-api/api.c b/vpp/vpp-api/api.c
index e606673234b..6852e02a5d6 100644
--- a/vpp/vpp-api/api.c
+++ b/vpp/vpp-api/api.c
@@ -1571,79 +1571,21 @@ vl_api_sw_interface_set_table_t_handler (vl_api_sw_interface_set_table_t * mp)
 static void
 vl_api_sw_interface_set_vpath_t_handler (vl_api_sw_interface_set_vpath_t * mp)
 {
-  vlib_main_t *vm = vlib_get_main ();
-  ip4_main_t *im4 = &ip4_main;
-  ip6_main_t *im6 = &ip6_main;
   vl_api_sw_interface_set_vpath_reply_t *rmp;
   int rv = 0;
-  u32 ci;
   u32 sw_if_index = ntohl (mp->sw_if_index);
-  ip4_main_t *ip4m = &ip4_main;
-  ip6_main_t *ip6m = &ip6_main;
-  ip_lookup_main_t *ip4lm = &ip4m->lookup_main;
-  ip_lookup_main_t *ip6lm = &ip6m->lookup_main;
-  vnet_feature_config_main_t *rx_cm4u =
-    &ip4lm->feature_config_mains[VNET_IP_RX_UNICAST_FEAT];
-  vnet_feature_config_main_t *rx_cm4m =
-    &ip4lm->feature_config_mains[VNET_IP_RX_MULTICAST_FEAT];
-  vnet_feature_config_main_t *rx_cm6u =
-    &ip6lm->feature_config_mains[VNET_IP_RX_UNICAST_FEAT];
-  vnet_feature_config_main_t *rx_cm6m =
-    &ip6lm->feature_config_mains[VNET_IP_RX_MULTICAST_FEAT];
 
   VALIDATE_SW_IF_INDEX (mp);
 
   l2input_intf_bitmap_enable (sw_if_index, L2INPUT_FEAT_VPATH, mp->enable);
-  if (mp->enable)
-    {
-      ci = rx_cm4u->config_index_by_sw_if_index[sw_if_index];	//IP4 unicast
-      ci = vnet_config_add_feature (vm, &rx_cm4u->config_main,
-				    ci,
-				    im4->ip4_unicast_rx_feature_vpath, 0, 0);
-      rx_cm4u->config_index_by_sw_if_index[sw_if_index] = ci;
-      ci = rx_cm4m->config_index_by_sw_if_index[sw_if_index];	//IP4 mcast
-      ci = vnet_config_add_feature (vm, &rx_cm4m->config_main,
-				    ci,
-				    im4->ip4_multicast_rx_feature_vpath,
-				    0, 0);
-      rx_cm4m->config_index_by_sw_if_index[sw_if_index] = ci;
-      ci = rx_cm6u->config_index_by_sw_if_index[sw_if_index];	//IP6 unicast
-      ci = vnet_config_add_feature (vm, &rx_cm6u->config_main,
-				    ci,
-				    im6->ip6_unicast_rx_feature_vpath, 0, 0);
-      rx_cm6u->config_index_by_sw_if_index[sw_if_index] = ci;
-      ci = rx_cm6m->config_index_by_sw_if_index[sw_if_index];	//IP6 mcast
-      ci = vnet_config_add_feature (vm, &rx_cm6m->config_main,
-				    ci,
-				    im6->ip6_multicast_rx_feature_vpath,
-				    0, 0);
-      rx_cm6m->config_index_by_sw_if_index[sw_if_index] = ci;
-    }
-  else
-    {
-      ci = rx_cm4u->config_index_by_sw_if_index[sw_if_index];	//IP4 unicast
-      ci = vnet_config_del_feature (vm, &rx_cm4u->config_main,
-				    ci,
-				    im4->ip4_unicast_rx_feature_vpath, 0, 0);
-      rx_cm4u->config_index_by_sw_if_index[sw_if_index] = ci;
-      ci = rx_cm4m->config_index_by_sw_if_index[sw_if_index];	//IP4 mcast
-      ci = vnet_config_del_feature (vm, &rx_cm4m->config_main,
-				    ci,
-				    im4->ip4_multicast_rx_feature_vpath,
-				    0, 0);
-      rx_cm4m->config_index_by_sw_if_index[sw_if_index] = ci;
-      ci = rx_cm6u->config_index_by_sw_if_index[sw_if_index];	//IP6 unicast
-      ci = vnet_config_del_feature (vm, &rx_cm6u->config_main,
-				    ci,
-				    im6->ip6_unicast_rx_feature_vpath, 0, 0);
-      rx_cm6u->config_index_by_sw_if_index[sw_if_index] = ci;
-      ci = rx_cm6m->config_index_by_sw_if_index[sw_if_index];	//IP6 mcast
-      ci = vnet_config_del_feature (vm, &rx_cm6m->config_main,
-				    ci,
-				    im6->ip6_multicast_rx_feature_vpath,
-				    0, 0);
-      rx_cm6m->config_index_by_sw_if_index[sw_if_index] = ci;
-    }
+  vnet_feature_enable_disable ("ip4-unicast", "vpath-input-ip4",
+			       sw_if_index, mp->enable, 0, 0);
+  vnet_feature_enable_disable ("ip4-multicast", "vpath-input-ip4",
+			       sw_if_index, mp->enable, 0, 0);
+  vnet_feature_enable_disable ("ip6-unicast", "vpath-input-ip6",
+			       sw_if_index, mp->enable, 0, 0);
+  vnet_feature_enable_disable ("ip6-multicast", "vpath-input-ip6",
+			       sw_if_index, mp->enable, 0, 0);
 
   BAD_SW_IF_INDEX_LABEL;