X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fconfiguration%2Fconfiguration.go;h=efa2551fef6a1d631d5f10991b760c652d5b2cdc;hb=21c4f80c47d4941eee3d7b233e0e065dbe098e2d;hp=5bca875004fd5c551f470a4cdae7603686bea0a7;hpb=07ef76dd471a0892a893c90e0ab06713aee34be1;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/configuration/configuration.go b/E2Manager/configuration/configuration.go
index 5bca875..efa2551 100644
--- a/E2Manager/configuration/configuration.go
+++ b/E2Manager/configuration/configuration.go
@@ -33,51 +33,70 @@ type Configuration struct {
 		Port       int
 		MaxMsgSize int
 	}
-	NotificationResponseBuffer int
-	BigRedButtonTimeoutSec	int
+	RoutingManager struct {
+		BaseUrl	   string
+	}
+	NotificationResponseBuffer   int
+	BigRedButtonTimeoutSec       int
+	MaxConnectionAttempts        int
+	MaxRnibConnectionAttempts    int
+	RnibRetryIntervalMs          int
+	KeepAliveResponseTimeoutMs 	 int
+	KeepAliveDelayMs             int
 }
 
-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 {
-		panic(fmt.Sprintf("#http_server.parseConfiguration - failed to read configuration file: %s\n", err))
+		panic(fmt.Sprintf("#configuration.ParseConfiguration - failed to read configuration file: %s\n", err))
 	}
 
 	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")
 	return &config
 }
 
-func (c *Configuration)fillLoggingConfig(logConfig *viper.Viper) {
+func (c *Configuration) populateLoggingConfig(logConfig *viper.Viper) {
 	if logConfig == nil {
-		panic(fmt.Sprintf("#http_server.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("#http_server.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("#http_server.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")
+}