Merge "Add neighbor info to instance config introspect" into R3.1

Juniper · Mar 2, 2017 · eda43d5 · eda43d5
2 parents bd3e839 + 36ecdb3
commit eda43d5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/src/bgp/bgp_peer.sandesh b/src/bgp/bgp_peer.sandesh
@@ -550,6 +550,7 @@ struct ShowBgpInstanceConfig {
     4: list<string> export_target;
     10: bool has_pnf;
     9: string last_change_at;
+    15: list<string> neighbors;
     5: list<ShowBgpServiceChainConfig> service_chain_infos;
     6: list<ShowBgpStaticRouteConfig> static_routes;
     11: list<ShowBgpRouteAggregateConfig> aggregate_routes;

diff --git a/src/bgp/bgp_show_config.cc b/src/bgp/bgp_show_config.cc
@@ -39,6 +39,10 @@ static void FillBgpInstanceConfigInfo(ShowBgpInstanceConfig *sbic,
     sbic->set_has_pnf(instance->has_pnf());
     sbic->set_last_change_at(UTCUsecToString(instance->last_change_at()));
 
+    vector<string> neighbors(
+        instance->neighbor_list().begin(), instance->neighbor_list().end());
+    sbic->set_neighbors(neighbors);
+
     vector<ShowBgpServiceChainConfig> sbscc_list;
     BOOST_FOREACH(const ServiceChainConfig &sc_config,
         instance->service_chain_list()) {