From ffcb95e2ca45ed894c67b8d72b8d83af44beab07 Mon Sep 17 00:00:00 2001 From: Trial97 Date: Wed, 18 Nov 2020 13:08:25 +0200 Subject: [PATCH] Updated config APIs and added integration tests --- apier/v1/api_interfaces.go | 6 +-- apier/v1/config.go | 20 +++++----- apier/v1/config_it_test.go | 61 ++++++++++++++++++++++++++--- apier/v1/dispatcher.go | 14 +++---- apier/v1/preload_it_test.go | 3 +- cmd/cgr-engine/cgr-engine.go | 4 +- config/config.go | 24 ++++++------ config/config_it_test.go | 34 ++++++++-------- config/config_test.go | 18 ++++----- console/reload_config.go | 8 ++-- dispatchers/config.go | 46 +++++++++++----------- ers/ers_reload_it_test.go | 2 +- packages/debian/changelog | 3 ++ services/apiers_it_test.go | 2 +- services/asteriskagent_it_test.go | 2 +- services/attributes_it_test.go | 2 +- services/cdrs_it_test.go | 2 +- services/chargers_it_test.go | 2 +- services/datadb_it_test.go | 2 +- services/diameteragent_it_test.go | 2 +- services/dispatchers_it_test.go | 2 +- services/dnsagent_it_test.go | 2 +- services/ees_it_test.go | 2 +- services/ers_it_test.go | 2 +- services/freeswitchagent_it_test.go | 2 +- services/kamailioagent_it_test.go | 2 +- services/radiusagent_it_test.go | 2 +- services/rals_it_test.go | 2 +- services/rates_it_test.go | 2 +- services/resources_it_test.go | 2 +- services/routes_it_test.go | 2 +- services/schedulers_it_test.go | 2 +- services/sessions_it_test.go | 2 +- services/sipagent_it_test.go | 2 +- services/stats_it_test.go | 2 +- services/thresholds_it_test.go | 2 +- utils/consts.go | 12 +++--- 37 files changed, 178 insertions(+), 123 deletions(-) diff --git a/apier/v1/api_interfaces.go b/apier/v1/api_interfaces.go index 42834636e..3ba023f9b 100644 --- a/apier/v1/api_interfaces.go +++ b/apier/v1/api_interfaces.go @@ -168,9 +168,9 @@ type RALsV1Interface interface { type ConfigSv1Interface interface { GetConfig(section *config.SectionWithOpts, reply *map[string]interface{}) (err error) - ReloadConfigFromPath(section *config.ConfigReloadWithOpts, reply *string) (err error) - ReloadConfig(args *config.ArgsReloadWithOpts, reply *string) (err error) - ReloadConfigFromJSON(args *config.JSONStringReloadWithOpts, reply *string) (err error) + ReloadConfig(section *config.ConfigReloadArgs, reply *string) (err error) + SetConfig(args *config.SetConfigArgs, reply *string) (err error) + SetConfigFromJSON(args *config.SetConfigFromJSONArgs, reply *string) (err error) GetConfigAsJSON(args *config.SectionWithOpts, reply *string) (err error) } diff --git a/apier/v1/config.go b/apier/v1/config.go index cf20815b8..40ed4826e 100644 --- a/apier/v1/config.go +++ b/apier/v1/config.go @@ -38,19 +38,19 @@ func (cSv1 *ConfigSv1) GetConfig(section *config.SectionWithOpts, reply *map[str return cSv1.cfg.V1GetConfig(section, reply) } -// ReloadConfigFromPath reloads the configuration -func (cSv1 *ConfigSv1) ReloadConfigFromPath(args *config.ConfigReloadWithOpts, reply *string) (err error) { - return cSv1.cfg.V1ReloadConfigFromPath(args, reply) -} - -// ReloadConfig reloads the sections of config -func (cSv1 *ConfigSv1) ReloadConfig(args *config.ArgsReloadWithOpts, reply *string) (err error) { +// ReloadConfig reloads the configuration +func (cSv1 *ConfigSv1) ReloadConfig(args *config.ConfigReloadArgs, reply *string) (err error) { return cSv1.cfg.V1ReloadConfig(args, reply) } -// ReloadConfigFromJSON reloads the sections of config -func (cSv1 *ConfigSv1) ReloadConfigFromJSON(args *config.JSONStringReloadWithOpts, reply *string) (err error) { - return cSv1.cfg.V1ReloadConfigFromJSON(args, reply) +// SetConfig reloads the sections of config +func (cSv1 *ConfigSv1) SetConfig(args *config.SetConfigArgs, reply *string) (err error) { + return cSv1.cfg.V1SetConfig(args, reply) +} + +// SetConfigFromJSON reloads the sections of config +func (cSv1 *ConfigSv1) SetConfigFromJSON(args *config.SetConfigFromJSONArgs, reply *string) (err error) { + return cSv1.cfg.V1SetConfigFromJSON(args, reply) } // GetConfigAsJSON will retrieve from CGRConfig a section diff --git a/apier/v1/config_it_test.go b/apier/v1/config_it_test.go index f7df7c5f6..aab09feed 100644 --- a/apier/v1/config_it_test.go +++ b/apier/v1/config_it_test.go @@ -47,9 +47,11 @@ var ( testConfigSResetStorDb, testConfigSStartEngine, testConfigSRPCConn, - testConfigSReloadConfigFromJSONSessionS, - testConfigSReloadConfigFromJSONEEs, + testConfigSSetConfigSessionS, + testConfigSSetConfigEEs, testConfigSv1GetJSONSectionWithoutTenant, + testConfigSSetConfigFromJSONCoreS, + testConfigSReloadConfigCoreS, testConfigSKillEngine, testConfigStartEngineWithConfigs, testConfigStartEngineFromHTTP, @@ -114,9 +116,9 @@ func testConfigSRPCConn(t *testing.T) { } } -func testConfigSReloadConfigFromJSONSessionS(t *testing.T) { +func testConfigSSetConfigSessionS(t *testing.T) { var reply string - if err := configRPC.Call(utils.ConfigSv1ReloadConfig, &config.ArgsReloadWithOpts{ + if err := configRPC.Call(utils.ConfigSv1SetConfig, &config.SetConfigArgs{ Tenant: "cgrates.org", Config: map[string]interface{}{ "sessions": map[string]interface{}{ @@ -229,12 +231,12 @@ func testConfigSv1GetJSONSectionWithoutTenant(t *testing.T) { } } -func testConfigSReloadConfigFromJSONEEs(t *testing.T) { +func testConfigSSetConfigEEs(t *testing.T) { if *encoding == utils.MetaGOB { t.SkipNow() } var reply string - if err := configRPC.Call(utils.ConfigSv1ReloadConfig, &config.ArgsReloadWithOpts{ + if err := configRPC.Call(utils.ConfigSv1SetConfig, &config.SetConfigArgs{ Config: map[string]interface{}{ "ees": map[string]interface{}{ "enabled": true, @@ -345,3 +347,50 @@ func testConfigStartEngineFromHTTP(t *testing.T) { t.Error(err) } } + +func testConfigSSetConfigFromJSONCoreS(t *testing.T) { + cfgStr := `{"cores":{"caps":0,"caps_stats_interval":"0","caps_strategy":"*queue","shutdown_timeout":"1s"}}` + var reply string + if err := configRPC.Call(utils.ConfigSv1SetConfigFromJSON, &config.SetConfigFromJSONArgs{ + Tenant: "cgrates.org", + Config: cfgStr, + }, &reply); err != nil { + t.Error(err) + } else if reply != utils.OK { + t.Errorf("Expected OK received: %s", reply) + } + + var rpl string + if err := configRPC.Call(utils.ConfigSv1GetConfigAsJSON, &config.SectionWithOpts{ + Tenant: "cgrates.org", + Section: config.CoreSCfgJson, + }, &rpl); err != nil { + t.Error(err) + } else if cfgStr != rpl { + t.Errorf("Expected %q , received: %q", cfgStr, rpl) + } +} + +func testConfigSReloadConfigCoreS(t *testing.T) { + cfgStr := `{"cores":{"caps":2,"caps_stats_interval":"0","caps_strategy":"*busy","shutdown_timeout":"1s"}}` + var reply string + if err := configRPC.Call(utils.ConfigSv1ReloadConfig, &config.ConfigReloadArgs{ + Tenant: "cgrates.org", + Path: path.Join(*dataDir, "conf", "samples", "caps_busy"), + Section: config.CoreSCfgJson, + }, &reply); err != nil { + t.Error(err) + } else if reply != utils.OK { + t.Errorf("Expected OK received: %s", reply) + } + + var rpl string + if err := configRPC.Call(utils.ConfigSv1GetConfigAsJSON, &config.SectionWithOpts{ + Tenant: "cgrates.org", + Section: config.CoreSCfgJson, + }, &rpl); err != nil { + t.Error(err) + } else if cfgStr != rpl { + t.Errorf("Expected %q , received: %q", cfgStr, rpl) + } +} diff --git a/apier/v1/dispatcher.go b/apier/v1/dispatcher.go index 6c2b9c87d..fb7edfd32 100755 --- a/apier/v1/dispatcher.go +++ b/apier/v1/dispatcher.go @@ -831,16 +831,16 @@ func (dS *DispatcherConfigSv1) GetConfig(args *config.SectionWithOpts, reply *ma return dS.dS.ConfigSv1GetConfig(args, reply) } -func (dS *DispatcherConfigSv1) ReloadConfigFromPath(args *config.ConfigReloadWithOpts, reply *string) (err error) { - return dS.dS.ConfigSv1ReloadConfigFromPath(args, reply) -} - -func (dS *DispatcherConfigSv1) ReloadConfig(args *config.ArgsReloadWithOpts, reply *string) (err error) { +func (dS *DispatcherConfigSv1) ReloadConfig(args *config.ConfigReloadArgs, reply *string) (err error) { return dS.dS.ConfigSv1ReloadConfig(args, reply) } -func (dS *DispatcherConfigSv1) ReloadConfigFromJSON(args *config.JSONStringReloadWithOpts, reply *string) (err error) { - return dS.dS.ConfigSv1ReloadConfigFromJSON(args, reply) +func (dS *DispatcherConfigSv1) SetConfig(args *config.SetConfigArgs, reply *string) (err error) { + return dS.dS.ConfigSv1SetConfig(args, reply) +} + +func (dS *DispatcherConfigSv1) SetConfigFromJSON(args *config.SetConfigFromJSONArgs, reply *string) (err error) { + return dS.dS.ConfigSv1SetConfigFromJSON(args, reply) } func (dS *DispatcherConfigSv1) GetConfigAsJSON(args *config.SectionWithOpts, reply *string) (err error) { return dS.dS.ConfigSv1GetConfigAsJSON(args, reply) diff --git a/apier/v1/preload_it_test.go b/apier/v1/preload_it_test.go index eae947b59..ab3fe9359 100644 --- a/apier/v1/preload_it_test.go +++ b/apier/v1/preload_it_test.go @@ -64,7 +64,8 @@ func TestPreload(t *testing.T) { func testCreateDirs(t *testing.T) { for _, dir := range []string{"/tmp/In", "/tmp/Out", "/tmp/LoaderIn", "/tmp/SubpathWithoutMove", - "/tmp/SubpathLoaderWithMove", "/tmp/SubpathOut", "/tmp/templateLoaderIn", "/tmp/templateLoaderOut"} { + "/tmp/SubpathLoaderWithMove", "/tmp/SubpathOut", "/tmp/templateLoaderIn", "/tmp/templateLoaderOut", + "/tmp/customSepLoaderIn", "/tmp/customSepLoaderOut"} { if err := os.RemoveAll(dir); err != nil { t.Fatal("Error removing folder: ", dir, err) } diff --git a/cmd/cgr-engine/cgr-engine.go b/cmd/cgr-engine/cgr-engine.go index 1b79a9e88..eb634d593 100644 --- a/cmd/cgr-engine/cgr-engine.go +++ b/cmd/cgr-engine/cgr-engine.go @@ -318,8 +318,8 @@ func singnalHandler(stopChan <-chan struct{}, exitChan chan<- struct{}) { // do it in it's own gorutine in order to not block the signal handler with the reload functionality go func() { var reply string - if err := config.CgrConfig().V1ReloadConfigFromPath( - &config.ConfigReloadWithOpts{ + if err := config.CgrConfig().V1ReloadConfig( + &config.ConfigReloadArgs{ Section: utils.EmptyString, Path: config.CgrConfig().ConfigPath, // use the same path }, &reply); err != nil { diff --git a/config/config.go b/config/config.go index 21c58dca5..c68fbdca9 100644 --- a/config/config.go +++ b/config/config.go @@ -1529,15 +1529,16 @@ func (cfg *CGRConfig) AsMapInterface(separator string) (mp map[string]interface{ }, nil } -type ConfigReloadWithOpts struct { +// ConfigReloadArgs the API params for V1ReloadConfig +type ConfigReloadArgs struct { Opts map[string]interface{} Tenant string Path string Section string } -// V1ReloadConfigFromPath reloads the configuration -func (cfg *CGRConfig) V1ReloadConfigFromPath(args *ConfigReloadWithOpts, reply *string) (err error) { +// V1ReloadConfig reloads the configuration +func (cfg *CGRConfig) V1ReloadConfig(args *ConfigReloadArgs, reply *string) (err error) { if missing := utils.MissingStructFields(args, []string{"Path"}); len(missing) != 0 { return utils.NewErrMandatoryIeMissing(missing...) } @@ -1567,6 +1568,7 @@ func (cfg *CGRConfig) V1ReloadConfigFromPath(args *ConfigReloadWithOpts, reply * return } +// SectionWithOpts the API params for GetConfig type SectionWithOpts struct { Opts map[string]interface{} Tenant string @@ -1677,15 +1679,15 @@ func (cfg *CGRConfig) V1GetConfig(args *SectionWithOpts, reply *map[string]inter return } -// ArgsReloadWithOpts the API params for V1ReloadConfigFromJSON -type ArgsReloadWithOpts struct { +// SetConfigArgs the API params for V1SetConfig +type SetConfigArgs struct { Opts map[string]interface{} Tenant string Config map[string]interface{} } -// V1ReloadConfig reloads the sections of config -func (cfg *CGRConfig) V1ReloadConfig(args *ArgsReloadWithOpts, reply *string) (err error) { +// V1SetConfig reloads the sections of config +func (cfg *CGRConfig) V1SetConfig(args *SetConfigArgs, reply *string) (err error) { if len(args.Config) == 0 { *reply = utils.OK return @@ -1822,15 +1824,15 @@ func (cfg *CGRConfig) V1GetConfigAsJSON(args *SectionWithOpts, reply *string) (e return } -// JSONStringReloadWithOpts the API params for V1ReloadConfigFromString -type JSONStringReloadWithOpts struct { +// SetConfigFromJSONArgs the API params for V1SetConfigFromJSON +type SetConfigFromJSONArgs struct { Opts map[string]interface{} Tenant string Config string } -// V1ReloadConfigFromJSON reloads the sections of config -func (cfg *CGRConfig) V1ReloadConfigFromJSON(args *JSONStringReloadWithOpts, reply *string) (err error) { +// V1SetConfigFromJSON reloads the sections of config +func (cfg *CGRConfig) V1SetConfigFromJSON(args *SetConfigFromJSONArgs, reply *string) (err error) { if len(args.Config) == 0 { *reply = utils.OK return diff --git a/config/config_it_test.go b/config/config_it_test.go index 3c0d2c3cc..e2d960710 100644 --- a/config/config_it_test.go +++ b/config/config_it_test.go @@ -125,7 +125,7 @@ func testCGRConfigReloadAttributeS(t *testing.T) { t.Fatal(err) } var reply string - if err = cfg.V1ReloadConfigFromPath(&ConfigReloadWithOpts{ + if err = cfg.V1ReloadConfig(&ConfigReloadArgs{ Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "tutmongo2"), Section: ATTRIBUTE_JSN, }, &reply); err != nil { @@ -155,7 +155,7 @@ func testCGRConfigReloadChargerS(t *testing.T) { t.Fatal(err) } var reply string - if err = cfg.V1ReloadConfigFromPath(&ConfigReloadWithOpts{ + if err = cfg.V1ReloadConfig(&ConfigReloadArgs{ Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "tutmongo2"), Section: ChargerSCfgJson, }, &reply); err != nil { @@ -182,7 +182,7 @@ func testCGRConfigReloadThresholdS(t *testing.T) { t.Fatal(err) } var reply string - if err = cfg.V1ReloadConfigFromPath(&ConfigReloadWithOpts{ + if err = cfg.V1ReloadConfig(&ConfigReloadArgs{ Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "tutmongo2"), Section: THRESHOLDS_JSON, }, &reply); err != nil { @@ -208,7 +208,7 @@ func testCGRConfigReloadStatS(t *testing.T) { t.Fatal(err) } var reply string - if err = cfg.V1ReloadConfigFromPath(&ConfigReloadWithOpts{ + if err = cfg.V1ReloadConfig(&ConfigReloadArgs{ Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "tutmongo2"), Section: STATS_JSON, }, &reply); err != nil { @@ -235,7 +235,7 @@ func testCGRConfigReloadResourceS(t *testing.T) { t.Fatal(err) } var reply string - if err = cfg.V1ReloadConfigFromPath(&ConfigReloadWithOpts{ + if err = cfg.V1ReloadConfig(&ConfigReloadArgs{ Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "tutmongo2"), Section: RESOURCES_JSON, }, &reply); err != nil { @@ -262,7 +262,7 @@ func testCGRConfigReloadSupplierS(t *testing.T) { t.Fatal(err) } var reply string - if err = cfg.V1ReloadConfigFromPath(&ConfigReloadWithOpts{ + if err = cfg.V1ReloadConfig(&ConfigReloadArgs{ Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "tutmongo2"), Section: RouteSJson, }, &reply); err != nil { @@ -293,7 +293,7 @@ func testCGRConfigReloadSchedulerS(t *testing.T) { t.Fatal(err) } var reply string - if err = cfg.V1ReloadConfigFromPath(&ConfigReloadWithOpts{ + if err = cfg.V1ReloadConfig(&ConfigReloadArgs{ Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "tutmongo2"), Section: SCHEDULER_JSN, }, &reply); err != nil { @@ -320,7 +320,7 @@ func testCGRConfigReloadCDRs(t *testing.T) { } cfg.RalsCfg().Enabled = true var reply string - if err = cfg.V1ReloadConfigFromPath(&ConfigReloadWithOpts{ + if err = cfg.V1ReloadConfig(&ConfigReloadArgs{ Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "tutmongo2"), Section: CDRS_JSN, }, &reply); err != nil { @@ -358,7 +358,7 @@ func testCGRConfigReloadRALs(t *testing.T) { blMap := cfg.RalsCfg().BalanceRatingSubject maxComp := cfg.RalsCfg().MaxComputedUsage var reply string - if err = cfg.V1ReloadConfigFromPath(&ConfigReloadWithOpts{ + if err = cfg.V1ReloadConfig(&ConfigReloadArgs{ Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "tutmongo2"), Section: RALS_JSN, }, &reply); err != nil { @@ -392,7 +392,7 @@ func testCGRConfigReloadSessionS(t *testing.T) { cfg.ChargerSCfg().Enabled = true cfg.CdrsCfg().Enabled = true var reply string - if err = cfg.V1ReloadConfigFromPath(&ConfigReloadWithOpts{ + if err = cfg.V1ReloadConfig(&ConfigReloadArgs{ Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "tutmongo2"), Section: SessionSJson, }, &reply); err != nil { @@ -445,7 +445,7 @@ func testCGRConfigReloadERs(t *testing.T) { } cfg.SessionSCfg().Enabled = true var reply string - if err = cfg.V1ReloadConfigFromPath(&ConfigReloadWithOpts{ + if err = cfg.V1ReloadConfig(&ConfigReloadArgs{ Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "ers_example"), Section: ERsJson, }, &reply); err != nil { @@ -521,7 +521,7 @@ func testCGRConfigReloadDNSAgent(t *testing.T) { } cfg.SessionSCfg().Enabled = true var reply string - if err = cfg.V1ReloadConfigFromPath(&ConfigReloadWithOpts{ + if err = cfg.V1ReloadConfig(&ConfigReloadArgs{ Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "dnsagent_reload"), Section: DNSAgentJson, }, &reply); err != nil { @@ -549,7 +549,7 @@ func testCGRConfigReloadFreeswitchAgent(t *testing.T) { } cfg.SessionSCfg().Enabled = true var reply string - if err = cfg.V1ReloadConfigFromPath(&ConfigReloadWithOpts{ + if err = cfg.V1ReloadConfig(&ConfigReloadArgs{ Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "freeswitch_reload"), Section: FreeSWITCHAgentJSN, }, &reply); err != nil { @@ -722,7 +722,7 @@ func testCgrCfgV1ReloadConfigSection(t *testing.T) { var reply string var rcv map[string]interface{} - if err := cfg.V1ReloadConfigFromPath(&ConfigReloadWithOpts{ + if err := cfg.V1ReloadConfig(&ConfigReloadArgs{ Path: "/usr/share/cgrates/conf/samples/ers_example", Section: ERsJson, }, &reply); err != nil { @@ -756,7 +756,7 @@ func testCGRConfigReloadConfigFromJSONSessionS(t *testing.T) { cfg.ChargerSCfg().Enabled = true cfg.CdrsCfg().Enabled = true var reply string - if err = cfg.V1ReloadConfig(&ArgsReloadWithOpts{ + if err = cfg.V1SetConfig(&SetConfigArgs{ Config: map[string]interface{}{ "sessions": map[string]interface{}{ "enabled": true, @@ -811,7 +811,7 @@ func testCGRConfigReloadConfigFromStringSessionS(t *testing.T) { cfg.ChargerSCfg().Enabled = true cfg.CdrsCfg().Enabled = true var reply string - if err = cfg.V1ReloadConfigFromJSON(&JSONStringReloadWithOpts{ + if err = cfg.V1SetConfigFromJSON(&SetConfigFromJSONArgs{ Config: `{"sessions":{ "enabled": true, "resources_conns": ["*localhost"], @@ -871,7 +871,7 @@ func testCGRConfigReloadAll(t *testing.T) { cfg.ChargerSCfg().Enabled = true cfg.CdrsCfg().Enabled = true var reply string - if err = cfg.V1ReloadConfigFromPath(&ConfigReloadWithOpts{ + if err = cfg.V1ReloadConfig(&ConfigReloadArgs{ Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "tutmongo2"), Section: utils.MetaAll, }, &reply); err != nil { diff --git a/config/config_test.go b/config/config_test.go index 9c5c98649..c2b366812 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -4700,7 +4700,7 @@ func TestV1GetConfigSectionConfigs(t *testing.T) { var result string if cfgCgr2, err := NewDefaultCGRConfig(); err != nil { t.Error(err) - } else if err = cfgCgr2.V1ReloadConfig(&ArgsReloadWithOpts{Config: reply}, &result); err != nil { + } else if err = cfgCgr2.V1SetConfig(&SetConfigArgs{Config: reply}, &result); err != nil { t.Error(err) } else if result != utils.OK { t.Errorf("Unexpected result") @@ -4803,7 +4803,7 @@ func TestV1ReloadConfigEmptyConfig(t *testing.T) { var reply string if cgrCfg, err := NewDefaultCGRConfig(); err != nil { t.Error(err) - } else if err := cgrCfg.V1ReloadConfig(&ArgsReloadWithOpts{}, &reply); err != nil { + } else if err := cgrCfg.V1SetConfig(&SetConfigArgs{}, &reply); err != nil { t.Error(err) } else if reply != utils.OK { t.Errorf("Unexpected output: %+v", reply) @@ -4815,7 +4815,7 @@ func TestV1ReloadConfigUnmarshalError(t *testing.T) { expected := "json: unsupported type: chan int" if cgrCfg, err := NewDefaultCGRConfig(); err != nil { t.Error(err) - } else if err := cgrCfg.V1ReloadConfig(&ArgsReloadWithOpts{ + } else if err := cgrCfg.V1SetConfig(&SetConfigArgs{ Config: map[string]interface{}{ "randomValue": make(chan int), }, @@ -4833,7 +4833,7 @@ func TestV1ReloadConfigJSONWithLocks(t *testing.T) { expected := "Invalid section: " if cfgCgr, err := NewDefaultCGRConfig(); err != nil { t.Error(err) - } else if err := cfgCgr.V1ReloadConfig(&ArgsReloadWithOpts{Config: section}, &reply); err == nil || err.Error() != expected { + } else if err := cfgCgr.V1SetConfig(&SetConfigArgs{Config: section}, &reply); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } @@ -4855,7 +4855,7 @@ func TestV1ReloadConfigCheckingSanity(t *testing.T) { expected := ` not enabled but requested by component.` if cfgCgr, err := NewCGRConfigFromJSONStringWithDefaults(cfgJSONStr); err != nil { t.Error(err) - } else if err := cfgCgr.V1ReloadConfig(&ArgsReloadWithOpts{Config: ralsMap}, &reply); err == nil || err.Error() != expected { + } else if err := cfgCgr.V1SetConfig(&SetConfigArgs{Config: ralsMap}, &reply); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } @@ -5402,7 +5402,7 @@ func TestV1GetConfigAsJSONCoreS(t *testing.T) { var result string if cfgCgr2, err := NewDefaultCGRConfig(); err != nil { t.Error(err) - } else if err = cfgCgr2.V1ReloadConfigFromJSON(&JSONStringReloadWithOpts{Config: reply}, &result); err != nil { + } else if err = cfgCgr2.V1SetConfigFromJSON(&SetConfigFromJSONArgs{Config: reply}, &result); err != nil { t.Error(err) } else if result != utils.OK { t.Errorf("Unexpected result") @@ -5422,7 +5422,7 @@ func TestV1GetConfigAsJSONCheckConfigSanity(t *testing.T) { expected := ` not enabled but requested by component.` if cfgCgr2, err := NewDefaultCGRConfig(); err != nil { t.Error(err) - } else if err = cfgCgr2.V1ReloadConfigFromJSON(&JSONStringReloadWithOpts{Config: args}, &result); err == nil || err.Error() != expected { + } else if err = cfgCgr2.V1SetConfigFromJSON(&SetConfigFromJSONArgs{Config: args}, &result); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } @@ -5474,7 +5474,7 @@ func TestV1ReloadConfigFromJSONEmptyConfig(t *testing.T) { var reply string if cgrCfg, err := NewDefaultCGRConfig(); err != nil { t.Error(err) - } else if err := cgrCfg.V1ReloadConfigFromJSON(&JSONStringReloadWithOpts{Config: utils.EmptyString}, &reply); err != nil { + } else if err := cgrCfg.V1SetConfigFromJSON(&SetConfigFromJSONArgs{Config: utils.EmptyString}, &reply); err != nil { t.Error(err) } else if reply != utils.OK { t.Errorf("Unexpected reply") @@ -5486,7 +5486,7 @@ func TestV1ReloadConfigFromJSONInvalidSection(t *testing.T) { expected := "invalid character 'I' looking for beginning of value around line 1 and position 1\n line: \"InvalidSection\"" if cgrCfg, err := NewDefaultCGRConfig(); err != nil { t.Error(err) - } else if err := cgrCfg.V1ReloadConfigFromJSON(&JSONStringReloadWithOpts{Config: "InvalidSection"}, &reply); err == nil || err.Error() != expected { + } else if err := cgrCfg.V1SetConfigFromJSON(&SetConfigFromJSONArgs{Config: "InvalidSection"}, &reply); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } diff --git a/console/reload_config.go b/console/reload_config.go index 94a63ad3f..e847007dd 100644 --- a/console/reload_config.go +++ b/console/reload_config.go @@ -26,8 +26,8 @@ import ( func init() { c := &CmdRelaodConfigSection{ name: "reload_config", - rpcMethod: utils.ConfigSv1ReloadConfigFromPath, - rpcParams: &config.ConfigReloadWithOpts{}, + rpcMethod: utils.ConfigSv1ReloadConfig, + rpcParams: &config.ConfigReloadArgs{}, } commands[c.Name()] = c c.CommandExecuter = &CommandExecuter{c} @@ -37,7 +37,7 @@ func init() { type CmdRelaodConfigSection struct { name string rpcMethod string - rpcParams *config.ConfigReloadWithOpts + rpcParams *config.ConfigReloadArgs *CommandExecuter } @@ -51,7 +51,7 @@ func (self *CmdRelaodConfigSection) RpcMethod() string { func (self *CmdRelaodConfigSection) RpcParams(reset bool) interface{} { if reset || self.rpcParams == nil { - self.rpcParams = &config.ConfigReloadWithOpts{Opts: make(map[string]interface{})} + self.rpcParams = &config.ConfigReloadArgs{Opts: make(map[string]interface{})} } return self.rpcParams } diff --git a/dispatchers/config.go b/dispatchers/config.go index 248f9d97d..e7bc7ac52 100644 --- a/dispatchers/config.go +++ b/dispatchers/config.go @@ -44,26 +44,7 @@ func (dS *DispatcherService) ConfigSv1GetConfig(args *config.SectionWithOpts, re }, utils.MetaConfig, utils.ConfigSv1GetConfig, args, reply) } -func (dS *DispatcherService) ConfigSv1ReloadConfigFromPath(args *config.ConfigReloadWithOpts, reply *string) (err error) { - tnt := dS.cfg.GeneralCfg().DefaultTenant - if args.Tenant != utils.EmptyString { - tnt = args.Tenant - } - if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { - if err = dS.authorize(utils.ConfigSv1ReloadConfigFromPath, tnt, - utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil { - return - } - } - return dS.Dispatch(&utils.CGREventWithOpts{ - CGREvent: &utils.CGREvent{ - Tenant: tnt, - }, - Opts: args.Opts, - }, utils.MetaConfig, utils.ConfigSv1ReloadConfigFromPath, args, reply) -} - -func (dS *DispatcherService) ConfigSv1ReloadConfig(args *config.ArgsReloadWithOpts, reply *string) (err error) { +func (dS *DispatcherService) ConfigSv1ReloadConfig(args *config.ConfigReloadArgs, reply *string) (err error) { tnt := dS.cfg.GeneralCfg().DefaultTenant if args.Tenant != utils.EmptyString { tnt = args.Tenant @@ -82,13 +63,13 @@ func (dS *DispatcherService) ConfigSv1ReloadConfig(args *config.ArgsReloadWithOp }, utils.MetaConfig, utils.ConfigSv1ReloadConfig, args, reply) } -func (dS *DispatcherService) ConfigSv1ReloadConfigFromJSON(args *config.JSONStringReloadWithOpts, reply *string) (err error) { +func (dS *DispatcherService) ConfigSv1SetConfig(args *config.SetConfigArgs, reply *string) (err error) { tnt := dS.cfg.GeneralCfg().DefaultTenant if args.Tenant != utils.EmptyString { tnt = args.Tenant } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { - if err = dS.authorize(utils.ConfigSv1ReloadConfigFromJSON, tnt, + if err = dS.authorize(utils.ConfigSv1SetConfig, tnt, utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil { return } @@ -98,7 +79,26 @@ func (dS *DispatcherService) ConfigSv1ReloadConfigFromJSON(args *config.JSONStri Tenant: tnt, }, Opts: args.Opts, - }, utils.MetaConfig, utils.ConfigSv1ReloadConfigFromJSON, args, reply) + }, utils.MetaConfig, utils.ConfigSv1SetConfig, args, reply) +} + +func (dS *DispatcherService) ConfigSv1SetConfigFromJSON(args *config.SetConfigFromJSONArgs, reply *string) (err error) { + tnt := dS.cfg.GeneralCfg().DefaultTenant + if args.Tenant != utils.EmptyString { + tnt = args.Tenant + } + if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { + if err = dS.authorize(utils.ConfigSv1SetConfigFromJSON, tnt, + utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil { + return + } + } + return dS.Dispatch(&utils.CGREventWithOpts{ + CGREvent: &utils.CGREvent{ + Tenant: tnt, + }, + Opts: args.Opts, + }, utils.MetaConfig, utils.ConfigSv1SetConfigFromJSON, args, reply) } func (dS *DispatcherService) ConfigSv1GetConfigAsJSON(args *config.SectionWithOpts, reply *string) (err error) { diff --git a/ers/ers_reload_it_test.go b/ers/ers_reload_it_test.go index 576c0941b..d7e48b440 100644 --- a/ers/ers_reload_it_test.go +++ b/ers/ers_reload_it_test.go @@ -128,7 +128,7 @@ func testReloadVerifyDisabledReaders(t *testing.T) { func testReloadReloadConfigFromPath(t *testing.T) { var reply string - if err := reloadRPC.Call(utils.ConfigSv1ReloadConfigFromPath, &config.ConfigReloadWithOpts{ + if err := reloadRPC.Call(utils.ConfigSv1ReloadConfig, &config.ConfigReloadArgs{ Path: path.Join(*dataDir, "conf", "samples", "ers_reload", "first_reload"), Section: config.ERsJson, }, &reply); err != nil { diff --git a/packages/debian/changelog b/packages/debian/changelog index 2e25d3a78..22049183f 100644 --- a/packages/debian/changelog +++ b/packages/debian/changelog @@ -125,6 +125,9 @@ cgrates (0.11.0~dev) UNRELEASED; urgency=medium * [AnalyzerS] Added AnalyzerSv1.StringQuery API to search over the recorded RPC calls * [CoreS] Moved the server implementation in the new cores package * [RouteS] In case of same weight sort random + * [ConfigS] Renamed ReloadConfigFromPath API to ReloadConfig + * [ConfigS] Renamed ReloadConfig API to SetConfig + * [ConfigS] Renamed ReloadConfigFromJSON API to SetConfigFromJSON -- DanB Wed, 19 Feb 2020 13:25:52 +0200 diff --git a/services/apiers_it_test.go b/services/apiers_it_test.go index d3d1475cd..3a1b7e26d 100644 --- a/services/apiers_it_test.go +++ b/services/apiers_it_test.go @@ -80,7 +80,7 @@ func TestApiersReload(t *testing.T) { t.Errorf("Expected service to be down") } var reply string - if err := cfg.V1ReloadConfigFromPath(&config.ConfigReloadWithOpts{ + if err := cfg.V1ReloadConfig(&config.ConfigReloadArgs{ Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "tutmongo"), Section: config.ApierS, }, &reply); err != nil { diff --git a/services/asteriskagent_it_test.go b/services/asteriskagent_it_test.go index 1c2622c3b..0854d4b37 100644 --- a/services/asteriskagent_it_test.go +++ b/services/asteriskagent_it_test.go @@ -65,7 +65,7 @@ func TestAsteriskAgentReload(t *testing.T) { t.Errorf("Expected service to be down") } var reply string - if err := cfg.V1ReloadConfigFromPath(&config.ConfigReloadWithOpts{ + if err := cfg.V1ReloadConfig(&config.ConfigReloadArgs{ Path: path.Join("/usr", "share", "cgrates", "tutorial_tests", "asterisk_ari", "cgrates", "etc", "cgrates"), Section: config.AsteriskAgentJSN, }, &reply); err != nil { diff --git a/services/attributes_it_test.go b/services/attributes_it_test.go index de3ad62e3..f8c4e25db 100644 --- a/services/attributes_it_test.go +++ b/services/attributes_it_test.go @@ -69,7 +69,7 @@ func TestAttributeSReload(t *testing.T) { } var reply string - if err := cfg.V1ReloadConfigFromPath(&config.ConfigReloadWithOpts{ + if err := cfg.V1ReloadConfig(&config.ConfigReloadArgs{ Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "tutmongo"), Section: config.ATTRIBUTE_JSN, }, &reply); err != nil { diff --git a/services/cdrs_it_test.go b/services/cdrs_it_test.go index 51a3ae200..648874878 100644 --- a/services/cdrs_it_test.go +++ b/services/cdrs_it_test.go @@ -91,7 +91,7 @@ func TestCdrsReload(t *testing.T) { } cfg.RalsCfg().Enabled = true var reply string - if err := cfg.V1ReloadConfigFromPath(&config.ConfigReloadWithOpts{ + if err := cfg.V1ReloadConfig(&config.ConfigReloadArgs{ Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "tutmongo"), Section: config.CDRS_JSN, }, &reply); err != nil { diff --git a/services/chargers_it_test.go b/services/chargers_it_test.go index 74d9574fb..b95a19bdf 100644 --- a/services/chargers_it_test.go +++ b/services/chargers_it_test.go @@ -69,7 +69,7 @@ func TestChargerSReload(t *testing.T) { t.Errorf("Expected service to be down") } var reply string - if err = cfg.V1ReloadConfigFromPath(&config.ConfigReloadWithOpts{ + if err = cfg.V1ReloadConfig(&config.ConfigReloadArgs{ Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "tutmongo"), Section: config.ChargerSCfgJson, }, &reply); err != nil { diff --git a/services/datadb_it_test.go b/services/datadb_it_test.go index 0f335b55f..9f0a4a5f1 100644 --- a/services/datadb_it_test.go +++ b/services/datadb_it_test.go @@ -64,7 +64,7 @@ func TestDataDBReload(t *testing.T) { } var reply string cfg.AttributeSCfg().Enabled = true - if err := cfg.V1ReloadConfigFromPath(&config.ConfigReloadWithOpts{ + if err := cfg.V1ReloadConfig(&config.ConfigReloadArgs{ Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "tutmongo"), Section: config.DATADB_JSN, }, &reply); err != nil { diff --git a/services/diameteragent_it_test.go b/services/diameteragent_it_test.go index 537d9e22d..da7ba8863 100644 --- a/services/diameteragent_it_test.go +++ b/services/diameteragent_it_test.go @@ -65,7 +65,7 @@ func TestDiameterAgentReload(t *testing.T) { t.Errorf("Expected service to be down") } var reply string - if err := cfg.V1ReloadConfigFromPath(&config.ConfigReloadWithOpts{ + if err := cfg.V1ReloadConfig(&config.ConfigReloadArgs{ Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "diamagent_mysql"), Section: config.DA_JSN, }, &reply); err != nil { diff --git a/services/dispatchers_it_test.go b/services/dispatchers_it_test.go index cae47baa8..83b4775a3 100644 --- a/services/dispatchers_it_test.go +++ b/services/dispatchers_it_test.go @@ -71,7 +71,7 @@ func TestDispatcherSReload(t *testing.T) { t.Errorf("Expected service to be down") } var reply string - if err = cfg.V1ReloadConfigFromPath(&config.ConfigReloadWithOpts{ + if err = cfg.V1ReloadConfig(&config.ConfigReloadArgs{ Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "dispatchers", "dispatchers_mysql"), Section: config.DispatcherSJson, diff --git a/services/dnsagent_it_test.go b/services/dnsagent_it_test.go index bd1062a3b..ad6ba7974 100644 --- a/services/dnsagent_it_test.go +++ b/services/dnsagent_it_test.go @@ -65,7 +65,7 @@ func TestDNSAgentReload(t *testing.T) { t.Errorf("Expected service to be down") } var reply string - if err := cfg.V1ReloadConfigFromPath(&config.ConfigReloadWithOpts{ + if err := cfg.V1ReloadConfig(&config.ConfigReloadArgs{ Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "dnsagent_reload"), Section: config.DNSAgentJson, }, &reply); err != nil { diff --git a/services/ees_it_test.go b/services/ees_it_test.go index 28ae0b15e..c1ebcae59 100644 --- a/services/ees_it_test.go +++ b/services/ees_it_test.go @@ -83,7 +83,7 @@ func TestEventExporterSReload(t *testing.T) { fcTmp.ComputePath() cfg.TemplatesCfg()["requiredFields"] = []*config.FCTemplate{fcTmp} var reply string - if err := cfg.V1ReloadConfigFromPath(&config.ConfigReloadWithOpts{ + if err := cfg.V1ReloadConfig(&config.ConfigReloadArgs{ Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "ees"), Section: config.EEsJson, }, &reply); err != nil { diff --git a/services/ers_it_test.go b/services/ers_it_test.go index d7ce735f1..1f31213a6 100644 --- a/services/ers_it_test.go +++ b/services/ers_it_test.go @@ -69,7 +69,7 @@ func TestEventReaderSReload(t *testing.T) { t.Errorf("Expected service to be down") } var reply string - if err := cfg.V1ReloadConfigFromPath(&config.ConfigReloadWithOpts{ + if err := cfg.V1ReloadConfig(&config.ConfigReloadArgs{ Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "ers_reload", "internal"), Section: config.ERsJson, }, &reply); err != nil { diff --git a/services/freeswitchagent_it_test.go b/services/freeswitchagent_it_test.go index bef870ebd..047ed3a55 100644 --- a/services/freeswitchagent_it_test.go +++ b/services/freeswitchagent_it_test.go @@ -65,7 +65,7 @@ func TestFreeSwitchAgentReload(t *testing.T) { t.Errorf("Expected service to be down") } var reply string - if err := cfg.V1ReloadConfigFromPath(&config.ConfigReloadWithOpts{ + if err := cfg.V1ReloadConfig(&config.ConfigReloadArgs{ Path: path.Join("/usr", "share", "cgrates", "tutorial_tests", "fs_evsock", "cgrates", "etc", "cgrates"), Section: config.FreeSWITCHAgentJSN, }, &reply); err != nil { diff --git a/services/kamailioagent_it_test.go b/services/kamailioagent_it_test.go index f22ccc6b2..5420d06dd 100644 --- a/services/kamailioagent_it_test.go +++ b/services/kamailioagent_it_test.go @@ -65,7 +65,7 @@ func TestKamailioAgentReload(t *testing.T) { t.Errorf("Expected service to be down") } var reply string - if err := cfg.V1ReloadConfigFromPath(&config.ConfigReloadWithOpts{ + if err := cfg.V1ReloadConfig(&config.ConfigReloadArgs{ Path: path.Join("/usr", "share", "cgrates", "tutorial_tests", "kamevapi", "cgrates", "etc", "cgrates"), Section: config.KamailioAgentJSN, }, &reply); err != nil { diff --git a/services/radiusagent_it_test.go b/services/radiusagent_it_test.go index 82fead045..d64d30bb3 100644 --- a/services/radiusagent_it_test.go +++ b/services/radiusagent_it_test.go @@ -65,7 +65,7 @@ func TestRadiusAgentReload(t *testing.T) { t.Errorf("Expected service to be down") } var reply string - if err := cfg.V1ReloadConfigFromPath(&config.ConfigReloadWithOpts{ + if err := cfg.V1ReloadConfig(&config.ConfigReloadArgs{ Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "radagent_mysql"), Section: config.RA_JSN, }, &reply); err != nil { diff --git a/services/rals_it_test.go b/services/rals_it_test.go index 0819b44e4..1c475619c 100644 --- a/services/rals_it_test.go +++ b/services/rals_it_test.go @@ -86,7 +86,7 @@ func TestRalsReload(t *testing.T) { t.Errorf("Expected service to be down") } var reply string - if err := cfg.V1ReloadConfigFromPath(&config.ConfigReloadWithOpts{ + if err := cfg.V1ReloadConfig(&config.ConfigReloadArgs{ Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "tutmongo"), Section: config.RALS_JSN, }, &reply); err != nil { diff --git a/services/rates_it_test.go b/services/rates_it_test.go index 115068c8e..e63076129 100644 --- a/services/rates_it_test.go +++ b/services/rates_it_test.go @@ -61,7 +61,7 @@ func TestRateSReload(t *testing.T) { t.Errorf("Expected service to be down") } var reply string - if err := cfg.V1ReloadConfigFromPath(&config.ConfigReloadWithOpts{ + if err := cfg.V1ReloadConfig(&config.ConfigReloadArgs{ Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "rates"), Section: config.RateSJson, }, &reply); err != nil { diff --git a/services/resources_it_test.go b/services/resources_it_test.go index 53471d780..65829cd8c 100644 --- a/services/resources_it_test.go +++ b/services/resources_it_test.go @@ -71,7 +71,7 @@ func TestResourceSReload(t *testing.T) { t.Errorf("Expected service to be down") } var reply string - if err = cfg.V1ReloadConfigFromPath(&config.ConfigReloadWithOpts{ + if err = cfg.V1ReloadConfig(&config.ConfigReloadArgs{ Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "tutmongo"), Section: config.RESOURCES_JSON, }, &reply); err != nil { diff --git a/services/routes_it_test.go b/services/routes_it_test.go index f6f52eb55..2dc992540 100644 --- a/services/routes_it_test.go +++ b/services/routes_it_test.go @@ -69,7 +69,7 @@ func TestSupplierSReload(t *testing.T) { t.Errorf("Expected service to be down") } var reply string - if err := cfg.V1ReloadConfigFromPath(&config.ConfigReloadWithOpts{ + if err := cfg.V1ReloadConfig(&config.ConfigReloadArgs{ Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "tutmongonew"), Section: config.RouteSJson, }, &reply); err != nil { diff --git a/services/schedulers_it_test.go b/services/schedulers_it_test.go index d7ef7f77b..75a232e8c 100644 --- a/services/schedulers_it_test.go +++ b/services/schedulers_it_test.go @@ -62,7 +62,7 @@ func TestSchedulerSReload(t *testing.T) { t.Errorf("Expected service to be down") } var reply string - if err := cfg.V1ReloadConfigFromPath(&config.ConfigReloadWithOpts{ + if err := cfg.V1ReloadConfig(&config.ConfigReloadArgs{ Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "tutmongonew"), Section: config.SCHEDULER_JSN, }, &reply); err != nil { diff --git a/services/sessions_it_test.go b/services/sessions_it_test.go index d63dbe8dd..9e206d086 100644 --- a/services/sessions_it_test.go +++ b/services/sessions_it_test.go @@ -97,7 +97,7 @@ func TestSessionSReload(t *testing.T) { t.Errorf("Expected service to be down") } var reply string - if err := cfg.V1ReloadConfigFromPath(&config.ConfigReloadWithOpts{ + if err := cfg.V1ReloadConfig(&config.ConfigReloadArgs{ Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "tutmongonew"), Section: config.SessionSJson, }, &reply); err != nil { diff --git a/services/sipagent_it_test.go b/services/sipagent_it_test.go index 1341d80d8..d3d547480 100644 --- a/services/sipagent_it_test.go +++ b/services/sipagent_it_test.go @@ -65,7 +65,7 @@ func TestSIPAgentReload(t *testing.T) { t.Errorf("Expected service to be down") } var reply string - if err := cfg.V1ReloadConfigFromPath(&config.ConfigReloadWithOpts{ + if err := cfg.V1ReloadConfig(&config.ConfigReloadArgs{ Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "sipagent_mysql"), Section: config.SIPAgentJson, }, &reply); err != nil { diff --git a/services/stats_it_test.go b/services/stats_it_test.go index 22417cd35..aff0b4128 100644 --- a/services/stats_it_test.go +++ b/services/stats_it_test.go @@ -71,7 +71,7 @@ func TestStatSReload(t *testing.T) { t.Errorf("Expected service to be down") } var reply string - if err = cfg.V1ReloadConfigFromPath(&config.ConfigReloadWithOpts{ + if err = cfg.V1ReloadConfig(&config.ConfigReloadArgs{ Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "tutmongo"), Section: config.STATS_JSON, }, &reply); err != nil { diff --git a/services/thresholds_it_test.go b/services/thresholds_it_test.go index 14842433b..bfb2b7d96 100644 --- a/services/thresholds_it_test.go +++ b/services/thresholds_it_test.go @@ -65,7 +65,7 @@ func TestThresholdSReload(t *testing.T) { t.Errorf("Expected service to be down") } var reply string - if err = cfg.V1ReloadConfigFromPath(&config.ConfigReloadWithOpts{ + if err = cfg.V1ReloadConfig(&config.ConfigReloadArgs{ Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "tutmongo"), Section: config.THRESHOLDS_JSON, }, &reply); err != nil { diff --git a/utils/consts.go b/utils/consts.go index d64371fb6..c690842b0 100755 --- a/utils/consts.go +++ b/utils/consts.go @@ -1426,12 +1426,12 @@ const ( // ConfigSv1 APIs const ( - ConfigSv1 = "ConfigSv1" - ConfigSv1GetConfig = "ConfigSv1.GetConfig" - ConfigSv1ReloadConfigFromPath = "ConfigSv1.ReloadConfigFromPath" - ConfigSv1ReloadConfig = "ConfigSv1.ReloadConfig" - ConfigSv1ReloadConfigFromJSON = "ConfigSv1.ReloadConfigFromJSON" - ConfigSv1GetConfigAsJSON = "ConfigSv1.GetConfigAsJSON" + ConfigSv1 = "ConfigSv1" + ConfigSv1ReloadConfig = "ConfigSv1.ReloadConfig" + ConfigSv1GetConfig = "ConfigSv1.GetConfig" + ConfigSv1SetConfig = "ConfigSv1.SetConfig" + ConfigSv1GetConfigAsJSON = "ConfigSv1.GetConfigAsJSON" + ConfigSv1SetConfigFromJSON = "ConfigSv1.SetConfigFromJSON" ) const (