Merge pull request #1 from abousselmi/patch-1

New webuicfg config factory separate from udr

backend/factory/config_config.go

+/*
+ * WebUI Configuration Factory
+ */
+
+package factory
+
+type Config struct {
+	Info          *Info          `yaml:"info"`
+	Configuration *Configuration `yaml:"configuration"`
+}

backend/factory/config_configuration.go

+/*
+ * WebUI Configuration Factory
+ */
+
+package factory
+
+type Configuration struct {
+	Mongodb *Mongodb `yaml:"mongodb"`
+}

backend/factory/config_info.go

+/*
+ * WebUI Configuration Factory
+ */
+
+package factory
+
+type Info struct {
+	Version     string `yaml:"version,omitempty"`
+	Description string `yaml:"description,omitempty"`
+}

backend/factory/config_mongodb.go

+/*
+ * WebUI Configuration Factory
+ */
+
+package factory
+
+type Mongodb struct {
+	Name string `yaml:"name"`
+	Url  string `yaml:"url"`
+}

backend/factory/factory.go

+/*
+ * WebUI Configuration Factory
+ */
+
+package factory
+
+import (
+	"fmt"
+	"io/ioutil"
+
+	"gopkg.in/yaml.v2"
+
+	"free5gc/webconsole/backend/logger"
+)
+
+var WebUIConfig Config
+
+func checkErr(err error) {
+	if err != nil {
+		err = fmt.Errorf("[Configuration] %s", err.Error())
+		logger.AppLog.Fatal(err)
+	}
+}
+
+// TODO: Support configuration update from REST api
+func InitConfigFactory(f string) {
+	content, err := ioutil.ReadFile(f)
+	checkErr(err)
+
+	WebUIConfig = Config{}
+
+	err = yaml.Unmarshal([]byte(content), &WebUIConfig)
+	checkErr(err)
+
+	logger.InitLog.Infof("Successfully initialize configuration %s", f)
+}

backend/webui_service/webui_init.go

@@ -7,7 +7,7 @@ import (
 	"free5gc/lib/MongoDBLibrary"
 	"free5gc/lib/path_util"
 	"free5gc/src/app"
-	"free5gc/src/udr/factory"
+	"free5gc/webconsole/backend/factory"
 	"free5gc/webconsole/backend/WebUI"
 	"free5gc/webconsole/backend/logger"
 	"free5gc/webconsole/backend/webui_context"
@@ -59,8 +59,8 @@ func (*WEBUI) Initialize(c *cli.Context) {
 	if config.webuicfg != "" {
 		factory.InitConfigFactory(config.webuicfg)
 	} else {
-		DefaultUdrConfigPath := path_util.Gofree5gcPath("free5gc/config/udrcfg.conf")
-		factory.InitConfigFactory(DefaultUdrConfigPath)
+		DefaultWebUIConfigPath := path_util.Gofree5gcPath("free5gc/config/webuicfg.conf")
+		factory.InitConfigFactory(DefaultWebUIConfigPath)
 	}
 
 	initLog.Traceln("WEBUI debug level(string):", app.ContextSelf().Logger.WEBUI.DebugLevel)
@@ -90,8 +90,8 @@ func (webui *WEBUI) FilterCli(c *cli.Context) (args []string) {
 }
 
 func (webui *WEBUI) Start() {
-	// get config file info from UdrConfig
-	mongodb := factory.UdrConfig.Configuration.Mongodb
+	// get config file info from WebUIConfig
+	mongodb := factory.WebUIConfig.Configuration.Mongodb
 
 	// Connect to MongoDB
 	MongoDBLibrary.SetMongoDB(mongodb.Name, mongodb.Url)