From 1f4fbf8045f9bd7e251f8d61b2a288e06d691ae9 Mon Sep 17 00:00:00 2001 From: Ananth Suryanarayana Date: Fri, 14 Oct 2016 12:26:20 -0700 Subject: [PATCH] Remove unsupported families from Address::Family enumeration Also remove them from table stats sandesh structures Change-Id: Iba6234518f4606ca04abdaa4227950c3f07aca42 Partial-Bug: #1602347 --- src/bgp/routing-instance/routing_instance.cc | 15 ------ .../routing-instance/routing_table.sandesh | 49 ++----------------- src/net/address.cc | 20 -------- src/net/address.h | 9 +--- 4 files changed, 6 insertions(+), 87 deletions(-) diff --git a/src/bgp/routing-instance/routing_instance.cc b/src/bgp/routing-instance/routing_instance.cc index bcb18e17fef..46fe40f5ee4 100644 --- a/src/bgp/routing-instance/routing_instance.cc +++ b/src/bgp/routing-instance/routing_instance.cc @@ -472,21 +472,6 @@ void RoutingInstanceMgr::SetTableStatsUve(Address::Family family, case Address::RTARGET: instance_info->set_raw_rtarget_stats(stats_map); break; - case Address::INETFLOW: - instance_info->set_raw_inetflow_stats(stats_map); - break; - case Address::INETVPNFLOW: - instance_info->set_raw_inetvpnflow_stats(stats_map); - break; - case Address::INETMCAST: - instance_info->set_raw_inetmcast_stats(stats_map); - break; - case Address::INET6MCAST: - instance_info->set_raw_inet6mcast_stats(stats_map); - break; - case Address::ENET: - instance_info->set_raw_enet_stats(stats_map); - break; case Address::EVPN: instance_info->set_raw_evpn_stats(stats_map); break; diff --git a/src/bgp/routing-instance/routing_table.sandesh b/src/bgp/routing-instance/routing_table.sandesh index 015de672827..55f86688aff 100644 --- a/src/bgp/routing-instance/routing_table.sandesh +++ b/src/bgp/routing-instance/routing_table.sandesh @@ -20,73 +20,32 @@ struct RoutingInstanceStatsData { 2: optional bool deleted 3: optional map raw_ipv4_stats (hidden="yes"); - /** @display_name:Routing Instance IPv4 Information*/ 4: optional map ipv4_stats (mstats="raw_ipv4_stats:DSChange", tags=".__key", aggtype="union"); - 5: optional map raw_ipv6_stats (hidden="yes"); - /** @display_name:Routing Instance IPv6 Information*/ 6: optional map ipv6_stats (mstats="raw_ipv6_stats:DSChange", tags=".__key", aggtype="union"); - 7: optional map raw_inetvpn_stats (hidden="yes"); - /** @display_name:Routing Instance IPv4 Vpn Information*/ 8: optional map inetvpn_stats (mstats="raw_inetvpn_stats:DSChange", tags=".__key", aggtype="union"); - 9: optional map raw_inet6vpn_stats (hidden="yes"); - /** @display_name:Routing Instance IPv6 Vpn Information*/ 10: optional map inet6vpn_stats (mstats="raw_inet6vpn_stats:DSChange", tags=".__key", aggtype="union"); - 11: optional map raw_rtarget_stats (hidden="yes"); - /** @display_name:Routing Instance Route Target Information*/ 12: optional map rtarget_stats (mstats="raw_rtarget_stats:DSChange", tags=".__key", aggtype="union"); - - 13: optional map raw_inetflow_stats (hidden="yes"); - - /** @display_name:Routing Instance IPv4 Flow Information*/ - 14: optional map inetflow_stats (mstats="raw_inetflow_stats:DSChange", tags=".__key", aggtype="union"); - - 15: optional map raw_inetvpnflow_stats (hidden="yes"); - - /** @display_name:Routing Instance IPv4 Vpn Flow Information*/ - 16: optional map inetvpnflow_stats (mstats="raw_inetvpnflow_stats:DSChange", tags=".__key", aggtype="union"); - - - 17: optional map raw_inetmcast_stats (hidden="yes"); - - /** @display_name:Routing Instance IPv4 Multicast Information*/ - 18: optional map inetmcast_stats (mstats="raw_inetmcast_stats:DSChange", tags=".__key", aggtype="union"); - - - 19: optional map raw_inet6mcast_stats (hidden="yes"); - - /** @display_name:Routing Instance IPv6 Multicast Information*/ - 20: optional map inet6mcast_stats (mstats="raw_inet6mcast_stats:DSChange", tags=".__key", aggtype="union"); - - - 21: optional map raw_enet_stats (hidden="yes"); - - /** @display_name:Routing Instance Enet Information*/ - 22: optional map enet_stats (mstats="raw_enet_stats:DSChange", tags=".__key", aggtype="union"); - - - 23: optional map raw_evpn_stats (hidden="yes"); - + 13: optional map raw_evpn_stats (hidden="yes"); /** @display_name:Routing Instance EVpn Information*/ - 24: optional map evpn_stats (mstats="raw_evpn_stats:DSChange", tags=".__key", aggtype="union"); - - 25: optional map raw_ermvpn_stats (hidden="yes"); + 14: optional map evpn_stats (mstats="raw_evpn_stats:DSChange", tags=".__key", aggtype="union"); + 15: optional map raw_ermvpn_stats (hidden="yes"); /** @display_name:Routing Instance ErmVpn Information*/ - 26: optional map ermvpn_stats (mstats="raw_ermvpn_stats:DSChange", tags=".__key", aggtype="union"); + 16: optional map ermvpn_stats (mstats="raw_ermvpn_stats:DSChange", tags=".__key", aggtype="union"); } /** diff --git a/src/net/address.cc b/src/net/address.cc index 520543389bc..913a59dbe1a 100644 --- a/src/net/address.cc +++ b/src/net/address.cc @@ -19,11 +19,6 @@ static const std::map ("inet-vpn", Address::INETVPN) ("inet6-vpn", Address::INET6VPN) ("route-target", Address::RTARGET) - ("inet-flow", Address::INETFLOW) - ("inet-vpn-flow", Address::INETVPNFLOW) - ("inetmcast", Address::INETMCAST) - ("inet6mcast", Address::INET6MCAST) - ("enet", Address::ENET) ("e-vpn", Address::EVPN) ("erm-vpn", Address::ERMVPN); @@ -35,11 +30,6 @@ static const std::map (Address::INETVPN, "inet-vpn") (Address::INET6VPN, "inet6-vpn") (Address::RTARGET, "route-target") - (Address::INETFLOW, "inet-flow") - (Address::INETVPNFLOW, "inet-vpn-flow") - (Address::INETMCAST, "inetmcast") - (Address::INET6MCAST, "inet6mcast") - (Address::ENET, "enet") (Address::EVPN, "e-vpn") (Address::ERMVPN, "erm-vpn"); @@ -51,11 +41,6 @@ static const std::map ("l3vpn", Address::INETVPN) ("l3vpn-inet6", Address::INET6VPN) ("rtarget", Address::RTARGET) - ("inetflow", Address::INETFLOW) - ("invpnflow", Address::INETVPNFLOW) - ("inetmcast", Address::INETMCAST) - ("inet6mcast", Address::INET6MCAST) - ("enet", Address::ENET) ("evpn", Address::EVPN) ("ermvpn", Address::ERMVPN); @@ -67,11 +52,6 @@ static const std::map (Address::INETVPN, "l3vpn") (Address::INET6VPN, "l3vpn-inet6") (Address::RTARGET, "rtarget") - (Address::INETFLOW, "inetflow") - (Address::INETVPNFLOW, "invpnflow") - (Address::INETMCAST, "inetmcast") - (Address::INET6MCAST, "inet6mcast") - (Address::ENET, "enet") (Address::EVPN, "evpn") (Address::ERMVPN, "ermvpn"); diff --git a/src/net/address.h b/src/net/address.h index 4ae4f30a5e5..44d8b1d09b9 100644 --- a/src/net/address.h +++ b/src/net/address.h @@ -28,13 +28,8 @@ class Address { INETVPN = 3, INET6VPN = 4, RTARGET = 5, - INETFLOW = 6, - INETVPNFLOW = 7, - INETMCAST = 8, - INET6MCAST = 9, - ENET = 10, - EVPN = 11, - ERMVPN = 12, + EVPN = 6, + ERMVPN = 7, NUM_FAMILIES };