chore: Fully specify include paths for sessiond

Signed-off-by: GitHub <noreply@github.com>
magma · Apr 21, 2022 · 476b05f · 476b05f
1 parent 6978196
commit 476b05f
Show file tree

Hide file tree

Showing 99 changed files with 1,011 additions and 767 deletions.
diff --git a/lte/gateway/c/session_manager/AAAClient.cpp b/lte/gateway/c/session_manager/AAAClient.cpp
@@ -11,24 +11,25 @@
  * limitations under the License.
  */
 
+#include "lte/gateway/c/session_manager/AAAClient.h"
+
 #include <glog/logging.h>
 #include <grpcpp/channel.h>
 #include <grpcpp/impl/codegen/status.h>
+#include <feg/gateway/services/aaa/protos/accounting.grpc.pb.h>
+#include <feg/gateway/services/aaa/protos/accounting.pb.h>
+#include <lte/protos/session_manager.pb.h>
 #include <memory>
 #include <ostream>
 #include <string>
 #include <unordered_map>
 #include <utility>
 #include <vector>
 
-#include "AAAClient.h"
-#include "SessionState.h"
-#include "Types.h"
-#include "feg/gateway/services/aaa/protos/accounting.grpc.pb.h"
-#include "feg/gateway/services/aaa/protos/accounting.pb.h"
-#include "includes/ServiceRegistrySingleton.hpp"
-#include "lte/protos/session_manager.pb.h"
-#include "magma_logging.h"
+#include "lte/gateway/c/session_manager/SessionState.h"
+#include "lte/gateway/c/session_manager/Types.h"
+#include "orc8r/gateway/c/common/service_registry/includes/ServiceRegistrySingleton.hpp"
+#include "orc8r/gateway/c/common/logging/magma_logging.h"
 
 using grpc::Status;
 

diff --git a/lte/gateway/c/session_manager/AAAClient.h b/lte/gateway/c/session_manager/AAAClient.h
@@ -12,16 +12,17 @@
  */
 #pragma once
 
+// IWYU pragma: no_include <context.pb.h>
 #include <feg/gateway/services/aaa/protos/accounting.grpc.pb.h>
 #include <stdint.h>
 #include <functional>
 #include <memory>
 #include <string>
 
