X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fconfiguration%2Fconfiguration.go;h=5e4c31e10f9b55369b1c3196722be0766ef34376;hb=refs%2Fchanges%2F27%2F3427%2F1;hp=267c25a747148831fba02a69e0a2eb3e47a7fc03;hpb=08ae8615200de08fd666ed22bfe06ded2362af9f;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/configuration/configuration.go b/E2Manager/configuration/configuration.go
index 267c25a..5e4c31e 100644
--- a/E2Manager/configuration/configuration.go
+++ b/E2Manager/configuration/configuration.go
@@ -38,9 +38,12 @@ type Configuration struct {
 	RoutingManager struct {
 		BaseUrl string
 	}
+/*	Kubernetes struct {
+		ConfigPath string
+		KubeNamespace  string
+	}*/
 	NotificationResponseBuffer   int
 	BigRedButtonTimeoutSec       int
-	MaxConnectionAttempts        int
 	MaxRnibConnectionAttempts    int
 	RnibRetryIntervalMs          int
 	KeepAliveResponseTimeoutMs   int
@@ -69,9 +72,9 @@ 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")
@@ -110,6 +113,14 @@ 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"))
@@ -117,3 +128,27 @@ func (c *Configuration) populateGlobalRicIdConfig(globalRicIdConfig *viper.Viper
 	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,*/
+	)
+}