uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-12 02:26:26 +05:00
Code Issues Packages Projects Releases Wiki Activity

Updated services integration tests

Browse Source
This commit is contained in:
Trial97
2019-11-08 16:07:59 +02:00
committed by Dan Christian Bogos
parent b110537b54
commit c22ce5f7bb
5 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/cgr-engine/cgr-engine.go
View File

@@ -539,7 +539,7 @@ func main() {
services.NewRadiusAgent(cfg, filterSChan, smg.GetIntenternalChan(), dspS.GetIntenternalChan(), exitChan), // partial reload
services.NewDiameterAgent(cfg, filterSChan, smg.GetIntenternalChan(), dspS.GetIntenternalChan(), exitChan), // partial reload
services.NewHTTPAgent(cfg, filterSChan, smg.GetIntenternalChan(), dspS.GetIntenternalChan(), server), // no reload
ldrs, anz, dspS,
ldrs, anz, dspS, dmService, storDBService,
)
srvManager.StartServices()

8
services/cdrs_it_test.go
View File

@@ -66,17 +66,19 @@ func TestCdrsReload(t *testing.T) {
server := utils.NewServer()
srvMngr := servmanager.NewServiceManager(cfg, engineShutdown)
db := NewDataDBService(cfg)
cfg.StorDbCfg().Type = utils.INTERNAL
stordb := NewStorDBService(cfg)
chrS := NewChargerService(cfg, db, chS, filterSChan, server, nil, nil)
schS := NewSchedulerService(cfg, db, chS, filterSChan, server, make(chan rpcclient.RpcClientConnection, 1), nil)
tS := NewThresholdService(cfg, db, chS, filterSChan, server)
ralS := NewRalService(cfg, db, nil, nil, chS, filterSChan, server,
ralS := NewRalService(cfg, db, stordb, chS, filterSChan, server,
tS.GetIntenternalChan(), internalChan, cacheSChan, internalChan, internalChan,
internalChan, schS, engineShutdown)
cdrS := NewCDRServer(cfg, db, nil, filterSChan, server,
cdrS := NewCDRServer(cfg, db, stordb, filterSChan, server,
make(chan rpcclient.RpcClientConnection, 1),
chrS.GetIntenternalChan(), ralS.GetResponder().GetIntenternalChan(),
nil, nil, nil, nil)
srvMngr.AddServices(cdrS, ralS, schS, chrS, NewLoaderService(cfg, db, filterSChan, server, cacheSChan, nil, engineShutdown), db)
srvMngr.AddServices(cdrS, ralS, schS, chrS, NewLoaderService(cfg, db, filterSChan, server, cacheSChan, nil, engineShutdown), db, stordb)
if err = srvMngr.StartServices(); err != nil {
t.Error(err)
}

6
services/rals_it_test.go
View File

@@ -65,12 +65,14 @@ func TestRalsReload(t *testing.T) {
server := utils.NewServer()
srvMngr := servmanager.NewServiceManager(cfg, engineShutdown)
db := NewDataDBService(cfg)
cfg.StorDbCfg().Type = utils.INTERNAL
stordb := NewStorDBService(cfg)
schS := NewSchedulerService(cfg, db, chS, filterSChan, server, make(chan rpcclient.RpcClientConnection, 1), nil)
tS := NewThresholdService(cfg, db, chS, filterSChan, server)
ralS := NewRalService(cfg, db, nil, nil, chS, filterSChan, server,
ralS := NewRalService(cfg, db, stordb, chS, filterSChan, server,
tS.GetIntenternalChan(), internalChan, cacheSChan, internalChan, internalChan,
internalChan, schS, engineShutdown)
srvMngr.AddServices(ralS, schS, tS, NewLoaderService(cfg, db, filterSChan, server, cacheSChan, nil, engineShutdown), db)
srvMngr.AddServices(ralS, schS, tS, NewLoaderService(cfg, db, filterSChan, server, cacheSChan, nil, engineShutdown), db, stordb)
if err = srvMngr.StartServices(); err != nil {
t.Error(err)
}

8
services/sessions_it_test.go
View File

@@ -68,18 +68,20 @@ func TestSessionSReload(t *testing.T) {
server := utils.NewServer()
srvMngr := servmanager.NewServiceManager(cfg, engineShutdown)
db := NewDataDBService(cfg)
cfg.StorDbCfg().Type = utils.INTERNAL
stordb := NewStorDBService(cfg)
chrS := NewChargerService(cfg, db, chS, filterSChan, server, nil, nil)
schS := NewSchedulerService(cfg, db, chS, filterSChan, server, make(chan rpcclient.RpcClientConnection, 1), nil)
ralS := NewRalService(cfg, db, nil, nil, chS, filterSChan, server,
ralS := NewRalService(cfg, db, stordb, chS, filterSChan, server,
/*tS*/ internalChan, internalChan, cacheSChan, internalChan, internalChan,
internalChan, schS, engineShutdown)
cdrS := NewCDRServer(cfg, db, nil, filterSChan, server,
cdrS := NewCDRServer(cfg, db, stordb, filterSChan, server,
make(chan rpcclient.RpcClientConnection, 1),
chrS.GetIntenternalChan(), ralS.GetResponder().GetIntenternalChan(),
nil, nil, nil, nil)
srv := NewSessionService(cfg, db, server, chrS.GetIntenternalChan(),
ralS.GetResponder().GetIntenternalChan(), nil, nil, nil, nil, nil, cdrS.GetIntenternalChan(), nil, engineShutdown)
srvMngr.AddServices(srv, chrS, schS, ralS, cdrS, NewLoaderService(cfg, db, filterSChan, server, cacheSChan, nil, engineShutdown), db)
srvMngr.AddServices(srv, chrS, schS, ralS, cdrS, NewLoaderService(cfg, db, filterSChan, server, cacheSChan, nil, engineShutdown), db, stordb)
if err = srvMngr.StartServices(); err != nil {
t.Error(err)
}

6
servmanager/servmanager.go
View File

@@ -315,20 +315,20 @@ func (srvMngr *ServiceManager) reloadService(srviceName string) (err error) {
if srv.ShouldRun() {
if srv.IsRunning() {
if err = srv.Reload(); err != nil {
utils.Logger.Err(fmt.Sprintf("<%s> Failed to reload <%s>", utils.ServiceManager, srv.ServiceName()))
utils.Logger.Err(fmt.Sprintf("<%s> Failed to reload <%s> because: %s", utils.ServiceManager, srv.ServiceName(), err))
srvMngr.engineShutdown <- true
return // stop if we encounter an error
}
} else {
if err = srv.Start(); err != nil {
utils.Logger.Err(fmt.Sprintf("<%s> Failed to start <%s>", utils.ServiceManager, srv.ServiceName()))
utils.Logger.Err(fmt.Sprintf("<%s> Failed to start <%s> because: %s", utils.ServiceManager, srv.ServiceName(), err))
srvMngr.engineShutdown <- true
return // stop if we encounter an error
}
}
} else if srv.IsRunning() {
if err = srv.Shutdown(); err != nil {
utils.Logger.Err(fmt.Sprintf("<%s> Failed to stop service <%s>", utils.ServiceManager, srv.ServiceName()))
utils.Logger.Err(fmt.Sprintf("<%s> Failed to stop service <%s> because: %s", utils.ServiceManager, srv.ServiceName(), err))
srvMngr.engineShutdown <- true
return // stop if we encounter an error
}