X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fconfiguration%2Fconfiguration.go;h=5e4c31e10f9b55369b1c3196722be0766ef34376;hb=313355950ec536c37ea40e630b0d81e4e674e07c;hp=43beee05f0653685661108d4399bc0a6197c1352;hpb=3ae760f4378ea43575eca6e83ccc01084566e7cf;p=ric-plt%2Fe2mgr.git diff --git a/E2Manager/configuration/configuration.go b/E2Manager/configuration/configuration.go index 43beee0..5e4c31e 100644 --- a/E2Manager/configuration/configuration.go +++ b/E2Manager/configuration/configuration.go @@ -40,7 +40,7 @@ type Configuration struct { } /* Kubernetes struct { ConfigPath string - Namespace string + KubeNamespace string }*/ NotificationResponseBuffer int BigRedButtonTimeoutSec int @@ -118,7 +118,7 @@ func (c *Configuration) populateRoutingManagerConfig(rmConfig *viper.Viper) { 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) { @@ -133,7 +133,7 @@ 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, namespace: %s}}", + "globalRicId: { plmnId: %s, ricNearRtId: %s}",//, kubernetes: {configPath: %s, kubeNamespace: %s}}", c.Logging.LogLevel, c.Http.Port, c.Rmr.Port, @@ -148,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,*/ ) }