X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=E2Manager%2Fconfiguration%2Fconfiguration.go;h=9ef7c330145a57ce3df7dfe1816baa8a02489447;hb=dbf8e0032295fac936779b0f117d0600b94c85fc;hp=43fbd7199883f33d7ef454d6811a35bea0798f8e;hpb=15d3982b5eda43a5b5b9054d7ecb026448c6ca16;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/configuration/configuration.go b/E2Manager/configuration/configuration.go
index 43fbd71..9ef7c33 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 (
@@ -36,19 +35,29 @@ type Configuration struct {
 		Port       int
 		MaxMsgSize int
 	}
-	NotificationResponseBuffer int
-	BigRedButtonTimeoutSec     int
-	MaxConnectionAttempts      int
-	MaxRnibConnectionAttempts  int
-	RnibRetryIntervalMs		   int
+	RoutingManager struct {
+		BaseUrl string
+	}
+	NotificationResponseBuffer   int
+	BigRedButtonTimeoutSec       int
+	MaxConnectionAttempts        int
+	MaxRnibConnectionAttempts    int
+	RnibRetryIntervalMs          int
+	KeepAliveResponseTimeoutMs   int
+	KeepAliveDelayMs             int
+	E2TInstanceDeletionTimeoutMs int
+	GlobalRicId                  struct {
+		PlmnId      string
+		RicNearRtId string
+	}
 }
 
-func ParseConfiguration() *Configuration{
+func ParseConfiguration() *Configuration {
 	viper.SetConfigType("yaml")
 	viper.SetConfigName("configuration")
 	viper.AddConfigPath("E2Manager/resources/")
-	viper.AddConfigPath("./resources/")  //For production
-	viper.AddConfigPath("../resources/") //For test under Docker
+	viper.AddConfigPath("./resources/")     //For production
+	viper.AddConfigPath("../resources/")    //For test under Docker
 	viper.AddConfigPath("../../resources/") //For test under Docker
 	err := viper.ReadInConfig()
 	if err != nil {
@@ -56,37 +65,78 @@ func ParseConfiguration() *Configuration{
 	}
 
 	config := Configuration{}
-	config.fillRmrConfig(viper.Sub("rmr"))
-	config.fillHttpConfig(viper.Sub("http"))
-	config.fillLoggingConfig(viper.Sub("logging"))
-
+	config.populateRmrConfig(viper.Sub("rmr"))
+	config.populateHttpConfig(viper.Sub("http"))
+	config.populateLoggingConfig(viper.Sub("logging"))
+	config.populateRoutingManagerConfig(viper.Sub("routingManager"))
 	config.NotificationResponseBuffer = viper.GetInt("notificationResponseBuffer")
 	config.BigRedButtonTimeoutSec = viper.GetInt("bigRedButtonTimeoutSec")
 	config.MaxConnectionAttempts = viper.GetInt("maxConnectionAttempts")
 	config.MaxRnibConnectionAttempts = viper.GetInt("maxRnibConnectionAttempts")
 	config.RnibRetryIntervalMs = viper.GetInt("rnibRetryIntervalMs")
+	config.KeepAliveResponseTimeoutMs = viper.GetInt("keepAliveResponseTimeoutMs")
+	config.KeepAliveDelayMs = viper.GetInt("KeepAliveDelayMs")
+	config.E2TInstanceDeletionTimeoutMs = viper.GetInt("e2tInstanceDeletionTimeoutMs")
+	config.populateGlobalRicIdConfig(viper.Sub("globalRicId"))
 	return &config
 }
 
-func (c *Configuration)fillLoggingConfig(logConfig *viper.Viper) {
+func (c *Configuration) populateLoggingConfig(logConfig *viper.Viper) {
 	if logConfig == nil {
-		panic(fmt.Sprintf("#configuration.fillLoggingConfig - failed to fill logging configuration: The entry 'logging' not found\n"))
+		panic(fmt.Sprintf("#configuration.populateLoggingConfig - failed to populate logging configuration: The entry 'logging' not found\n"))
 	}
 	c.Logging.LogLevel = logConfig.GetString("logLevel")
 }
 
-func (c *Configuration)fillHttpConfig(httpConfig *viper.Viper) {
+func (c *Configuration) populateHttpConfig(httpConfig *viper.Viper) {
 	if httpConfig == nil {
-		panic(fmt.Sprintf("#configuration.fillHttpConfig - failed to fill HTTP configuration: The entry 'http' not found\n"))
+		panic(fmt.Sprintf("#configuration.populateHttpConfig - failed to populate HTTP configuration: The entry 'http' not found\n"))
 	}
 	c.Http.Port = httpConfig.GetInt("port")
 }
 
-func (c *Configuration)fillRmrConfig(rmrConfig *viper.Viper) {
+func (c *Configuration) populateRmrConfig(rmrConfig *viper.Viper) {
 	if rmrConfig == nil {
-		panic(fmt.Sprintf("#configuration.fillRmrConfig - failed to fill RMR configuration: The entry 'rmr' not found\n"))
+		panic(fmt.Sprintf("#configuration.populateRmrConfig - failed to populate RMR configuration: The entry 'rmr' not found\n"))
 	}
 	c.Rmr.Port = rmrConfig.GetInt("port")
 	c.Rmr.MaxMsgSize = rmrConfig.GetInt("maxMsgSize")
 }
 
+func (c *Configuration) populateRoutingManagerConfig(rmConfig *viper.Viper) {
+	if rmConfig == nil {
+		panic(fmt.Sprintf("#configuration.populateRoutingManagerConfig - failed to populate Routing Manager configuration: The entry 'routingManager' not found\n"))
+	}
+	c.RoutingManager.BaseUrl = rmConfig.GetString("baseUrl")
+}
+
+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}}",
+		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,
+	)
+}