Ric-193 - On Success, return Setup Response

[ric-plt/e2mgr.git] / E2Manager / configuration / configuration.go

diff --git a/E2Manager/configuration/configuration.go b/E2Manager/configuration/configuration.go
index 43fbd71..439d4ba 100644 (file)
--- a/E2Manager/configuration/configuration.go
+++ b/E2Manager/configuration/configuration.go
@@ -36,19 +36,29 @@ type Configuration struct {
                Port       int
                MaxMsgSize int
        }
-       NotificationResponseBuffer int
-       BigRedButtonTimeoutSec     int
-       MaxConnectionAttempts      int
-       MaxRnibConnectionAttempts  int
-       RnibRetryIntervalMs                int
+       RoutingManager struct {
+               BaseUrl    string
+       }
+       RicId struct {
+               PlmnId string
+               RicNearRtId string
+       }
+       NotificationResponseBuffer   int
+       BigRedButtonTimeoutSec       int
+       MaxConnectionAttempts        int
+       MaxRnibConnectionAttempts    int
+       RnibRetryIntervalMs          int
+       KeepAliveResponseTimeoutMs       int
+       KeepAliveDelayMs             int
+       E2TInstanceDeletionTimeoutMs 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 {
@@ -56,37 +66,46 @@ 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")
        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")
+}