X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=E2Manager%2Fconfiguration%2Fconfiguration.go;h=267c25a747148831fba02a69e0a2eb3e47a7fc03;hb=refs%2Fchanges%2F83%2F2983%2F1;hp=06a8a11eb4eda54c3fc26009557d45539dc69685;hpb=f846c5987cd35da745534e26ac3a22bdcf8b030a;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/configuration/configuration.go b/E2Manager/configuration/configuration.go
index 06a8a11..267c25a 100644
--- 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,16 +36,20 @@ type Configuration struct {
 		MaxMsgSize int
 	}
 	RoutingManager struct {
-		BaseUrl	   string
+		BaseUrl 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 {
@@ -74,6 +77,7 @@ func ParseConfiguration() *Configuration {
 	config.KeepAliveResponseTimeoutMs = viper.GetInt("keepAliveResponseTimeoutMs")
 	config.KeepAliveDelayMs = viper.GetInt("KeepAliveDelayMs")
 	config.E2TInstanceDeletionTimeoutMs = viper.GetInt("e2tInstanceDeletionTimeoutMs")
+	config.populateGlobalRicIdConfig(viper.Sub("globalRicId"))
 	return &config
 }
 
@@ -105,3 +109,11 @@ func (c *Configuration) populateRoutingManagerConfig(rmConfig *viper.Viper) {
 	}
 	c.RoutingManager.BaseUrl = rmConfig.GetString("baseUrl")
 }
+
+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")
+}