Parameterise webui url (#207)

Signed-off-by: gatici <gulsum.atici@canonical.com> Co-authored-by: gab-arrobo <gabriel.arrobo@intel.com>
omec-project · Mar 18, 2024 · 20010c0 · 20010c0
1 parent 94a5a89
commit 20010c0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 1 deletion.
diff --git a/amfTest/amfcfg.yaml b/amfTest/amfcfg.yaml
@@ -45,6 +45,7 @@ configuration:
   supportDnnList:  # the DNN (Data Network Name) list supported by this AMF
     - internet
   nrfUri: http://127.0.0.10:8000 # a valid URI of NRF
+  webuiUri: webui:9876 # a valid URI of Webui
   security:  # NAS security parameters
     integrityOrder: # the priority of integrity algorithms
       - NIA2

diff --git a/factory/config.go b/factory/config.go
@@ -64,6 +64,7 @@ type Configuration struct {
 	PlmnSupportList                 []PlmnSupportItem         `yaml:"plmnSupportList,omitempty"`
 	SupportDnnList                  []string                  `yaml:"supportDnnList,omitempty"`
 	NrfUri                          string                    `yaml:"nrfUri,omitempty"`
+	WebuiUri                        string                    `yaml:"webuiUri"`
 	Security                        *Security                 `yaml:"security,omitempty"`
 	NetworkName                     NetworkName               `yaml:"networkName,omitempty"`
 	T3502Value                      int                       `yaml:"t3502Value,omitempty"`

diff --git a/factory/factory.go b/factory/factory.go
@@ -31,6 +31,9 @@ func InitConfigFactory(f string) error {
 		if yamlErr := yaml.Unmarshal(content, &AmfConfig); yamlErr != nil {
 			return yamlErr
 		}
+		if AmfConfig.Configuration.WebuiUri == "" {
+			AmfConfig.Configuration.WebuiUri = "webui:9876"
+		}
 	}
 
 	return nil

diff --git a/service/init.go b/service/init.go
@@ -148,7 +148,7 @@ func (amf *AMF) Initialize(c *cli.Context) error {
 		factory.AmfConfig.Configuration.SupportTAIList = nil
 		factory.AmfConfig.Configuration.PlmnSupportList = nil
 		initLog.Infoln("Reading Amf related configuration from ROC")
-		client := gClient.ConnectToConfigServer("webui:9876")
+		client := gClient.ConnectToConfigServer(factory.AmfConfig.Configuration.WebuiUri)
 		configChannel := client.PublishOnConfigChange(true)
 		go amf.UpdateConfig(configChannel)
 	} else {