X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=E2Manager%2Fconfiguration%2Fconfiguration.go;h=2169f6aefaf56ac8cc52ed58115443bee80c45e5;hb=e7305a3a0aa583b44deba7d5b2243039302b20ec;hp=439d4baa3e9a8b09af4a9d9ae7deea26c6c6914c;hpb=a5f90ced0f8e4e9aeb89de647ca78089a91c1995;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/configuration/configuration.go b/E2Manager/configuration/configuration.go
index 439d4ba..2169f6a 100644
--- a/E2Manager/configuration/configuration.go
+++ b/E2Manager/configuration/configuration.go
@@ -17,7 +17,6 @@
 //  This source code is part of the near-RT RIC (RAN Intelligent Controller)
 //  platform project (RICP).
 
-
 package configuration
 
 import (
@@ -37,20 +36,24 @@ type Configuration struct {
 		MaxMsgSize int
 	}
 	RoutingManager struct {
-		BaseUrl	   string
-	}
-	RicId struct {
-		PlmnId string
-		RicNearRtId string
+		BaseUrl string
 	}
+/*	Kubernetes struct {
+		ConfigPath string
+		Namespace  string
+	}*/
 	NotificationResponseBuffer   int
 	BigRedButtonTimeoutSec       int
 	MaxConnectionAttempts        int
 	MaxRnibConnectionAttempts    int
 	RnibRetryIntervalMs          int
-	KeepAliveResponseTimeoutMs 	 int
+	KeepAliveResponseTimeoutMs   int
 	KeepAliveDelayMs             int
 	E2TInstanceDeletionTimeoutMs int
+	GlobalRicId                  struct {
+		PlmnId      string
+		RicNearRtId string
+	}
 }
 
 func ParseConfiguration() *Configuration {
@@ -70,6 +73,7 @@ func ParseConfiguration() *Configuration {
 	config.populateHttpConfig(viper.Sub("http"))
 	config.populateLoggingConfig(viper.Sub("logging"))
 	config.populateRoutingManagerConfig(viper.Sub("routingManager"))
+	//config.populateKubernetesConfig(viper.Sub("kubernetes"))
 	config.NotificationResponseBuffer = viper.GetInt("notificationResponseBuffer")
 	config.BigRedButtonTimeoutSec = viper.GetInt("bigRedButtonTimeoutSec")
 	config.MaxConnectionAttempts = viper.GetInt("maxConnectionAttempts")
@@ -78,6 +82,7 @@ func ParseConfiguration() *Configuration {
 	config.KeepAliveResponseTimeoutMs = viper.GetInt("keepAliveResponseTimeoutMs")
 	config.KeepAliveDelayMs = viper.GetInt("KeepAliveDelayMs")
 	config.E2TInstanceDeletionTimeoutMs = viper.GetInt("e2tInstanceDeletionTimeoutMs")
+	config.populateGlobalRicIdConfig(viper.Sub("globalRicId"))
 	return &config
 }
 
@@ -109,3 +114,44 @@ func (c *Configuration) populateRoutingManagerConfig(rmConfig *viper.Viper) {
 	}
 	c.RoutingManager.BaseUrl = rmConfig.GetString("baseUrl")
 }
+
+/*func (c *Configuration) populateKubernetesConfig(rmConfig *viper.Viper) {
+	if rmConfig == nil {
+		panic(fmt.Sprintf("#configuration.populateKubernetesConfig - failed to populate Kubernetes configuration: The entry 'kubernetes' not found\n"))
+	}
+	c.Kubernetes.ConfigPath = rmConfig.GetString("configPath")
+	c.Kubernetes.Namespace = rmConfig.GetString("namespace")
+}*/
+
+func (c *Configuration) populateGlobalRicIdConfig(globalRicIdConfig *viper.Viper) {
+	if globalRicIdConfig == nil {
+		panic(fmt.Sprintf("#configuration.populateGlobalRicIdConfig - failed to populate Global RicId configuration: The entry 'globalRicId' not found\n"))
+	}
+	c.GlobalRicId.PlmnId = globalRicIdConfig.GetString("plmnId")
+	c.GlobalRicId.RicNearRtId = globalRicIdConfig.GetString("ricNearRtId")
+}
+
+func (c *Configuration) String() string {
+	return fmt.Sprintf("{logging.logLevel: %s, http.port: %d, rmr: { port: %d, maxMsgSize: %d}, routingManager.baseUrl: %s, "+
+		"notificationResponseBuffer: %d, bigRedButtonTimeoutSec: %d, maxConnectionAttempts: %d, maxRnibConnectionAttempts: %d, "+
+		"rnibRetryIntervalMs: %d, keepAliveResponseTimeoutMs: %d, keepAliveDelayMs: %d, e2tInstanceDeletionTimeoutMs: %d, "+
+		"globalRicId: { plmnId: %s, ricNearRtId: %s}}",//, kubernetes: {configPath: %s, namespace: %s}}",
+		c.Logging.LogLevel,
+		c.Http.Port,
+		c.Rmr.Port,
+		c.Rmr.MaxMsgSize,
+		c.RoutingManager.BaseUrl,
+		c.NotificationResponseBuffer,
+		c.BigRedButtonTimeoutSec,
+		c.MaxConnectionAttempts,
+		c.MaxRnibConnectionAttempts,
+		c.RnibRetryIntervalMs,
+		c.KeepAliveResponseTimeoutMs,
+		c.KeepAliveDelayMs,
+		c.E2TInstanceDeletionTimeoutMs,
+		c.GlobalRicId.PlmnId,
+		c.GlobalRicId.RicNearRtId,
+	//	c.Kubernetes.ConfigPath,
+		//c.Kubernetes.Namespace,
+	)
+}