RIC-208 - KA Decision: ask K8S to restart E2T instance - comment code of kubernetes

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

diff --git a/E2Manager/configuration/configuration.go b/E2Manager/configuration/configuration.go
index 439d4ba..5e4c31e 100644 (file)
--- 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,23 @@ type Configuration struct {
                MaxMsgSize int
        }
        RoutingManager struct {
-               BaseUrl    string
-       }
-       RicId struct {
-               PlmnId string
-               RicNearRtId string
+               BaseUrl string
        }
+/*     Kubernetes struct {
+               ConfigPath string
+               KubeNamespace  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,14 +72,15 @@ 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")
        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
 }
 
@@ -109,3 +112,43 @@ 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.KubeNamespace = rmConfig.GetString("kubeNamespace")
+}*/
+
+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, maxRnibConnectionAttempts: %d, "+
+               "rnibRetryIntervalMs: %d, keepAliveResponseTimeoutMs: %d, keepAliveDelayMs: %d, e2tInstanceDeletionTimeoutMs: %d, "+
+               "globalRicId: { plmnId: %s, ricNearRtId: %s}",//, kubernetes: {configPath: %s, kubeNamespace: %s}}",
+               c.Logging.LogLevel,
+               c.Http.Port,
+               c.Rmr.Port,
+               c.Rmr.MaxMsgSize,
+               c.RoutingManager.BaseUrl,
+               c.NotificationResponseBuffer,
+               c.BigRedButtonTimeoutSec,
+               c.MaxRnibConnectionAttempts,
+               c.RnibRetryIntervalMs,
+               c.KeepAliveResponseTimeoutMs,
+               c.KeepAliveDelayMs,
+               c.E2TInstanceDeletionTimeoutMs,
+               c.GlobalRicId.PlmnId,
+               c.GlobalRicId.RicNearRtId,
+/*             c.Kubernetes.ConfigPath,
+               c.Kubernetes.KubeNamespace,*/
+       )
+}