-#include "SessionState.h"
-#include "SessionStore.h"
-#include "StoreClient.h"
-#include "includes/GRPCReceiver.hpp"
+#include "lte/gateway/c/session_manager/SessionState.h"
+#include "lte/gateway/c/session_manager/SessionStore.h"
+#include "lte/gateway/c/session_manager/StoreClient.h"
+#include "orc8r/gateway/c/common/async_grpc/includes/GRPCReceiver.hpp"
 
 namespace aaa {
 namespace protos {

diff --git a/lte/gateway/c/session_manager/AmfServiceClient.cpp b/lte/gateway/c/session_manager/AmfServiceClient.cpp
@@ -1,16 +1,16 @@
-#include "AmfServiceClient.h"
+#include "lte/gateway/c/session_manager/AmfServiceClient.h"
 
 #include <glog/logging.h>
 #include <grpcpp/channel.h>
 #include <grpcpp/impl/codegen/status.h>
+#include <lte/protos/session_manager.grpc.pb.h>
+#include <lte/protos/session_manager.pb.h>
 #include <functional>
 #include <ostream>
 #include <utility>
 
-#include "includes/ServiceRegistrySingleton.hpp"
-#include "lte/protos/session_manager.grpc.pb.h"
-#include "lte/protos/session_manager.pb.h"
-#include "magma_logging.h"
+#include "orc8r/gateway/c/common/service_registry/includes/ServiceRegistrySingleton.hpp"
+#include "orc8r/gateway/c/common/logging/magma_logging.h"
 
 using grpc::Status;
 

diff --git a/lte/gateway/c/session_manager/AmfServiceClient.h b/lte/gateway/c/session_manager/AmfServiceClient.h
@@ -13,14 +13,14 @@
 #pragma once
 
 #include <grpc++/grpc++.h>
+#include <lte/protos/apn.pb.h>
 #include <lte/protos/session_manager.grpc.pb.h>
 #include <lte/protos/session_manager.pb.h>
 #include <stdint.h>
 #include <memory>
 #include <mutex>
 
-#include "includes/GRPCReceiver.hpp"
-#include "lte/protos/apn.pb.h"
+#include "orc8r/gateway/c/common/async_grpc/includes/GRPCReceiver.hpp"
 
 namespace grpc {
 class Channel;

diff --git a/lte/gateway/c/session_manager/BUILD.bazel b/lte/gateway/c/session_manager/BUILD.bazel
@@ -17,16 +17,12 @@ cc_library(
     name = "diameter_codes",
     srcs = ["DiameterCodes.cpp"],
     hdrs = ["DiameterCodes.h"],
-    # TODO(@themarwhal): Migrate to using full path for includes - GH8494
-    strip_include_prefix = "/lte/gateway/c/session_manager",
 )
 
 cc_library(
     name = "grpc_magma_utils",
     srcs = ["GrpcMagmaUtils.cpp"],
     hdrs = ["GrpcMagmaUtils.h"],
-    # TODO(@themarwhal): Migrate to using full path for includes - GH8494
-    strip_include_prefix = "/lte/gateway/c/session_manager",
     deps = [
         "//orc8r/gateway/c/common/logging",
         "@com_github_google_glog//:glog",
@@ -38,24 +34,18 @@ cc_library(
     name = "session_id",
     srcs = ["SessionID.cpp"],
     hdrs = ["SessionID.h"],
-    # TODO(@themarwhal): Migrate to using full path for includes - GH8494
-    strip_include_prefix = "/lte/gateway/c/session_manager",
 )
 
 cc_library(
     name = "utilities",
     srcs = ["Utilities.cpp"],
     hdrs = ["Utilities.h"],
-    # TODO(@themarwhal): Migrate to using full path for includes - GH8494
-    strip_include_prefix = "/lte/gateway/c/session_manager",
     deps = ["@com_google_protobuf//:protobuf"],
 )
 
 cc_library(
     name = "credit_key",
     hdrs = ["CreditKey.h"],
-    # TODO(@themarwhal): Migrate to using full path for includes - GH8494
-    strip_include_prefix = "/lte/gateway/c/session_manager",
     deps = [
         "//lte/protos:policydb_cpp_proto",
         "//lte/protos:session_manager_cpp_proto",
@@ -65,8 +55,6 @@ cc_library(
 cc_library(
     name = "types",
     hdrs = ["Types.h"],
-    # TODO(@themarwhal): Migrate to using full path for includes - GH8494
-    strip_include_prefix = "/lte/gateway/c/session_manager",
     deps = [
         ":credit_key",
         "//lte/protos:pipelined_cpp_proto",
@@ -77,8 +65,6 @@ cc_library(
 cc_library(
     name = "service_action",
     hdrs = ["ServiceAction.h"],
-    # TODO(@themarwhal): Migrate to using full path for includes - GH8494
-    strip_include_prefix = "/lte/gateway/c/session_manager",
     deps = [
         ":credit_key",
         ":types",
@@ -98,8 +84,6 @@ cc_library(
         "RedisMap.hpp",
         "Serializers.h",
     ],
-    # TODO(@themarwhal): Migrate to using full path for includes - GH8494
-    strip_include_prefix = "/lte/gateway/c/session_manager",
     deps = [
         "//lte/protos:policydb_cpp_proto",
         "//orc8r/gateway/c/common/config:service_config_loader",
@@ -115,8 +99,6 @@ cc_library(
     name = "session_reporter",
     srcs = ["SessionReporter.cpp"],
     hdrs = ["SessionReporter.h"],
-    # TODO(@themarwhal): Migrate to using full path for includes - GH8494
-    strip_include_prefix = "/lte/gateway/c/session_manager",
     deps = [
         ":grpc_magma_utils",
         "//lte/protos:session_manager_cpp_grpc",
@@ -131,8 +113,6 @@ cc_library(
     name = "stored_state",
     srcs = ["StoredState.cpp"],
     hdrs = ["StoredState.h"],
-    # TODO(@themarwhal): Migrate to using full path for includes - GH8494
-    strip_include_prefix = "/lte/gateway/c/session_manager",
     deps = [
         ":credit_key",
         ":types",
@@ -148,8 +128,6 @@ cc_library(
     name = "rule_store",
     srcs = ["RuleStore.cpp"],
     hdrs = ["RuleStore.h"],
-    # TODO(@themarwhal): Migrate to using full path for includes - GH8494
-    strip_include_prefix = "/lte/gateway/c/session_manager",
     deps = [
         ":credit_key",
         "//lte/protos:pipelined_cpp_grpc",
@@ -172,8 +150,6 @@ cc_library(
         "Monitor.h",
         "SessionCredit.h",
     ],
-    # TODO(@themarwhal): Migrate to using full path for includes - GH8494
-    strip_include_prefix = "/lte/gateway/c/session_manager",
     deps = [
         ":diameter_codes",
         ":service_action",
@@ -189,16 +165,12 @@ cc_library(
     name = "shard_tracker",
     srcs = ["ShardTracker.cpp"],
     hdrs = ["ShardTracker.h"],
-    # TODO(@themarwhal): Migrate to using full path for includes - GH8494
-    strip_include_prefix = "/lte/gateway/c/session_manager",
 )
 
 cc_library(
     name = "session_state",
     srcs = ["SessionState.cpp"],
     hdrs = ["SessionState.h"],
-    # TODO(@themarwhal): Migrate to using full path for includes - GH8494
-    strip_include_prefix = "/lte/gateway/c/session_manager",
     deps = [
         ":rule_store",
         ":session_credit",
@@ -215,8 +187,6 @@ cc_library(
     name = "metering_reporter",
     srcs = ["MeteringReporter.cpp"],
     hdrs = ["MeteringReporter.h"],
-    # TODO(@themarwhal): Migrate to using full path for includes - GH8494
-    strip_include_prefix = "/lte/gateway/c/session_manager",
     deps = [
         ":session_credit",
         ":stored_state",
@@ -237,8 +207,6 @@ cc_library(
         "SessionStore.h",
         "StoreClient.h",
     ],
-    # TODO(@themarwhal): Migrate to using full path for includes - GH8494
-    strip_include_prefix = "/lte/gateway/c/session_manager",
     deps = [
         ":metering_reporter",
         ":session_state",
@@ -252,8 +220,6 @@ cc_library(
     name = "aaa_client",
     srcs = ["AAAClient.cpp"],
     hdrs = ["AAAClient.h"],
-    # TODO(@themarwhal): Migrate to using full path for includes - GH8494
-    strip_include_prefix = "/lte/gateway/c/session_manager",
     deps = [
         ":session_state",
         ":session_store",
@@ -266,8 +232,6 @@ cc_library(
     name = "directoryd_client",
     srcs = ["DirectorydClient.cpp"],
     hdrs = ["DirectorydClient.h"],
-    # TODO(@themarwhal): Migrate to using full path for includes - GH8494
-    strip_include_prefix = "/lte/gateway/c/session_manager",
     deps = [
         ":session_state",
         "//orc8r/gateway/c/common/async_grpc:async_grpc_receiver",
@@ -279,8 +243,6 @@ cc_library(
     name = "mobilityd_client",
     srcs = ["MobilitydClient.cpp"],
     hdrs = ["MobilitydClient.h"],
-    # TODO(@themarwhal): Migrate to using full path for includes - GH8494
-    strip_include_prefix = "/lte/gateway/c/session_manager",
     deps = [
         ":session_state",
         ":types",
@@ -294,8 +256,6 @@ cc_library(
     name = "pipelined_client",
     srcs = ["PipelinedClient.cpp"],
     hdrs = ["PipelinedClient.h"],
-    # TODO(@themarwhal): Migrate to using full path for includes - GH8494
-    strip_include_prefix = "/lte/gateway/c/session_manager",
     deps = [
         ":session_credit",
         ":session_state",
@@ -308,8 +268,6 @@ cc_library(
     name = "spgw_service_client",
     srcs = ["SpgwServiceClient.cpp"],
     hdrs = ["SpgwServiceClient.h"],
-    # TODO(@themarwhal): Migrate to using full path for includes - GH8494
-    strip_include_prefix = "/lte/gateway/c/session_manager",
     deps = [
         "//lte/protos:spgw_service_cpp_grpc",
         "//orc8r/gateway/c/common/async_grpc:async_grpc_receiver",
@@ -323,8 +281,6 @@ cc_library(
     name = "amf_service_client",
     srcs = ["AmfServiceClient.cpp"],
     hdrs = ["AmfServiceClient.h"],
-    # TODO(@themarwhal): Migrate to using full path for includes - GH8494
-    strip_include_prefix = "/lte/gateway/c/session_manager",
     deps = [
         "//lte/protos:session_manager_cpp_grpc",
         "//orc8r/gateway/c/common/async_grpc:async_grpc_receiver",
@@ -338,8 +294,6 @@ cc_library(
     name = "session_events",
     srcs = ["SessionEvents.cpp"],
     hdrs = ["SessionEvents.h"],
-    # TODO(@themarwhal): Migrate to using full path for includes - GH8494
-    strip_include_prefix = "/lte/gateway/c/session_manager",
     deps = [
         ":session_credit",
         ":session_state",
@@ -351,8 +305,6 @@ cc_library(
     name = "local_enforcer",
     srcs = ["LocalEnforcer.cpp"],
     hdrs = ["LocalEnforcer.h"],
-    # TODO(@themarwhal): Migrate to using full path for includes - GH8494
-    strip_include_prefix = "/lte/gateway/c/session_manager",
     deps = [
         ":aaa_client",
         ":directoryd_client",
@@ -369,8 +321,6 @@ cc_library(
     name = "session_state_enforcer",
     srcs = ["SessionStateEnforcer.cpp"],
     hdrs = ["SessionStateEnforcer.h"],
-    # TODO(@themarwhal): Migrate to using full path for includes - GH8494
-    strip_include_prefix = "/lte/gateway/c/session_manager",
     deps = [
         ":amf_service_client",
         ":pipelined_client",
@@ -388,8 +338,6 @@ cc_library(
     name = "stats_poller",
     srcs = ["StatsPoller.cpp"],
     hdrs = ["StatsPoller.h"],
-    # TODO(@themarwhal): Migrate to using full path for includes - GH8494
-    strip_include_prefix = "/lte/gateway/c/session_manager",
     deps = [":local_enforcer"],
 )
 
@@ -411,8 +359,6 @@ cc_library(
     name = "session_proxy_responder_handler",
     srcs = ["SessionProxyResponderHandler.cpp"],
     hdrs = ["SessionProxyResponderHandler.h"],
-    # TODO(@themarwhal): Migrate to using full path for includes - GH8494
-    strip_include_prefix = "/lte/gateway/c/session_manager",
     deps = [
         ":local_enforcer",
         "//lte/protos:abort_session_cpp_grpc",
@@ -424,8 +370,6 @@ cc_library(
     name = "local_session_manager_handler",
     srcs = ["LocalSessionManagerHandler.cpp"],
     hdrs = ["LocalSessionManagerHandler.h"],
-    # TODO(@themarwhal): Migrate to using full path for includes - GH8494
-    strip_include_prefix = "/lte/gateway/c/session_manager",
     deps = [
         ":local_enforcer",
         ":session_id",
@@ -437,8 +381,6 @@ cc_library(
     name = "set_message_manager_handler",
     srcs = ["SetMessageManagerHandler.cpp"],
     hdrs = ["SetMessageManagerHandler.h"],
-    # TODO(@themarwhal): Migrate to using full path for includes - GH8494
-    strip_include_prefix = "/lte/gateway/c/session_manager",
     deps = [
         ":session_id",
         ":session_state_enforcer",
@@ -452,8 +394,6 @@ cc_library(
     name = "upf_msg_manage_handler",
     srcs = ["UpfMsgManageHandler.cpp"],
     hdrs = ["UpfMsgManageHandler.h"],
-    # TODO(@themarwhal): Migrate to using full path for includes - GH8494
-    strip_include_prefix = "/lte/gateway/c/session_manager",
     deps = [
         ":mobilityd_client",
         ":session_id",
@@ -467,8 +407,6 @@ cc_library(
     name = "session_manager_server",
     srcs = ["SessionManagerServer.cpp"],
     hdrs = ["SessionManagerServer.h"],
-    # TODO(@themarwhal): Migrate to using full path for includes - GH8494
-    strip_include_prefix = "/lte/gateway/c/session_manager",
     deps = [
         ":local_session_manager_handler",
         ":session_proxy_responder_handler",

diff --git a/lte/gateway/c/session_manager/ChargingGrant.cpp b/lte/gateway/c/session_manager/ChargingGrant.cpp
@@ -11,6 +11,8 @@
  * limitations under the License.
  */
 
+#include "lte/gateway/c/session_manager/ChargingGrant.h"
+
 #include <glog/logging.h>
 #include <algorithm>
 #include <ctime>
@@ -19,11 +21,10 @@
 #include <string>
 #include <vector>
 
-#include "ChargingGrant.h"
-#include "CreditKey.h"
-#include "DiameterCodes.h"
-#include "EnumToString.h"
-#include "magma_logging.h"
+#include "lte/gateway/c/session_manager/CreditKey.h"
+#include "lte/gateway/c/session_manager/DiameterCodes.h"
+#include "lte/gateway/c/session_manager/EnumToString.h"
+#include "orc8r/gateway/c/common/logging/magma_logging.h"
 
 namespace magma {
 ChargingGrant::ChargingGrant(const StoredChargingGrant& marshaled) {