Make cosmetic changes to use consistent file names

Change-Id: If7dbf8e4fc4ab5f2f17ad6ea547e6f20318a3ae9 Partial-Bug: 1500698
Juniper · Jan 31, 2016 · 04bfcf2 · 04bfcf2
1 parent d4a9905
commit 04bfcf2
Show file tree

Hide file tree

Showing 9 changed files with 52 additions and 53 deletions.
diff --git a/src/bgp/bgp_factory.cc b/src/bgp/bgp_factory.cc
@@ -57,7 +57,7 @@ FACTORY_STATIC_REGISTER(BgpObjectFactory, McastTreeManager, McastTreeManager);
 #include "bgp/bgp_message_builder.h"
 FACTORY_STATIC_REGISTER(BgpObjectFactory, BgpMessageBuilder, BgpMessageBuilder);
 
-#include "bgp/routing-instance/route_aggregate.h"
+#include "bgp/routing-instance/route_aggregator.h"
 FACTORY_PARAM_STATIC_REGISTER(BgpObjectFactory, IRouteAggregator,
     Address::INET, RouteAggregatorInet);
 FACTORY_PARAM_STATIC_REGISTER(BgpObjectFactory, IRouteAggregator,

diff --git a/src/bgp/bgp_table.cc b/src/bgp/bgp_table.cc
@@ -10,8 +10,8 @@
 #include "bgp/bgp_log.h"
 #include "bgp/bgp_ribout_updates.h"
 #include "bgp/bgp_update_queue.h"
+#include "bgp/routing-instance/iroute_aggregator.h"
 #include "bgp/routing-instance/path_resolver.h"
-#include "bgp/routing-instance/route_aggregate.h"
 #include "bgp/routing-instance/routing_instance.h"
 #include "bgp/routing-instance/rtarget_group_mgr.h"
 #include "net/community_type.h"

diff --git a/src/bgp/routing-instance/SConscript b/src/bgp/routing-instance/SConscript
@@ -25,7 +25,7 @@ SandeshGenSrcs = env.ExtractCpp(SandeshGenFiles)
 librouting_instance = env.Library('routing_instance', SandeshGenSrcs + 
                                          ['path_resolver.cc',
                                          'peer_manager.cc',
-                                         'route_aggregate.cc',
+                                         'route_aggregator.cc',
                                          'routepath_replicator.cc',
                                          'routing_instance.cc',
                                          'rtarget_group.cc',

diff --git a/src/bgp/routing-instance/iroute_aggregator.h b/src/bgp/routing-instance/iroute_aggregator.h
@@ -27,7 +27,7 @@ class IRouteAggregator {
                                      AggregateRouteEntriesInfo *info) const = 0;
 
 private:
-    friend class RouteAggregationTest;
+    friend class RouteAggregatorTest;
 
     // Enable/Disable task triggers
     virtual void DisableRouteAggregateUpdate() = 0;

diff --git a/src/bgp/routing-instance/route_aggregate.cc → src/bgp/routing-instance/route_aggregator.cc b/src/bgp/routing-instance/route_aggregate.cc → src/bgp/routing-instance/route_aggregator.cc
@@ -2,7 +2,7 @@
  * Copyright (c) 2015 Juniper Networks, Inc. All rights reserved.
  */
 
-#include "bgp/routing-instance/route_aggregate.h"
+#include "bgp/routing-instance/route_aggregator.h"
 
 #include <boost/foreach.hpp>
 

diff --git a/src/bgp/routing-instance/route_aggregate.h → src/bgp/routing-instance/route_aggregator.h b/src/bgp/routing-instance/route_aggregate.h → src/bgp/routing-instance/route_aggregator.h
@@ -2,8 +2,8 @@
  * Copyright (c) 2015 Juniper Networks, Inc. All rights reserved.
  */
 
-#ifndef SRC_BGP_ROUTING_INSTANCE_ROUTE_AGGREGATE_H_
-#define SRC_BGP_ROUTING_INSTANCE_ROUTE_AGGREGATE_H_
+#ifndef SRC_BGP_ROUTING_INSTANCE_ROUTE_AGGREGATOR_H_
+#define SRC_BGP_ROUTING_INSTANCE_ROUTE_AGGREGATOR_H_
 
 #include <tbb/mutex.h>
 
@@ -45,8 +45,8 @@ typedef ConditionMatchPtr AggregateRoutePtr;
 // RouteAggregator
 // ================
 //
-// This class impliments the route aggregation for control node. It provides
-// api to create/delete/update route aggregation config for a routing instance
+// This class implements the route aggregation for control node. It provides
+// APIs to create/delete/update route aggregation config for a routing instance
 // An object of this class for the address families that supports route
 // aggregation is hooked to routing instance. Currently route aggregation is
 // supported for INET and INET6 address family. Support for multiple address
@@ -122,7 +122,7 @@ typedef ConditionMatchPtr AggregateRoutePtr;
 // DBState: RouteAggregatorState:
 // ============================
 //
-// Route agggregator registers with the BgpTable to set the DBState.
+// RouteAggregator registers with the BgpTable to set the DBState.
 // The RouteAggregatorState implements the DBState.
 // The DBState is added on both matching/contributing route and aggregate route.
 // A route can be both contributing and aggregating route at the same time.
@@ -149,7 +149,7 @@ typedef ConditionMatchPtr AggregateRoutePtr;
 //
 // Concurrency
 // ===========
-// bgp::RouteAggregation task runs in execlusion to any task that adds/deletes
+// bgp::RouteAggregation task runs in exclusion to any task that adds/deletes
 // path from route. i.e. db::DBTable, bgp::ServiceChain, bgp::StaticRoute and
 // bgp::ResolverPath.
 // bgp::RouteAggregation runs in exclusion to bgp::Config task
@@ -203,7 +203,6 @@ class RouteAggregator : public IRouteAggregator {
                                         AggregateRouteEntriesInfo *info) const;
 
 private:
-    friend class RouteAggregationTest;
     class DeleteActor;
     typedef std::set<AggregateRoutePtr> AggregateRouteProcessList;
     typedef BgpInstanceConfig::AggregateRouteList AggregateRouteConfigList;
@@ -253,4 +252,4 @@ class RouteAggregator : public IRouteAggregator {
 typedef RouteAggregator<AggregateInetRoute> RouteAggregatorInet;
 typedef RouteAggregator<AggregateInet6Route> RouteAggregatorInet6;
 
-#endif  // SRC_BGP_ROUTING_INSTANCE_ROUTE_AGGREGATE_H_
+#endif  // SRC_BGP_ROUTING_INSTANCE_ROUTE_AGGREGATOR_H_
diff --git a/src/bgp/routing-instance/show_route_aggregate.cc b/src/bgp/routing-instance/show_route_aggregate.cc
@@ -7,7 +7,7 @@
 
 #include "bgp/bgp_show_handler.h"
 #include "bgp/routing-instance/routing_instance.h"
-#include "bgp/routing-instance/route_aggregate.h"
+#include "bgp/routing-instance/route_aggregator.h"
 #include "bgp/routing-instance/route_aggregate_types.h"
 
 using std::string;

diff --git a/src/bgp/test/SConscript b/src/bgp/test/SConscript
@@ -365,9 +365,9 @@ routing_policy_test = env.UnitTest('routing_policy_test',
                               ['routing_policy_test.cc'])
 env.Alias('src/bgp:routing_policy_test', routing_policy_test)
 
-route_aggregation_test = env.UnitTest('route_aggregation_test',
-                              ['route_aggregation_test.cc'])
-env.Alias('src/bgp:route_aggregation_test', route_aggregation_test)
+route_aggregator_test = env.UnitTest('route_aggregator_test',
+                                     ['route_aggregator_test.cc'])
+env.Alias('src/bgp:route_aggregator_test', route_aggregator_test)
 
 rt_network_attr_test = env.UnitTest('rt_network_attr_test',
                                     ['rt_network_attr_test.cc'])
@@ -575,7 +575,7 @@ test_suite = [
     path_resolver_test1,
     path_resolver_test2,
     ribout_attributes_test,
-    route_aggregation_test,
+    route_aggregator_test,
     routepath_replicator_random_test,
     routepath_replicator_test,
     routing_instance_mgr_test,