Remove unsupported families from Address::Family enumeration

Also remove them from table stats sandesh structures Change-Id: Iba6234518f4606ca04abdaa4227950c3f07aca42 Partial-Bug: #1602347
Juniper · Oct 14, 2016 · f13c92e · f13c92e
1 parent 2028673
commit f13c92e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 87 deletions.
diff --git 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
@@ -20,73 +20,32 @@ struct RoutingInstanceStatsData {
     2: optional bool deleted
 
     3: optional map<string, RoutingTableStats> raw_ipv4_stats (hidden="yes");
-
     /** @display_name:Routing Instance IPv4 Information*/
     4: optional map<string, RoutingTableStats> ipv4_stats (mstats="raw_ipv4_stats:DSChange", tags=".__key", aggtype="union");
 
-
     5: optional map<string, RoutingTableStats> raw_ipv6_stats (hidden="yes");
-
     /** @display_name:Routing Instance IPv6 Information*/
     6: optional map<string, RoutingTableStats> ipv6_stats (mstats="raw_ipv6_stats:DSChange", tags=".__key", aggtype="union");
 
-
     7: optional map<string, RoutingTableStats> raw_inetvpn_stats (hidden="yes");
-
     /** @display_name:Routing Instance IPv4 Vpn Information*/
     8: optional map<string, RoutingTableStats> inetvpn_stats (mstats="raw_inetvpn_stats:DSChange", tags=".__key", aggtype="union");
 
-
     9: optional map<string, RoutingTableStats> raw_inet6vpn_stats (hidden="yes");
-
     /** @display_name:Routing Instance IPv6 Vpn Information*/
     10: optional map<string, RoutingTableStats> inet6vpn_stats (mstats="raw_inet6vpn_stats:DSChange", tags=".__key", aggtype="union");
 
-
     11: optional map<string, RoutingTableStats> raw_rtarget_stats (hidden="yes");
-
     /** @display_name:Routing Instance Route Target Information*/
     12: optional map<string, RoutingTableStats> rtarget_stats (mstats="raw_rtarget_stats:DSChange", tags=".__key", aggtype="union");
 
-
-    13: optional map<string, RoutingTableStats> raw_inetflow_stats (hidden="yes");
-
-    /** @display_name:Routing Instance IPv4 Flow Information*/
-    14: optional map<string, RoutingTableStats> inetflow_stats (mstats="raw_inetflow_stats:DSChange", tags=".__key", aggtype="union");
-
-    15: optional map<string, RoutingTableStats> raw_inetvpnflow_stats (hidden="yes");
-
-    /** @display_name:Routing Instance IPv4 Vpn Flow Information*/
-    16: optional map<string, RoutingTableStats> inetvpnflow_stats (mstats="raw_inetvpnflow_stats:DSChange", tags=".__key", aggtype="union");
-
-
-    17: optional map<string, RoutingTableStats> raw_inetmcast_stats (hidden="yes");
-
-    /** @display_name:Routing Instance IPv4 Multicast Information*/
-    18: optional map<string, RoutingTableStats> inetmcast_stats (mstats="raw_inetmcast_stats:DSChange", tags=".__key", aggtype="union");
-
-
-    19: optional map<string, RoutingTableStats> raw_inet6mcast_stats (hidden="yes");
-
-    /** @display_name:Routing Instance IPv6 Multicast Information*/
-    20: optional map<string, RoutingTableStats> inet6mcast_stats (mstats="raw_inet6mcast_stats:DSChange", tags=".__key", aggtype="union");
-
-
-    21: optional map<string, RoutingTableStats> raw_enet_stats (hidden="yes");
-
-    /** @display_name:Routing Instance Enet Information*/
-    22: optional map<string, RoutingTableStats> enet_stats (mstats="raw_enet_stats:DSChange", tags=".__key", aggtype="union");
-
-
-    23: optional map<string, RoutingTableStats> raw_evpn_stats (hidden="yes");
-
+    13: optional map<string, RoutingTableStats> raw_evpn_stats (hidden="yes");
     /** @display_name:Routing Instance EVpn Information*/
-    24: optional map<string, RoutingTableStats> evpn_stats (mstats="raw_evpn_stats:DSChange", tags=".__key", aggtype="union");
-
-    25: optional map<string, RoutingTableStats> raw_ermvpn_stats (hidden="yes");
+    14: optional map<string, RoutingTableStats> evpn_stats (mstats="raw_evpn_stats:DSChange", tags=".__key", aggtype="union");
 
+    15: optional map<string, RoutingTableStats> raw_ermvpn_stats (hidden="yes");
     /** @display_name:Routing Instance ErmVpn Information*/
-    26: optional map<string, RoutingTableStats> ermvpn_stats (mstats="raw_ermvpn_stats:DSChange", tags=".__key", aggtype="union");
+    16: optional map<string, RoutingTableStats> ermvpn_stats (mstats="raw_ermvpn_stats:DSChange", tags=".__key", aggtype="union");
 }
 
 /**

diff --git a/src/net/address.cc b/src/net/address.cc
@@ -19,11 +19,6 @@ static const std::map<string, Address::Family>
         ("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::Family, string>
         (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<string, Address::Family>
         ("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::Family, string>
         (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
@@ -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
     };