[RIC-306] Split configuration of globalRicId to mmc, mnc and ric id

[ric-plt/e2mgr.git] / E2Manager / configuration / configuration.go

diff --git a/E2Manager/configuration/configuration.go b/E2Manager/configuration/configuration.go
index 54a0410..8beac3c 100644 (file)
--- a/E2Manager/configuration/configuration.go
+++ b/E2Manager/configuration/configuration.go
@@ -20,8 +20,10 @@
 package configuration
 
 import (
+       "errors"
        "fmt"
        "github.com/spf13/viper"
+       "strconv"
 )
 
 type Configuration struct {
@@ -38,21 +40,18 @@ type Configuration struct {
        RoutingManager struct {
                BaseUrl string
        }
-       Kubernetes struct {
-               ConfigPath string
-               Namespace  string
-       }
+
        NotificationResponseBuffer   int
        BigRedButtonTimeoutSec       int
-       MaxConnectionAttempts        int
        MaxRnibConnectionAttempts    int
        RnibRetryIntervalMs          int
        KeepAliveResponseTimeoutMs   int
        KeepAliveDelayMs             int
        E2TInstanceDeletionTimeoutMs int
        GlobalRicId                  struct {
-               PlmnId      string
-               RicNearRtId string
+               RicId string
+               Mcc   int
+               Mnc   int
        }
 }
 
@@ -73,10 +72,8 @@ func ParseConfiguration() *Configuration {
        config.populateHttpConfig(viper.Sub("http"))
        config.populateLoggingConfig(viper.Sub("logging"))
        config.populateRoutingManagerConfig(viper.Sub("routingManager"))
-       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,27 +112,96 @@ func (c *Configuration) populateRoutingManagerConfig(rmConfig *viper.Viper) {
        c.RoutingManager.BaseUrl = rmConfig.GetString("baseUrl")
 }
 
-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"))
+func (c *Configuration) populateGlobalRicIdConfig(globalRicIdConfig *viper.Viper) {
+       err := validateGlobalRicIdConfig(globalRicIdConfig)
+       if err != nil {
+               panic(err.Error())
        }
-       c.Kubernetes.ConfigPath = rmConfig.GetString("configPath")
-       c.Kubernetes.Namespace = rmConfig.GetString("namespace")
+       c.GlobalRicId.RicId = globalRicIdConfig.GetString("ricId")
+       c.GlobalRicId.Mcc = globalRicIdConfig.GetInt("mcc")
+       c.GlobalRicId.Mnc = globalRicIdConfig.GetInt("mnc")
 }
 
-func (c *Configuration) populateGlobalRicIdConfig(globalRicIdConfig *viper.Viper) {
+func validateGlobalRicIdConfig(globalRicIdConfig *viper.Viper) error {
        if globalRicIdConfig == nil {
-               panic(fmt.Sprintf("#configuration.populateGlobalRicIdConfig - failed to populate Global RicId configuration: The entry 'globalRicId' not found\n"))
+               return errors.New("#configuration.validateGlobalRicIdConfig - failed to populate Global RicId configuration: The entry 'globalRicId' not found\n")
+       }
+
+       err := validateRicId(globalRicIdConfig.GetString("ricId"))
+
+       if err != nil {
+               return err
+       }
+
+       err = validateMcc(globalRicIdConfig.GetInt("mcc"))
+
+       if err != nil {
+               return err
+       }
+
+       err = validateMnc(globalRicIdConfig.GetInt("mnc"))
+
+       if err != nil {
+               return err
+       }
+
+
+       return nil
+}
+
+func validateMcc(mcc int) error {
+
+       mccStr := strconv.Itoa(mcc)
+
+       if len(mccStr) != 3{
+               return errors.New("#configuration.validateMcc - mcc is not 3 digits\n")
+       }
+
+       if mcc < 0 {
+               return errors.New("#configuration.validateMcc - mcc is negative\n")
+       }
+       return nil
+}
+
+func validateMnc(mnc int) error {
+
+       mncStr := strconv.Itoa(mnc)
+
+       if len(mncStr) < 2 || len(mncStr) >3 {
+               return errors.New("#configuration.validateMnc - mnc is not 2 or 3 digits\n")
        }
-       c.GlobalRicId.PlmnId = globalRicIdConfig.GetString("plmnId")
-       c.GlobalRicId.RicNearRtId = globalRicIdConfig.GetString("ricNearRtId")
+
+       if mnc < 0 {
+               return errors.New("#configuration.validateMnc - mnc is negative\n")
+       }
+
+       return nil
 }
 
+func validateRicId(ricId string) error{
+
+       if len(ricId) == 0{
+               return errors.New("#configuration.validateRicId - ricId is emtpy\n")
+       }
+
+       if len(ricId) != 5 {
+               return errors.New("#configuration.validateRicId - ricId length should be 5 hex characters\n")
+       }
+
+       _, err := strconv.ParseUint(ricId, 16, 64)
+       if err != nil {
+               return errors.New("#configuration.validateRicId - ricId is not hex number\n")
+       }
+
+       return nil
+}
+
+
 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: { ricId: %s, mcc: %d, mnc: %d}",
                c.Logging.LogLevel,
                c.Http.Port,
                c.Rmr.Port,
@@ -143,15 +209,13 @@ func (c *Configuration) String() string {
                c.RoutingManager.BaseUrl,
                c.NotificationResponseBuffer,
                c.BigRedButtonTimeoutSec,
-               c.MaxConnectionAttempts,
                c.MaxRnibConnectionAttempts,
                c.RnibRetryIntervalMs,
                c.KeepAliveResponseTimeoutMs,
                c.KeepAliveDelayMs,
                c.E2TInstanceDeletionTimeoutMs,
-               c.GlobalRicId.PlmnId,
-               c.GlobalRicId.RicNearRtId,
-               c.Kubernetes.ConfigPath,
-               c.Kubernetes.Namespace,
+               c.GlobalRicId.RicId,
+               c.GlobalRicId.Mcc,
+               c.GlobalRicId.Mnc,
        )
 }