Merge "Fix name(s) used to identify master routing instance"

src/bgp/bgp_peer.cc

@@ -1510,8 +1510,8 @@ string BgpPeer::ToString() const {
 string BgpPeer::ToUVEKey() const {
     ostringstream out;
 
-    // XXX Skip default instance names from the logs and uves.
-    if (true || !rtinstance_->IsDefaultRoutingInstance()) {
+    // XXX Skip master instance names from the logs and uves.
+    if (true || !rtinstance_->IsMasterRoutingInstance()) {
         out << rtinstance_->name() << ":";
     }
     // out << peer_key_.endpoint.address();

src/bgp/bgp_table.cc

@@ -200,7 +200,7 @@ UpdateInfo *BgpTable::GetUpdateInfo(RibOut *ribout, BgpRoute *route,
             // Don't advertise any routes from non-master instances.
             // The ribout can only be for bgpaas-clients since that's
             // the only case with bgp peers in non-master instance.
-            if (!rtinstance_->IsDefaultRoutingInstance())
+            if (!rtinstance_->IsMasterRoutingInstance())
                 return NULL;
 
             // Sender side AS path loop check.

src/bgp/ermvpn/ermvpn_table.cc

@@ -76,10 +76,10 @@ BgpRoute *ErmVpnTable::RouteReplicate(BgpServer *server,
     if (mroute->GetPrefix().type() == ErmVpnPrefix::NativeRoute)
         return NULL;
 
-    if (!IsDefault()) {
+    if (!IsMaster()) {
         // Don't replicate to a VRF from other VRF tables.
         ErmVpnTable *src_ermvpn_table = dynamic_cast<ErmVpnTable *>(src_table);
-        if (!src_ermvpn_table->IsDefault())
+        if (!src_ermvpn_table->IsMaster())
             return NULL;
 
         // Don't replicate to VRF from the VPN table if OriginVn doesn't match.
@@ -93,7 +93,7 @@ BgpRoute *ErmVpnTable::RouteReplicate(BgpServer *server,
     // pick up the RD from the SourceRD attribute. The SourceRD is always set
     // for Local and Global routes that the multicast code adds to a VRF.
     ErmVpnPrefix mprefix(mroute->GetPrefix());
-    if (IsDefault()) {
+    if (IsMaster()) {
         mprefix.set_route_distinguisher(src_path->GetAttr()->source_rd());
     } else {
         mprefix.set_route_distinguisher(RouteDistinguisher::kZeroRd);
@@ -179,7 +179,7 @@ bool ErmVpnTable::Export(RibOut *ribout, Route *route,
 
 void ErmVpnTable::CreateTreeManager() {
     // Don't create the McastTreeManager for the VPN table.
-    if (IsDefault())
+    if (IsMaster())
         return;
     assert(!tree_manager_);
     tree_manager_ = BgpObjectFactory::Create<McastTreeManager>(this);
@@ -206,8 +206,8 @@ void ErmVpnTable::set_routing_instance(RoutingInstance *rtinstance) {
     CreateTreeManager();
 }
 
-bool ErmVpnTable::IsDefault() const {
-    return routing_instance()->IsDefaultRoutingInstance();
+bool ErmVpnTable::IsMaster() const {
+    return routing_instance()->IsMasterRoutingInstance();
 }
 
 static void RegisterFactory() {

src/bgp/ermvpn/ermvpn_table.h

@@ -32,8 +32,8 @@ class ErmVpnTable : public BgpTable {
     virtual std::auto_ptr<DBEntry> AllocEntryStr(const std::string &key) const;
 
     virtual Address::Family family() const { return Address::ERMVPN; }
-    bool IsDefault() const;
-    virtual bool IsVpnTable() const { return IsDefault(); }
+    bool IsMaster() const;
+    virtual bool IsVpnTable() const { return IsMaster(); }
 
     virtual size_t Hash(const DBEntry *entry) const;
     virtual size_t Hash(const DBRequestKey *key) const;

src/bgp/evpn/evpn_table.cc

@@ -116,10 +116,10 @@ BgpRoute *EvpnTable::RouteReplicate(BgpServer *server,
         ExtCommunityPtr community) {
     assert(src_table->family() == Address::EVPN);
 
-    if (!IsDefault()) {
+    if (!IsMaster()) {
         // Don't replicate to a VRF from other VRF tables.
         EvpnTable *src_evpn_table = dynamic_cast<EvpnTable *>(src_table);
-        if (!src_evpn_table->IsDefault())
+        if (!src_evpn_table->IsMaster())
             return NULL;
 
         // Don't replicate to VRF from the VPN table if OriginVn doesn't match.
@@ -143,7 +143,7 @@ BgpRoute *EvpnTable::RouteReplicate(BgpServer *server,
     BgpAttrDB *attr_db = server->attr_db();
     BgpAttrPtr new_attr(src_path->GetAttr());
 
-    if (IsDefault()) {
+    if (IsMaster()) {
         if (evpn_prefix.route_distinguisher().IsZero()) {
             evpn_prefix.set_route_distinguisher(new_attr->source_rd());
         }
@@ -273,8 +273,8 @@ void EvpnTable::set_routing_instance(RoutingInstance *rtinstance) {
     CreateEvpnManager();
 }
 
-bool EvpnTable::IsDefault() const {
-    return routing_instance()->IsDefaultRoutingInstance();
+bool EvpnTable::IsMaster() const {
+    return routing_instance()->IsMasterRoutingInstance();
 }
 
 static void RegisterFactory() {

src/bgp/evpn/evpn_table.h

@@ -30,8 +30,8 @@ class EvpnTable : public BgpTable {
     virtual void AddRemoveCallback(const DBEntryBase *entry, bool add) const;
 
     virtual Address::Family family() const { return Address::EVPN; }
-    bool IsDefault() const;
-    virtual bool IsVpnTable() const { return IsDefault(); }
+    bool IsMaster() const;
+    virtual bool IsVpnTable() const { return IsMaster(); }
 
     virtual size_t Hash(const DBEntry *entry) const;
     virtual size_t Hash(const DBRequestKey *key) const;

src/bgp/inet/inet_table.cc

@@ -143,7 +143,7 @@ bool InetTable::Export(RibOut *ribout, Route *route, const RibPeerSet &peerset,
 }
 
 PathResolver *InetTable::CreatePathResolver() {
-    if (routing_instance()->IsDefaultRoutingInstance())
+    if (routing_instance()->IsMasterRoutingInstance())
         return NULL;
     return (new PathResolver(this));
 }

src/bgp/inet6/inet6_table.cc

@@ -144,7 +144,7 @@ bool Inet6Table::Export(RibOut *ribout, Route *route, const RibPeerSet &peerset,
 }
 
 PathResolver *Inet6Table::CreatePathResolver() {
-    if (routing_instance()->IsDefaultRoutingInstance())
+    if (routing_instance()->IsMasterRoutingInstance())
         return NULL;
     return (new PathResolver(this));
 }

src/bgp/routing-instance/routepath_replicator.cc

@@ -435,9 +435,9 @@ void RoutePathReplicator::DBStateSync(BgpTable *table, TableState *ts,
 static ExtCommunityPtr UpdateExtCommunity(BgpServer *server,
         const RoutingInstance *rtinstance, const ExtCommunity *ext_community,
         const ExtCommunity::ExtCommunityList &export_list) {
-    // Add RouteTargets exported by the instance for a non-default instance.
+    // Add RouteTargets exported by the instance for a non-master instance.
     ExtCommunityPtr extcomm_ptr;
-    if (!rtinstance->IsDefaultRoutingInstance()) {
+    if (!rtinstance->IsMasterRoutingInstance()) {
         extcomm_ptr =
             server->extcomm_db()->AppendAndLocate(ext_community, export_list);
         return extcomm_ptr;
@@ -528,7 +528,7 @@ bool RoutePathReplicator::RouteListener(TableState *ts,
 
     // Get the export route target list from the routing instance.
     ExtCommunity::ExtCommunityList export_list;
-    if (!rtinstance->IsDefaultRoutingInstance()) {
+    if (!rtinstance->IsMasterRoutingInstance()) {
         BOOST_FOREACH(RouteTarget rtarget, rtinstance->GetExportList()) {
             export_list.push_back(rtarget.GetExtCommunity());
         }
@@ -590,7 +590,7 @@ bool RoutePathReplicator::RouteListener(TableState *ts,
             continue;
 
         // Add OriginVn when replicating self-originated routes from a VRF.
-        if (!vn_index && !rtinstance->IsDefaultRoutingInstance() &&
+        if (!vn_index && !rtinstance->IsMasterRoutingInstance() &&
             path->IsVrfOriginated() && rtinstance->virtual_network_index()) {
             vn_index = rtinstance->virtual_network_index();
             OriginVn origin_vn(server_->autonomous_system(), vn_index);

src/bgp/routing-instance/routing_instance.cc

@@ -490,7 +490,7 @@ RoutingInstance::RoutingInstance(string name, BgpServer *server,
                                  RoutingInstanceMgr *mgr,
                                  const BgpInstanceConfig *config)
     : name_(name), index_(-1), server_(server), mgr_(mgr), config_(config),
-      is_default_(false), always_subscribe_(false), virtual_network_index_(0),
+      is_master_(false), always_subscribe_(false), virtual_network_index_(0),
       virtual_network_allow_transit_(false),
       vxlan_id_(0),
       deleter_(new DeleteActor(server, this)),
@@ -556,7 +556,7 @@ void RoutingInstance::ProcessServiceChainConfig() {
 }
 
 void RoutingInstance::ProcessStaticRouteConfig() {
-    if (is_default_)
+    if (is_master_)
         return;
 
     vector<Address::Family> families = list_of(Address::INET)(Address::INET6);
@@ -566,7 +566,7 @@ void RoutingInstance::ProcessStaticRouteConfig() {
 }
 
 void RoutingInstance::UpdateStaticRouteConfig() {
-    if (is_default_)
+    if (is_master_)
         return;
 
     vector<Address::Family> families = list_of(Address::INET)(Address::INET6);
@@ -576,7 +576,7 @@ void RoutingInstance::UpdateStaticRouteConfig() {
 }
 
 void RoutingInstance::FlushStaticRouteConfig() {
-    if (is_default_)
+    if (is_master_)
         return;
 
     vector<Address::Family> families = list_of(Address::INET)(Address::INET6);
@@ -586,7 +586,7 @@ void RoutingInstance::FlushStaticRouteConfig() {
 }
 
 void RoutingInstance::UpdateAllStaticRoutes() {
-    if (is_default_)
+    if (is_master_)
         return;
 
     vector<Address::Family> families = list_of(Address::INET)(Address::INET6);
@@ -596,7 +596,7 @@ void RoutingInstance::UpdateAllStaticRoutes() {
 }
 
 void RoutingInstance::ProcessRouteAggregationConfig() {
-    if (is_default_)
+    if (is_master_)
         return;
 
     vector<Address::Family> families = list_of(Address::INET)(Address::INET6);
@@ -606,7 +606,7 @@ void RoutingInstance::ProcessRouteAggregationConfig() {
 }
 
 void RoutingInstance::UpdateRouteAggregationConfig() {
-    if (is_default_)
+    if (is_master_)
         return;
 
     vector<Address::Family> families = list_of(Address::INET)(Address::INET6);
@@ -616,7 +616,7 @@ void RoutingInstance::UpdateRouteAggregationConfig() {
 }
 
 void RoutingInstance::FlushRouteAggregationConfig() {
-    if (is_default_)
+    if (is_master_)
         return;
 
     vector<Address::Family> families = list_of(Address::INET)(Address::INET6);
@@ -659,7 +659,7 @@ void RoutingInstance::ProcessConfig() {
     // Create BGP Table
     if (name_ == BgpConfigManager::kMasterInstance) {
         assert(mgr_->count() == 1);
-        is_default_ = true;
+        is_master_ = true;
 
         VpnTableCreate(Address::INETVPN);
         VpnTableCreate(Address::INET6VPN);
@@ -731,7 +731,7 @@ void RoutingInstance::UpdateConfig(const BgpInstanceConfig *cfg) {
 
     // Master routing instance doesn't have import & export list
     // Master instance imports and exports all RT
-    if (IsDefaultRoutingInstance())
+    if (IsMasterRoutingInstance())
         return;
 
     RouteTargetList future_import;
@@ -781,8 +781,8 @@ void RoutingInstance::ClearConfig() {
 }
 
 void RoutingInstance::ManagedDelete() {
-    // RoutingInstanceMgr logs the delete for non-default instances.
-    if (IsDefaultRoutingInstance()) {
+    // RoutingInstanceMgr logs the delete for non-master instances.
+    if (IsMasterRoutingInstance()) {
         RTINSTANCE_LOG(Delete, this,
             SandeshLevel::SYS_DEBUG, RTINSTANCE_LOG_FLAG_ALL);
     }
@@ -1003,7 +1003,7 @@ void RoutingInstance::DeleteRouteTarget(bool import,
 
 void RoutingInstance::ClearRouteTarget() {
     CHECK_CONCURRENCY("bgp::Config");
-    if (IsDefaultRoutingInstance()) {
+    if (IsMasterRoutingInstance()) {
         return;
     }
 
@@ -1149,7 +1149,7 @@ string RoutingInstance::GetVrfFromTableName(const string table) {
 
 void RoutingInstance::set_index(int index) {
     index_ = index;
-    if (is_default_)
+    if (is_master_)
         return;
 
     rd_.reset(new RouteDistinguisher(server_->bgp_identifier(), index));

src/bgp/routing-instance/routing_instance.h

@@ -107,8 +107,8 @@ class RoutingInstance {
     void set_index(int index);
     int index() const { return index_; }
     bool always_subscribe() const { return always_subscribe_; }
-    bool IsDefaultRoutingInstance() const {
-        return is_default_;
+    bool IsMasterRoutingInstance() const {
+        return is_master_;
     }
 
     const std::string &name() const { return name_; }
@@ -205,7 +205,7 @@ class RoutingInstance {
     BgpServer *server_;
     RoutingInstanceMgr *mgr_;
     const BgpInstanceConfig *config_;
-    bool is_default_;
+    bool is_master_;
     bool always_subscribe_;
     std::string virtual_network_;
     int virtual_network_index_;

src/bgp/routing-instance/service_chaining.cc

@@ -515,7 +515,7 @@ void ServiceChain<T>::AddServiceChainRoute(PrefixT prefix,
             const BgpSecondaryPath *spath =
                 static_cast<const BgpSecondaryPath *>(connected_path);
             const RoutingInstance *ri = spath->src_table()->routing_instance();
-            if (ri->IsDefaultRoutingInstance()) {
+            if (ri->IsMasterRoutingInstance()) {
                 const VpnRouteT *vpn_route =
                     static_cast<const VpnRouteT *>(spath->src_rt());
                 new_attr = attr_db->ReplaceSourceRdAndLocate(new_attr.get(),

src/bgp/routing-instance/static_route.cc

@@ -472,7 +472,7 @@ void StaticRoute<T>::AddStaticRoute(NexthopPathIdList *old_path_ids) {
             const BgpSecondaryPath *spath =
                 static_cast<const BgpSecondaryPath *>(nexthop_route_path);
             const RoutingInstance *ri = spath->src_table()->routing_instance();
-            if (ri->IsDefaultRoutingInstance()) {
+            if (ri->IsMasterRoutingInstance()) {
                 const VpnRouteT *vpn_route =
                     static_cast<const VpnRouteT *>(spath->src_rt());
                 new_attr = attr_db->ReplaceSourceRdAndLocate(new_attr.get(),