X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?p=ric-plt%2Fresource-status-manager.git;a=blobdiff_plain;f=RSM%2Fconfiguration%2Fconfiguration.go;fp=RSM%2Fconfiguration%2Fconfiguration.go;h=74306e717be8c74411ef5678b54e175d17aa12f2;hp=5bc1a304b44abfa0701965660b6adaee9f91f5f5;hb=60652d98d51ee23c1eaca2e8bc2bf19c74c57658;hpb=b8d3ff3abf409da49ecab244cd6d2c2124dbce7c

diff --git a/RSM/configuration/configuration.go b/RSM/configuration/configuration.go
index 5bc1a30..74306e7 100644
--- a/RSM/configuration/configuration.go
+++ b/RSM/configuration/configuration.go
@@ -23,7 +23,6 @@ package configuration
 import (
 	"fmt"
 	"github.com/spf13/viper"
-	"rsm/enums"
 )
 
 type Configuration struct {
@@ -42,19 +41,6 @@ type Configuration struct {
 		MaxRnibConnectionAttempts int
 		RnibRetryIntervalMs       int
 	}
-	ResourceStatusParams struct {
-		EnableResourceStatus         bool
-		PartialSuccessAllowed        bool
-		PrbPeriodic                  bool
-		TnlLoadIndPeriodic           bool
-		HwLoadIndPeriodic            bool
-		AbsStatusPeriodic            bool
-		RsrpMeasurementPeriodic      bool
-		CsiPeriodic                  bool
-		PeriodicityMs                enums.ReportingPeriodicity
-		PeriodicityRsrpMeasurementMs enums.ReportingPeriodicityRSRPMR
-		PeriodicityCsiMs             enums.ReportingPeriodicityCSIR
-	}
 }
 
 func ParseConfiguration() (*Configuration, error) {
@@ -81,9 +67,6 @@ func ParseConfiguration() (*Configuration, error) {
 	if err := config.fillRnibConfig(viper.Sub("rnib")); err != nil {
 		return nil, err
 	}
-	if err := config.fillResourceStatusParamsConfig(viper.Sub("resourceStatusParams")); err != nil {
-		return nil, err
-	}
 
 	return &config, nil
 }
@@ -123,69 +106,9 @@ func (c *Configuration) fillRnibConfig(rnibConfig *viper.Viper) error {
 	return nil
 }
 
-func (c *Configuration) fillResourceStatusParamsConfig(chConfig *viper.Viper) error {
-	if chConfig == nil {
-		return fmt.Errorf("#configuration.fillResourceStatusParamsConfig - failed to fill resourceStatusParams configuration: The entry 'resourceStatusParams' not found\n")
-	}
-	c.ResourceStatusParams.EnableResourceStatus = chConfig.GetBool("enableResourceStatus")
-	c.ResourceStatusParams.PartialSuccessAllowed = chConfig.GetBool("partialSuccessAllowed")
-	c.ResourceStatusParams.PrbPeriodic = chConfig.GetBool("prbPeriodic")
-	c.ResourceStatusParams.TnlLoadIndPeriodic = chConfig.GetBool("tnlLoadIndPeriodic")
-	c.ResourceStatusParams.HwLoadIndPeriodic = chConfig.GetBool("hwLoadIndPeriodic")
-	c.ResourceStatusParams.AbsStatusPeriodic = chConfig.GetBool("absStatusPeriodic")
-	c.ResourceStatusParams.RsrpMeasurementPeriodic = chConfig.GetBool("rsrpMeasurementPeriodic")
-	c.ResourceStatusParams.CsiPeriodic = chConfig.GetBool("csiPeriodic")
-	if err := setPeriodicityMs(c, chConfig.GetInt("periodicityMs")); err != nil {
-		return err
-	}
-	if err := setPeriodicityRsrpMeasurementMs(c, chConfig.GetInt("periodicityRsrpMeasurementMs")); err != nil {
-		return err
-	}
-	if err := setPeriodicityCsiMs(c, chConfig.GetInt("periodicityCsiMs")); err != nil {
-		return err
-	}
-	return nil
-}
-
-func setPeriodicityMs(c *Configuration, periodicityMs int) error {
-	v, ok := enums.ReportingPeriodicityValues[periodicityMs]
-
-	if !ok {
-		return fmt.Errorf("Invalid configuration value supplied for PeriodicityMs. Received: %d. Should be one of: %v\n", periodicityMs, enums.GetReportingPeriodicityValuesAsKeys())
-	}
-
-	c.ResourceStatusParams.PeriodicityMs = v
-	return nil
-}
-
-func setPeriodicityRsrpMeasurementMs(c *Configuration, periodicityRsrpMeasurementMs int) error {
-	v, ok := enums.ReportingPeriodicityRsrPmrValues[periodicityRsrpMeasurementMs]
-
-	if !ok {
-		return fmt.Errorf("Invalid configuration value supplied for PeriodicityRsrpMeasurementMs. Received: %d. Should be one of: %v\n", periodicityRsrpMeasurementMs, enums.GetReportingPeriodicityRsrPmrValuesAsKeys())
-	}
-
-	c.ResourceStatusParams.PeriodicityRsrpMeasurementMs = v
-	return nil
-}
-
-func setPeriodicityCsiMs(c *Configuration, periodicityCsiMs int) error {
-	v, ok := enums.ReportingPeriodicityCsirValues[periodicityCsiMs]
-
-	if !ok {
-		return fmt.Errorf("Invalid configuration value supplied for PeriodicityCsiMs. Received: %d. Should be one of: %v\n", periodicityCsiMs, enums.GetReportingPeriodicityCsirValuesAsKeys())
-	}
-
-	c.ResourceStatusParams.PeriodicityCsiMs = v
-	return nil
-}
 
 func (c *Configuration) String() string {
-	return fmt.Sprintf("{logging.logLevel: %s, http.port: %d, rmr.port: %d, rmr.maxMsgSize: %d, rmr.readyIntervalSec: %d, rnib.maxRnibConnectionAttempts: %d, rnib.rnibRetryIntervalMs: %d, "+
-		"resourceStatusParams.enableResourceStatus: %t, resourceStatusParams.partialSuccessAllowed: %t, resourceStatusParams.prbPeriodic: %t, "+
-		"resourceStatusParams.tnlLoadIndPeriodic: %t, resourceStatusParams.hwLoadIndPeriodic: %t, resourceStatusParams.absStatusPeriodic: %t,"+
-		"resourceStatusParams.rsrpMeasurementPeriodic: %t, resourceStatusParams.csiPeriodic: %t, resourceStatusParams.periodicityMs: %s, "+
-		"resourceStatusParams.periodicityRsrpMeasurementMs: %s, resourceStatusParams.periodicityCsiMs: %s}",
+	return fmt.Sprintf("{logging.logLevel: %s, http.port: %d, rmr.port: %d, rmr.maxMsgSize: %d, rmr.readyIntervalSec: %d, rnib.maxRnibConnectionAttempts: %d, rnib.rnibRetryIntervalMs: %d, ",
 		c.Logging.LogLevel,
 		c.Http.Port,
 		c.Rmr.Port,
@@ -193,17 +116,5 @@ func (c *Configuration) String() string {
 		c.Rmr.ReadyIntervalSec,
 		c.Rnib.MaxRnibConnectionAttempts,
 		c.Rnib.RnibRetryIntervalMs,
-		c.ResourceStatusParams.EnableResourceStatus,
-		c.ResourceStatusParams.PartialSuccessAllowed,
-		c.ResourceStatusParams.PrbPeriodic,
-		c.ResourceStatusParams.TnlLoadIndPeriodic,
-		c.ResourceStatusParams.HwLoadIndPeriodic,
-		c.ResourceStatusParams.AbsStatusPeriodic,
-		c.ResourceStatusParams.RsrpMeasurementPeriodic,
-		c.ResourceStatusParams.CsiPeriodic,
-
-		c.ResourceStatusParams.PeriodicityMs,
-		c.ResourceStatusParams.PeriodicityRsrpMeasurementMs,
-		c.ResourceStatusParams.PeriodicityCsiMs,
 	)
 }