Support communities for network static routes

Change-Id: I45671c45e08e96702cdf394b0007bb56294341ec Partial-Bug: 1549465
Juniper · Mar 1, 2016 · 2a280f4 · 2a280f4
1 parent 091416a
commit 2a280f4
Show file tree

Hide file tree

Showing 12 changed files with 224 additions and 93 deletions.
diff --git a/src/bgp/bgp_config.h b/src/bgp/bgp_config.h
@@ -294,7 +294,8 @@ struct StaticRouteConfig {
     IpAddress address;
     int prefix_length;
     IpAddress nexthop;
-    std::vector<std::string> route_target;
+    std::vector<std::string> route_targets;
+    std::vector<std::string> communities;
 };
 
 typedef std::vector<std::string> CommunityList;

diff --git a/src/bgp/bgp_config_ifmap.cc b/src/bgp/bgp_config_ifmap.cc
@@ -855,7 +855,8 @@ static void SetStaticRouteConfig(BgpInstanceConfig *rti,
         if (ec != 0)
             continue;
 
-        item.route_target = route.route_target;
+        item.route_targets = route.route_target;
+        item.communities = route.community;
         if (item.nexthop.is_v4()) {
             Ip4Address address;
             ec = Ip4SubnetParse(route.prefix, &address, &item.prefix_length);

diff --git a/src/bgp/bgp_peer.sandesh b/src/bgp/bgp_peer.sandesh
@@ -452,8 +452,9 @@ struct ShowBgpServiceChainConfig {
 
 struct ShowBgpStaticRouteConfig {
     1: string prefix;
-    2: list<string> targets;
     3: string nexthop;
+    4: list<string> communities;
+    2: list<string> targets;
 }
 
 struct ShowBgpInstanceRoutingPolicyConfig {

diff --git a/src/bgp/bgp_show_config.cc b/src/bgp/bgp_show_config.cc
@@ -61,8 +61,9 @@ static void FillBgpInstanceConfigInfo(ShowBgpInstanceConfig *sbic,
             string prefix = static_rt_config.address.to_string() + "/";
             prefix += integerToString(static_rt_config.prefix_length);
             sbsrc.set_prefix(prefix);
-            sbsrc.set_targets(static_rt_config.route_target);
             sbsrc.set_nexthop(static_rt_config.nexthop.to_string());
+            sbsrc.set_targets(static_rt_config.communities);
+            sbsrc.set_targets(static_rt_config.route_targets);
             static_route_list.push_back(sbsrc);
         }
     }

diff --git a/src/bgp/community.h b/src/bgp/community.h
@@ -119,7 +119,7 @@ class CommunityDB : public BgpPathAttributeDB<Community, CommunityPtr,
     CommunityPtr AppendAndLocate(const Community *src,
                                  const std::vector<uint32_t> &value);
     CommunityPtr SetAndLocate(const Community *src,
-                                 const std::vector<uint32_t> &value);
+                              const std::vector<uint32_t> &value);
     CommunityPtr RemoveAndLocate(const Community *src,
                                  const std::vector<uint32_t> &value);