Merge "Fix introspect output for route-aggregate"

Juniper · Feb 4, 2016 · d2f83af · d2f83af
2 parents 12bbf08 + e5056fa
commit d2f83af
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/src/bgp/bgp_route.cc b/src/bgp/bgp_route.cc
@@ -438,6 +438,10 @@ void BgpRoute::FillRouteInfo(const BgpTable *table,
             srp.set_protocol("StaticRoute");
         } else if (path->GetSource() == BgpPath::Local) {
             srp.set_protocol("Local");
+        } else if (path->GetSource() == BgpPath::Aggregate) {
+            srp.set_protocol("Aggregate");
+        } else if (path->GetSource() == BgpPath::ResolvedRoute) {
+            srp.set_protocol("ResolvedRoute");
         }
 
         const BgpPeer *bgp_peer = dynamic_cast<const BgpPeer *>(peer);

diff --git a/src/bgp/routing-instance/show_route_aggregate.cc b/src/bgp/routing-instance/show_route_aggregate.cc
@@ -44,9 +44,9 @@ bool BgpShowHandler<ShowRouteAggregateReq, ShowRouteAggregateReqIterate,
 
     RoutingInstanceMgr::const_name_iterator it =
         rim->name_clower_bound(data->next_entry);
-    AggregateRouteEntriesInfo info;
     for (uint32_t iter_count = 0; it != rim->name_cend(); ++it, ++iter_count) {
         RoutingInstance *rinstance = it->second;
+        AggregateRouteEntriesInfo info;
         if (FillRouteAggregateInfo(Address::INET, data->search_string, info,
                                 rinstance)) {
             data->show_list.push_back(info);

diff --git a/src/bgp/routing-instance/show_static_route.cc b/src/bgp/routing-instance/show_static_route.cc
@@ -44,9 +44,9 @@ bool BgpShowHandler<ShowStaticRouteReq, ShowStaticRouteReqIterate,
 
     RoutingInstanceMgr::const_name_iterator it =
         rim->name_clower_bound(data->next_entry);
-    StaticRouteEntriesInfo info;
     for (uint32_t iter_count = 0; it != rim->name_cend(); ++it, ++iter_count) {
         RoutingInstance *rinstance = it->second;
+        StaticRouteEntriesInfo info;
         if (FillStaticRouteInfo(Address::INET, data->search_string, info,
                                 rinstance)) {
             data->show_list.push_back(info);