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

Renamed ApierV1 to APIerSv1/ ApierV2 to APIerSv2

Browse Source
This commit is contained in:
adragusin
2020-01-30 14:59:06 +02:00
committed by Dan Christian Bogos
parent 54217c8428
commit 3eaf3232a1
263 changed files with 2998 additions and 2995 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -409,15 +409,15 @@ func main() {
internalSchedulerSChan := make(chan rpcclient.ClientConnector, 1)
internalRALsChan := make(chan rpcclient.ClientConnector, 1)
internalResponderChan := make(chan rpcclient.ClientConnector, 1)
internalAPIerV1Chan := make(chan rpcclient.ClientConnector, 1)
internalAPIerV2Chan := make(chan rpcclient.ClientConnector, 1)
internalAPIerSv1Chan := make(chan rpcclient.ClientConnector, 1)
internalAPIerSv2Chan := make(chan rpcclient.ClientConnector, 1)
internalLoaderSChan := make(chan rpcclient.ClientConnector, 1)
// initialize the connManager before creating the DMService
// because we need to pass the connection to it
connManager := engine.NewConnManager(cfg, map[string]chan rpcclient.ClientConnector{
utils.ConcatenatedKey(utils.MetaInternal, utils.MetaAnalyzer): internalAnalyzerSChan,
utils.ConcatenatedKey(utils.MetaInternal, utils.MetaApier): internalAPIerV1Chan,
utils.ConcatenatedKey(utils.MetaInternal, utils.MetaApier): internalAPIerSv1Chan,
utils.ConcatenatedKey(utils.MetaInternal, utils.MetaAttributes): internalAttributeSChan,
utils.ConcatenatedKey(utils.MetaInternal, utils.MetaCaches): internalCacheSChan,
utils.ConcatenatedKey(utils.MetaInternal, utils.MetaCDRs): internalCDRServerChan,
@@ -490,10 +490,10 @@ func main() {
internalRALsChan, internalResponderChan,
exitChan, connManager)
apierV1 := services.NewApierV1Service(cfg, dmService, storDBService, filterSChan, server, schS, rals.GetResponderService(),
internalAPIerV1Chan, connManager)
APIerSv1 := services.NewAPIerSv1Service(cfg, dmService, storDBService, filterSChan, server, schS, rals.GetResponderService(),
internalAPIerSv1Chan, connManager)
apierV2 := services.NewApierV2Service(apierV1, cfg, server, internalAPIerV2Chan)
APIerSv2 := services.NewAPIerSv2Service(APIerSv1, cfg, server, internalAPIerSv2Chan)
cdrS := services.NewCDRServer(cfg, dmService, storDBService, filterSChan, server, internalCDRServerChan,
connManager)
@@ -505,7 +505,7 @@ func main() {
anz := services.NewAnalyzerService(cfg, server, exitChan, internalAnalyzerSChan)
srvManager.AddServices(attrS, chrS, tS, stS, reS, supS, schS, rals,
rals.GetResponder(), apierV1, apierV2, cdrS, smg,
rals.GetResponder(), APIerSv1, APIerSv2, cdrS, smg,
services.NewEventReaderService(cfg, filterSChan, exitChan, connManager),
services.NewDNSAgent(cfg, filterSChan, exitChan, connManager),
services.NewFreeswitchAgent(cfg, exitChan, connManager),
@@ -527,8 +527,8 @@ func main() {
engine.IntRPC = engine.NewRPCClientSet()
if cfg.DispatcherSCfg().Enabled {
engine.IntRPC.AddInternalRPCClient(utils.AnalyzerSv1, anz.GetIntenternalChan())
engine.IntRPC.AddInternalRPCClient(utils.ApierV1, apierV1.GetIntenternalChan())
engine.IntRPC.AddInternalRPCClient(utils.ApierV2, apierV2.GetIntenternalChan())
engine.IntRPC.AddInternalRPCClient(utils.APIerSv1, APIerSv1.GetIntenternalChan())
engine.IntRPC.AddInternalRPCClient(utils.APIerSv2, APIerSv2.GetIntenternalChan())
engine.IntRPC.AddInternalRPCClient(utils.AttributeSv1, attrS.GetIntenternalChan())
engine.IntRPC.AddInternalRPCClient(utils.CacheSv1, internalCacheSChan)
engine.IntRPC.AddInternalRPCClient(utils.CDRsV1, cdrS.GetIntenternalChan())

4
cmd/cgr-tester/parallel/parallel.go
View File

@@ -35,7 +35,7 @@ func main() {
for i := 1; i < 1002; i++ {
go func(index int) {
wg.Add(1)
resp, err := http.Post("http://localhost:2080/jsonrpc", "application/json", bytes.NewBuffer([]byte(fmt.Sprintf(`{"method": "ApierV1.SetAccount","params": [{"Tenant":"reglo","Account":"100%d","ActionPlanId":"PACKAGE_NEW_FOR795", "ReloadScheduler":false}], "id":%d}`, index, index))))
resp, err := http.Post("http://localhost:2080/jsonrpc", "application/json", bytes.NewBuffer([]byte(fmt.Sprintf(`{"method": "APIerSv1.SetAccount","params": [{"Tenant":"reglo","Account":"100%d","ActionPlanId":"PACKAGE_NEW_FOR795", "ReloadScheduler":false}], "id":%d}`, index, index))))
if err != nil {
log.Print("Post error: ", err)
}
@@ -49,7 +49,7 @@ func main() {
}
wg.Wait()
for index := 1; index < 1002; index++ {
resp, err := http.Post("http://localhost:2080/jsonrpc", "application/json", bytes.NewBuffer([]byte(fmt.Sprintf(`{"method": "%s","params": [{"Tenant":"reglo","Account":"100%d"}], "id":%d}`, utils.ApierV1GetAccountActionPlan, index, index))))
resp, err := http.Post("http://localhost:2080/jsonrpc", "application/json", bytes.NewBuffer([]byte(fmt.Sprintf(`{"method": "%s","params": [{"Tenant":"reglo","Account":"100%d"}], "id":%d}`, utils.APIerSv1GetAccountActionPlan, index, index))))
if err != nil {
log.Print("Post error: ", err)
}