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

Fix vet check errors and conflicts

Browse Source
This commit is contained in:
ionutboangiu
2024-10-14 19:03:33 +03:00
committed by Dan Christian Bogos
parent 429388367a
commit b05ed15f25
19 changed files with 81 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ees/amqp_it_test.go
View File

@@ -97,6 +97,12 @@ func testAMQPStartEngine(t *testing.T) {
}
}
func testStopCgrEngine(t *testing.T) {
if err := engine.KillEngine(100); err != nil {
t.Error(err)
}
}
func testAMQPRPCConn(t *testing.T) {
var err error
amqpRPC, err = newRPCClient(amqpCfg.ListenCfg())

6
ees/lib_test.go
View File

@@ -48,12 +48,6 @@ func testCleanDirectory(t *testing.T) {
}
}
func testStopCgrEngine(t *testing.T) {
if err := engine.KillEngine(100); err != nil {
t.Error(err)
}
}
func TestGetOneData(t *testing.T) {
type testData struct {
Field1 string `json:"field1"`

43
engine/libengine.go
View File

@@ -296,3 +296,46 @@ var pingM = &birpc.MethodType{
func RegisterPingMethod(methodMap map[string]*birpc.MethodType) {
methodMap["Ping"] = pingM
}
func LoadAllDataDBToCache(dm *DataManager) (err error) {
if dm == nil {
return utils.ErrNoDatabaseConn
}
for key, ids := range map[string][]string{
utils.DestinationPrefix: {utils.MetaAny},
utils.ReverseDestinationPrefix: {utils.MetaAny},
utils.RatingPlanPrefix: {utils.MetaAny},
utils.RatingProfilePrefix: {utils.MetaAny},
utils.ActionPrefix: {utils.MetaAny},
utils.ActionPlanPrefix: {utils.MetaAny},
utils.AccountActionPlansPrefix: {utils.MetaAny},
utils.ActionTriggerPrefix: {utils.MetaAny},
utils.SharedGroupPrefix: {utils.MetaAny},
utils.ResourceProfilesPrefix: {utils.MetaAny},
utils.ResourcesPrefix: {utils.MetaAny},
utils.StatQueuePrefix: {utils.MetaAny},
utils.StatQueueProfilePrefix: {utils.MetaAny},
utils.ThresholdPrefix: {utils.MetaAny},
utils.ThresholdProfilePrefix: {utils.MetaAny},
utils.FilterPrefix: {utils.MetaAny},
utils.RouteProfilePrefix: {utils.MetaAny},
utils.AttributeProfilePrefix: {utils.MetaAny},
utils.ChargerProfilePrefix: {utils.MetaAny},
utils.DispatcherProfilePrefix: {utils.MetaAny},
utils.DispatcherHostPrefix: {utils.MetaAny},
utils.TimingsPrefix: {utils.MetaAny},
utils.AttributeFilterIndexes: {utils.MetaAny},
utils.ResourceFilterIndexes: {utils.MetaAny},
utils.StatFilterIndexes: {utils.MetaAny},
utils.ThresholdFilterIndexes: {utils.MetaAny},
utils.RouteFilterIndexes: {utils.MetaAny},
utils.ChargerFilterIndexes: {utils.MetaAny},
utils.DispatcherFilterIndexes: {utils.MetaAny},
utils.FilterIndexPrfx: {utils.MetaAny},
} {
if err = dm.CacheDataFromDB(key, ids, false); err != nil {
return
}
}
return
}

43
engine/libtest.go
View File

@@ -307,49 +307,6 @@ func GetDefaultEmptyCacheStats() map[string]*ltcache.CacheStats {
}
}
func LoadAllDataDBToCache(dm *DataManager) (err error) {
if dm == nil {
return utils.ErrNoDatabaseConn
}
for key, ids := range map[string][]string{
utils.DestinationPrefix: {utils.MetaAny},
utils.ReverseDestinationPrefix: {utils.MetaAny},
utils.RatingPlanPrefix: {utils.MetaAny},
utils.RatingProfilePrefix: {utils.MetaAny},
utils.ActionPrefix: {utils.MetaAny},
utils.ActionPlanPrefix: {utils.MetaAny},
utils.AccountActionPlansPrefix: {utils.MetaAny},
utils.ActionTriggerPrefix: {utils.MetaAny},
utils.SharedGroupPrefix: {utils.MetaAny},
utils.ResourceProfilesPrefix: {utils.MetaAny},
utils.ResourcesPrefix: {utils.MetaAny},
utils.StatQueuePrefix: {utils.MetaAny},
utils.StatQueueProfilePrefix: {utils.MetaAny},
utils.ThresholdPrefix: {utils.MetaAny},
utils.ThresholdProfilePrefix: {utils.MetaAny},
utils.FilterPrefix: {utils.MetaAny},
utils.RouteProfilePrefix: {utils.MetaAny},
utils.AttributeProfilePrefix: {utils.MetaAny},
utils.ChargerProfilePrefix: {utils.MetaAny},
utils.DispatcherProfilePrefix: {utils.MetaAny},
utils.DispatcherHostPrefix: {utils.MetaAny},
utils.TimingsPrefix: {utils.MetaAny},
utils.AttributeFilterIndexes: {utils.MetaAny},
utils.ResourceFilterIndexes: {utils.MetaAny},
utils.StatFilterIndexes: {utils.MetaAny},
utils.ThresholdFilterIndexes: {utils.MetaAny},
utils.RouteFilterIndexes: {utils.MetaAny},
utils.ChargerFilterIndexes: {utils.MetaAny},
utils.DispatcherFilterIndexes: {utils.MetaAny},
utils.FilterIndexPrfx: {utils.MetaAny},
} {
if err = dm.CacheDataFromDB(key, ids, false); err != nil {
return
}
}
return
}
// NewRPCClient creates and returns a new RPC client for cgr-engine.
func NewRPCClient(t *testing.T, cfg *config.ListenCfg) *birpc.Client {
t.Helper()

2
engine/libtest_test.go
View File

@@ -1,3 +1,5 @@
//go:build integration || flaky || offline || kafka || call || race || performance
/*
Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
Copyright (C) ITsysCOM GmbH

6
general_tests/all_cfg_sect_rld_it_test.go
View File

@@ -149,11 +149,7 @@ func testSectStartEngine(t *testing.T) {
}
func testSectRPCConn(t *testing.T) {
var err error
testSectRPC, err = engine.NewRPCClient(testSectCfg.ListenCfg())
if err != nil {
t.Fatal(err)
}
testSectRPC = engine.NewRPCClient(t, testSectCfg.ListenCfg())
}
func testSectConfigSReloadCores(t *testing.T) {

6
general_tests/attributeswithdataconverters_it_test.go
View File

@@ -102,11 +102,7 @@ func testAttrWDcStartEngine(t *testing.T) {
}
func testAttrWDcRPCConn(t *testing.T) {
var err error
attrWDcRpc, err = engine.NewRPCClient(attrWDcCfg.ListenCfg())
if err != nil {
t.Error(err)
}
attrWDcRpc = engine.NewRPCClient(t, attrWDcCfg.ListenCfg())
}
func testAttrWDcLoadFromFolder(t *testing.T) {

11
general_tests/broadcast_client_it_test.go
View File

@@ -111,15 +111,8 @@ func testbrodcastItStartEngine(t *testing.T) {
}
func testbrodcastItRPCConn(t *testing.T) {
var err error
brodcastRPC, err = engine.NewRPCClient(brodcastCfg.ListenCfg())
if err != nil {
t.Fatal(err)
}
brodcastInternalRPC, err = engine.NewRPCClient(brodcastInternalCfg.ListenCfg())
if err != nil {
t.Fatal(err)
}
brodcastRPC = engine.NewRPCClient(t, brodcastCfg.ListenCfg())
brodcastInternalRPC = engine.NewRPCClient(t, brodcastInternalCfg.ListenCfg())
}
func testbrodcastItLoadFromFolder(t *testing.T) {

9
general_tests/cacherpl_filter_update_it_test.go
View File

@@ -138,13 +138,8 @@ func testFilterUpdateStartEngine(t *testing.T) {
// Connect rpc client to rater
func testFilterUpdateRpcConn(t *testing.T) {
var err error
if fltrUpdateRPC1, err = engine.NewRPCClient(fltrUpdateCfg1.ListenCfg()); err != nil {
t.Fatal(err)
}
if fltrUpdateRPC2, err = engine.NewRPCClient(fltrUpdateCfg2.ListenCfg()); err != nil {
t.Fatal(err)
}
fltrUpdateRPC1 = engine.NewRPCClient(t, fltrUpdateCfg1.ListenCfg())
fltrUpdateRPC2 = engine.NewRPCClient(t, fltrUpdateCfg2.ListenCfg())
}
func testFilterUpdateStopEngine(t *testing.T) {

16
general_tests/dsp_routes_it_test.go
View File

@@ -342,11 +342,11 @@ func TestDispatchersLoadBalanceWithAuth(t *testing.T) {
}`
)
dsp := TestEngine{ // dispatcher engine
dsp := engine.TestEngine{ // dispatcher engine
ConfigJSON: dspCfg,
}
clientDsp, _ := dsp.Run(t)
hostA := TestEngine{ // first worker engine (additionally loads the tps), ports 210xx
hostA := engine.TestEngine{ // first worker engine (additionally loads the tps), ports 210xx
ConfigJSON: fmt.Sprintf(hostCfg, "A", 210),
PreserveDataDB: true,
PreserveStorDB: true,
@@ -365,13 +365,13 @@ cgrates.org,attr_auth,*auth,*string:~*req.ApiKey:12345,,,*req.APIMethods,*consta
},
}
_, _ = hostA.Run(t)
hostB := TestEngine{ // second worker engine, ports 220xx
hostB := engine.TestEngine{ // second worker engine, ports 220xx
ConfigJSON: fmt.Sprintf(hostCfg, "B", 220),
PreserveDataDB: true,
PreserveStorDB: true,
}
_, _ = hostB.Run(t)
hostC := TestEngine{ // third worker engine, ports 230xx
hostC := engine.TestEngine{ // third worker engine, ports 230xx
PreserveDataDB: true,
PreserveStorDB: true,
ConfigJSON: fmt.Sprintf(hostCfg, "C", 230),
@@ -474,12 +474,12 @@ func TestDispatchersRoutingOnAcc(t *testing.T) {
)
buf := &bytes.Buffer{}
dsp := TestEngine{ // dispatcher engine
dsp := engine.TestEngine{ // dispatcher engine
LogBuffer: buf,
ConfigJSON: dspCfg,
}
clientDsp, _ := dsp.Run(t)
hostA := TestEngine{ // first worker engine (additionally loads the tps), ports 210xx
hostA := engine.TestEngine{ // first worker engine (additionally loads the tps), ports 210xx
ConfigJSON: fmt.Sprintf(hostCfg, "A", 210),
PreserveDataDB: true,
PreserveStorDB: true,
@@ -505,13 +505,13 @@ act_topup,*topup_reset,,,main_balance,*sms,,,,,*unlimited,,10,,,,`,
},
}
_, _ = hostA.Run(t)
hostB := TestEngine{ // second worker engine, ports 220xx
hostB := engine.TestEngine{ // second worker engine, ports 220xx
ConfigJSON: fmt.Sprintf(hostCfg, "B", 220),
PreserveDataDB: true,
PreserveStorDB: true,
}
_, _ = hostB.Run(t)
hostC := TestEngine{ // third worker engine, ports 230xx
hostC := engine.TestEngine{ // third worker engine, ports 230xx
PreserveDataDB: true,
PreserveStorDB: true,
ConfigJSON: fmt.Sprintf(hostCfg, "C", 230),

6
general_tests/fraud_detection_it_test.go
View File

@@ -122,11 +122,7 @@ func testFraudStartEngine(t *testing.T) {
}
func testFraudRPCConn(t *testing.T) {
var err error
fraudRPC, err = engine.NewRPCClient(fraudCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
if err != nil {
t.Fatal("Could not connect to rater: ", err.Error())
}
fraudRPC = engine.NewRPCClient(t, fraudCfg.ListenCfg())
}
func testFraudLoadTarriffPlans(t *testing.T) {

12
general_tests/reproc_cdrs_for_stats_it_test.go
View File

@@ -118,11 +118,7 @@ func testRpcdrsStartEngine(t *testing.T) {
}
func testRpcdrsRpcConn(t *testing.T) {
var err error
rpcdrsRpc, err = engine.NewRPCClient(rpcdrsCfg.ListenCfg())
if err != nil {
t.Fatal("Could not connect to rater: ", err.Error())
}
rpcdrsRpc = engine.NewRPCClient(t, rpcdrsCfg.ListenCfg())
}
func testRpcdrsLoadTP(t *testing.T) {
@@ -370,11 +366,7 @@ cgrates.org,STAT_AGG,,2014-07-29T15:00:00Z,0,-1,0,*tcd;*tcc;*sum#1,,false,false,
t.Fatal(err)
}
rpcdrsRpc, err = engine.NewRPCClient(rpcdrsCfg.ListenCfg())
if err != nil {
t.Fatalf("could not connect to cgr-engine: %v", err)
}
rpcdrsRpc = engine.NewRPCClient(t, rpcdrsCfg.ListenCfg())
engine.LoadCSVs(t, rpcdrsRpc, "", t.TempDir(), tpFiles)
}

6
general_tests/resourcesv1_it_test.go
View File

@@ -98,11 +98,7 @@ func testV1RsStartEngine(t *testing.T) {
}
func testV1RsRpcConn(t *testing.T) {
var err error
rlsV1Rpc, err = engine.NewRPCClient(rlsV1Cfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
if err != nil {
t.Fatal("Could not connect to rater: ", err.Error())
}
rlsV1Rpc = engine.NewRPCClient(t, rlsV1Cfg.ListenCfg())
}
func testV1RsSetProfile(t *testing.T) {

6
general_tests/route_it_test.go
View File

@@ -112,11 +112,7 @@ func testV1SplSStartEngine(t *testing.T) {
}
func testV1SplSRpcConn(t *testing.T) {
var err error
splSv1Rpc, err = engine.NewRPCClient(splSv1Cfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
if err != nil {
t.Fatal("Could not connect to rater: ", err.Error())
}
splSv1Rpc = engine.NewRPCClient(t, splSv1Cfg.ListenCfg())
}
func testV1SplSFromFolder(t *testing.T) {

6
general_tests/session3_it_test.go
View File

@@ -109,11 +109,7 @@ func testSes3ItStartEngine(t *testing.T) {
}
func testSes3ItRPCConn(t *testing.T) {
var err error
ses3RPC, err = engine.NewRPCClient(ses3Cfg.ListenCfg())
if err != nil {
t.Fatal(err)
}
ses3RPC = engine.NewRPCClient(t, ses3Cfg.ListenCfg())
}
func testSes3ItLoadFromFolder(t *testing.T) {

5
general_tests/session_bkup_interval_it_test.go
View File

@@ -111,10 +111,7 @@ func testSessionSBkupIntrvlStartEngine(t *testing.T) {
// Connect rpc client to rater
func testSessionSBkupIntrvlApierRpcConn(t *testing.T) {
var err error
if sBkupRPC, err = engine.NewRPCClient(sBkupCfg.ListenCfg()); err != nil {
t.Fatal(err)
}
sBkupRPC = engine.NewRPCClient(t, sBkupCfg.ListenCfg())
}
// Load the tariff plan, creating accounts and their balances

6
general_tests/sessions_message_it_test.go
View File

@@ -99,11 +99,7 @@ func testSesMFDItStartEngine(t *testing.T) {
}
func testSesMFDItRPCConn(t *testing.T) {
var err error
sesMFDRPC, err = engine.NewRPCClient(sesMFDCfg.ListenCfg())
if err != nil {
t.Fatal(err)
}
sesMFDRPC = engine.NewRPCClient(t, sesMFDCfg.ListenCfg())
}
func testSesMFDItSetChargers(t *testing.T) {

14
general_tests/trends_schedule_it_test.go
View File

@@ -199,7 +199,7 @@ cgrates.org,Threshold2,*string:~*req.Metrics.*pdd.ID:*pdd,2024-07-29T15:00:00Z,-
t.Run("CheckExportedTrends", func(t *testing.T) {
var eventType any
if err = client.Call(context.Background(), utils.CacheSv1GetItem, &utils.ArgsGetCacheItemWithAPIOpts{
if err := client.Call(context.Background(), utils.CacheSv1GetItem, &utils.ArgsGetCacheItemWithAPIOpts{
Tenant: "cgrates.org",
ArgsGetCacheItem: utils.ArgsGetCacheItem{
CacheID: utils.CacheUCH,
@@ -210,7 +210,7 @@ cgrates.org,Threshold2,*string:~*req.Metrics.*pdd.ID:*pdd,2024-07-29T15:00:00Z,-
}
var exporterID any
if err = client.Call(context.Background(), utils.CacheSv1GetItem, &utils.ArgsGetCacheItemWithAPIOpts{
if err := client.Call(context.Background(), utils.CacheSv1GetItem, &utils.ArgsGetCacheItemWithAPIOpts{
Tenant: "cgrates.org",
ArgsGetCacheItem: utils.ArgsGetCacheItem{
CacheID: utils.CacheUCH,
@@ -320,7 +320,7 @@ cgrates.org,Threshold2,*string:~*req.Metrics.*pdd.ID:*pdd,2024-07-29T15:00:00Z,-
t.Run("CheckExportedTrends", func(t *testing.T) {
var eventType any
if err = client.Call(context.Background(), utils.CacheSv1GetItem, &utils.ArgsGetCacheItemWithAPIOpts{
if err := client.Call(context.Background(), utils.CacheSv1GetItem, &utils.ArgsGetCacheItemWithAPIOpts{
Tenant: "cgrates.org",
ArgsGetCacheItem: utils.ArgsGetCacheItem{
CacheID: utils.CacheUCH,
@@ -333,7 +333,7 @@ cgrates.org,Threshold2,*string:~*req.Metrics.*pdd.ID:*pdd,2024-07-29T15:00:00Z,-
}
var trendID any
if err = client.Call(context.Background(), utils.CacheSv1GetItem, &utils.ArgsGetCacheItemWithAPIOpts{
if err := client.Call(context.Background(), utils.CacheSv1GetItem, &utils.ArgsGetCacheItemWithAPIOpts{
Tenant: "cgrates.org",
ArgsGetCacheItem: utils.ArgsGetCacheItem{
CacheID: utils.CacheUCH,
@@ -346,7 +346,7 @@ cgrates.org,Threshold2,*string:~*req.Metrics.*pdd.ID:*pdd,2024-07-29T15:00:00Z,-
}
var averageCallCost any
if err = client.Call(context.Background(), utils.CacheSv1GetItem, &utils.ArgsGetCacheItemWithAPIOpts{
if err := client.Call(context.Background(), utils.CacheSv1GetItem, &utils.ArgsGetCacheItemWithAPIOpts{
Tenant: "cgrates.org",
ArgsGetCacheItem: utils.ArgsGetCacheItem{
CacheID: utils.CacheUCH,
@@ -359,7 +359,7 @@ cgrates.org,Threshold2,*string:~*req.Metrics.*pdd.ID:*pdd,2024-07-29T15:00:00Z,-
}
var totalCallDuration any
if err = client.Call(context.Background(), utils.CacheSv1GetItem, &utils.ArgsGetCacheItemWithAPIOpts{
if err := client.Call(context.Background(), utils.CacheSv1GetItem, &utils.ArgsGetCacheItemWithAPIOpts{
Tenant: "cgrates.org",
ArgsGetCacheItem: utils.ArgsGetCacheItem{
CacheID: utils.CacheUCH,
@@ -371,7 +371,7 @@ cgrates.org,Threshold2,*string:~*req.Metrics.*pdd.ID:*pdd,2024-07-29T15:00:00Z,-
t.Errorf("expected %v, received %v", "1920000000000", totalCallDuration)
}
var totalCallCost any
if err = client.Call(context.Background(), utils.CacheSv1GetItem, &utils.ArgsGetCacheItemWithAPIOpts{
if err := client.Call(context.Background(), utils.CacheSv1GetItem, &utils.ArgsGetCacheItemWithAPIOpts{
Tenant: "cgrates.org",
ArgsGetCacheItem: utils.ArgsGetCacheItem{
CacheID: utils.CacheUCH,

2
general_tests/trends_stored_it_test.go
View File

@@ -92,7 +92,7 @@ cgrates.org,TREND_1,@every 1s,Stats1_1,,-1,-1,1,*last,1,false,`,
utils.StatsCsv: `#Tenant[0],Id[1],FilterIDs[2],ActivationInterval[3],QueueLength[4],TTL[5],MinItems[6],Metrics[7],MetricFilterIDs[8],Stored[9],Blocker[10],Weight[11],ThresholdIDs[12]
cgrates.org,Stats1_1,*string:~*req.Account:1001,,,,,*tcc;*acd;*tcd,,,,,`}
ng := TestEngine{
ng := engine.TestEngine{
ConfigJSON: content,
TpFiles: tpFiles,
}