diff --git a/services/radiusagent_it_test.go b/services/radiusagent_it_test.go index 319d06e5a..51cd4fbb1 100644 --- a/services/radiusagent_it_test.go +++ b/services/radiusagent_it_test.go @@ -95,3 +95,75 @@ func TestRadiusAgentReload(t *testing.T) { shdChan.CloseOnce() time.Sleep(10 * time.Millisecond) } + +func TestRadiusAgentReload2(t *testing.T) { + cfg := config.NewDefaultCGRConfig() + + cfg.SessionSCfg().Enabled = true + utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) + utils.Logger.SetLogLevel(7) + filterSChan := make(chan *engine.FilterS, 1) + filterSChan <- nil + shdChan := utils.NewSyncedChan() + shdWg := new(sync.WaitGroup) + chS := engine.NewCacheS(cfg, nil, nil) + + cacheSChan := make(chan rpcclient.ClientConnector, 1) + cacheSChan <- chS + + server := cores.NewServer(nil) + srvMngr := servmanager.NewServiceManager(cfg, shdChan, shdWg) + srvDep := map[string]*sync.WaitGroup{utils.DataDB: new(sync.WaitGroup)} + db := NewDataDBService(cfg, nil, srvDep) + anz := NewAnalyzerService(cfg, server, filterSChan, shdChan, make(chan rpcclient.ClientConnector, 1), srvDep) + sS := NewSessionService(cfg, db, server, make(chan rpcclient.ClientConnector, 1), + shdChan, nil, nil, anz, srvDep) + srv := NewRadiusAgent(cfg, filterSChan, shdChan, nil, srvDep) + engine.NewConnManager(cfg, nil) + srvMngr.AddServices(srv, sS, + NewLoaderService(cfg, db, filterSChan, server, make(chan rpcclient.ClientConnector, 1), nil, anz, srvDep), db) + if err := srvMngr.StartServices(); err != nil { + t.Fatal(err) + } + if srv.IsRunning() { + t.Errorf("Expected service to be down") + } + var reply string + if err := cfg.V1ReloadConfig(&config.ReloadArgs{ + Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "radagent_mysql"), + Section: config.RA_JSN, + }, &reply); err != nil { + t.Fatal(err) + } else if reply != utils.OK { + t.Errorf("Expecting OK ,received %s", reply) + } + time.Sleep(10 * time.Millisecond) //need to switch to gorutine + if !srv.IsRunning() { + t.Errorf("Expected service to be running") + } + err := srv.Start() + if err == nil || err != utils.ErrServiceAlreadyRunning { + t.Errorf("\nExpecting <%+v>,\n Received <%+v>", utils.ErrServiceAlreadyRunning, err) + } + err = srv.Reload() + if err != nil { + t.Errorf("\nExpecting ,\n Received <%+v>", err) + } + castSrv, canCastSrv := srv.(*RadiusAgent) + if !canCastSrv { + t.Fatalf("cannot cast") + } + castSrv.lnet = "test_string" + err = srv.Reload() + if err != nil { + t.Errorf("\nExpecting ,\n Received <%+v>", err) + } + cfg.RadiusAgentCfg().Enabled = false + cfg.GetReloadChan(config.RA_JSN) <- struct{}{} + time.Sleep(10 * time.Millisecond) + if srv.IsRunning() { + t.Errorf("Expected service to be down") + } + shdChan.CloseOnce() + time.Sleep(10 * time.Millisecond) +} diff --git a/services/sipagent_it_test.go b/services/sipagent_it_test.go index 4b6042fc2..b5398ff71 100644 --- a/services/sipagent_it_test.go +++ b/services/sipagent_it_test.go @@ -103,10 +103,8 @@ func TestSIPAgentReload(t *testing.T) { time.Sleep(10 * time.Millisecond) } -/* func TestSIPAgentReload2(t *testing.T) { cfg := config.NewDefaultCGRConfig() - cfg.SessionSCfg().Enabled = true utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) @@ -133,12 +131,10 @@ func TestSIPAgentReload2(t *testing.T) { if err := srvMngr.StartServices(); err != nil { t.Fatal(err) } - if srv.IsRunning() { - t.Errorf("Expected service to be down") - } + var reply string if err := cfg.V1ReloadConfig(&config.ReloadArgs{ - Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "sipagent_mysql"), + Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "sipagent_mongo"), Section: config.SIPAgentJson, }, &reply); err != nil { t.Fatal(err) @@ -146,13 +142,7 @@ func TestSIPAgentReload2(t *testing.T) { t.Errorf("Expecting OK ,received %s", reply) } time.Sleep(10 * time.Millisecond) //need to switch to gorutine - if !srv.IsRunning() { - t.Errorf("Expected service to be running") - } - srvStart := srv.Start() - if srvStart != utils.ErrServiceAlreadyRunning { - t.Errorf("\nExpecting <%+v>,\n Received <%+v>", utils.ErrServiceAlreadyRunning, srvStart) - } + err := srv.Reload() if err != nil { t.Errorf("\nExpecting ,\n Received <%+v>", err) @@ -167,4 +157,3 @@ func TestSIPAgentReload2(t *testing.T) { shdChan.CloseOnce() time.Sleep(10 * time.Millisecond) } -*/