X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fconfiguration%2Fconfiguration.go;h=4e8883edec1cca241c89e982e8dffc4d96e4e966;hb=a1b1a899ec6ff0c97726a5e64a1ec584e687e6b2;hp=2169f6aefaf56ac8cc52ed58115443bee80c45e5;hpb=bcab97d45f6e6c39a37b7500314271b31f791a3d;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/configuration/configuration.go b/E2Manager/configuration/configuration.go
index 2169f6a..4e8883e 100644
--- a/E2Manager/configuration/configuration.go
+++ b/E2Manager/configuration/configuration.go
@@ -38,13 +38,12 @@ type Configuration struct {
 	RoutingManager struct {
 		BaseUrl string
 	}
-/*	Kubernetes struct {
+	Kubernetes struct {
 		ConfigPath string
-		Namespace  string
-	}*/
+		KubeNamespace  string
+	}
 	NotificationResponseBuffer   int
 	BigRedButtonTimeoutSec       int
-	MaxConnectionAttempts        int
 	MaxRnibConnectionAttempts    int
 	RnibRetryIntervalMs          int
 	KeepAliveResponseTimeoutMs   int
@@ -73,10 +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.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")
@@ -115,13 +113,13 @@ func (c *Configuration) populateRoutingManagerConfig(rmConfig *viper.Viper) {
 	c.RoutingManager.BaseUrl = rmConfig.GetString("baseUrl")
 }
 
-/*func (c *Configuration) populateKubernetesConfig(rmConfig *viper.Viper) {
+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.Namespace = rmConfig.GetString("namespace")
-}*/
+	c.Kubernetes.KubeNamespace = rmConfig.GetString("kubeNamespace")
+}
 
 func (c *Configuration) populateGlobalRicIdConfig(globalRicIdConfig *viper.Viper) {
 	if globalRicIdConfig == nil {
@@ -133,9 +131,9 @@ func (c *Configuration) populateGlobalRicIdConfig(globalRicIdConfig *viper.Viper
 
 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, "+
+		"notificationResponseBuffer: %d, bigRedButtonTimeoutSec: %d, maxRnibConnectionAttempts: %d, "+
 		"rnibRetryIntervalMs: %d, keepAliveResponseTimeoutMs: %d, keepAliveDelayMs: %d, e2tInstanceDeletionTimeoutMs: %d, "+
-		"globalRicId: { plmnId: %s, ricNearRtId: %s}}",//, kubernetes: {configPath: %s, namespace: %s}}",
+		"globalRicId: { plmnId: %s, ricNearRtId: %s, kubernetes: {configPath: %s, kubeNamespace: %s}}",
 		c.Logging.LogLevel,
 		c.Http.Port,
 		c.Rmr.Port,
@@ -143,7 +141,6 @@ func (c *Configuration) String() string {
 		c.RoutingManager.BaseUrl,
 		c.NotificationResponseBuffer,
 		c.BigRedButtonTimeoutSec,
-		c.MaxConnectionAttempts,
 		c.MaxRnibConnectionAttempts,
 		c.RnibRetryIntervalMs,
 		c.KeepAliveResponseTimeoutMs,
@@ -151,7 +148,7 @@ func (c *Configuration) String() string {
 		c.E2TInstanceDeletionTimeoutMs,
 		c.GlobalRicId.PlmnId,
 		c.GlobalRicId.RicNearRtId,
-	//	c.Kubernetes.ConfigPath,
-		//c.Kubernetes.Namespace,
+		c.Kubernetes.ConfigPath,
+		c.Kubernetes.KubeNamespace,
 	)
 }