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

Fix tests after adding opts to sessions

Browse Source
This commit is contained in:
ionutboangiu
2021-10-18 16:21:29 +03:00
committed by Dan Christian Bogos
parent 5f66ae754f
commit 1670b1b0c9
4 changed files with 131 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
config/config_defaults.go
View File

@@ -787,6 +787,55 @@ const CGRATES_CFG_JSON = `
// "Value": false,
// },
],
"*ttl": [
// {
// "Tenant": "*any",
// "FilterIDs": [],
// "Value": "",
// },
],
"*chargeable": [
// {
// "Tenant": "*any",
// "FilterIDs": [],
// "Value": false,
// },
],
"*lastUsage": [
// {
// "Tenant": "*any",
// "FilterIDs": [],
// "Value": "",
// },
],
"*lastUsed": [
// {
// "Tenant": "*any",
// "FilterIDs": [],
// "Value": "",
// },
],
"*debitInterval": [
// {
// "Tenant": "*any",
// "FilterIDs": [],
// "Value": "",
// },
],
"*maxDelay": [
// {
// "Tenant": "*any",
// "FilterIDs": [],
// "Value": "",
// },
],
"*usage": [
// {
// "Tenant": "*any",
// "FilterIDs": [],
// "Value": "",
// },
],
},
},

39
config/config_json_test.go
View File

@@ -580,14 +580,37 @@ func TestSmgJsonCfg(t *testing.T) {
Publickey_path: utils.StringPointer(""),
},
Opts: &SessionsOptsJson{
Attributes: []*utils.DynamicBoolOpt{},
Chargers: []*utils.DynamicBoolOpt{},
Stats: []*utils.DynamicBoolOpt{},
Thresholds: []*utils.DynamicBoolOpt{},
Initiate: []*utils.DynamicBoolOpt{},
Update: []*utils.DynamicBoolOpt{},
Terminate: []*utils.DynamicBoolOpt{},
Message: []*utils.DynamicBoolOpt{},
Accounts: []*utils.DynamicBoolOpt{},
Attributes: []*utils.DynamicBoolOpt{},
CDRs: []*utils.DynamicBoolOpt{},
Chargers: []*utils.DynamicBoolOpt{},
Resources: []*utils.DynamicBoolOpt{},
Routes: []*utils.DynamicBoolOpt{},
Stats: []*utils.DynamicBoolOpt{},
Thresholds: []*utils.DynamicBoolOpt{},
Initiate: []*utils.DynamicBoolOpt{},
Update: []*utils.DynamicBoolOpt{},
Terminate: []*utils.DynamicBoolOpt{},
Message: []*utils.DynamicBoolOpt{},
AttributesDerivedReply: []*utils.DynamicBoolOpt{},
BlockerError: []*utils.DynamicBoolOpt{},
CDRsDerivedReply: []*utils.DynamicBoolOpt{},
ResourcesAuthorize: []*utils.DynamicBoolOpt{},
ResourcesAllocate: []*utils.DynamicBoolOpt{},
ResourcesRelease: []*utils.DynamicBoolOpt{},
ResourcesDerivedReply: []*utils.DynamicBoolOpt{},
RoutesDerivedReply: []*utils.DynamicBoolOpt{},
StatsDerivedReply: []*utils.DynamicBoolOpt{},
ThresholdsDerivedReply: []*utils.DynamicBoolOpt{},
MaxUsage: []*utils.DynamicBoolOpt{},
ForceDuration: []*utils.DynamicBoolOpt{},
TTL: []*utils.DynamicStringOpt{},
Chargeable: []*utils.DynamicBoolOpt{},
DebitInterval: []*utils.DynamicStringOpt{},
LastUsage: []*utils.DynamicStringOpt{},
LastUsed: []*utils.DynamicStringOpt{},
MaxDelay: []*utils.DynamicStringOpt{},
Usage: []*utils.DynamicStringOpt{},
},
}
dfCgrJSONCfg, err := NewCgrJsonCfgFromBytes([]byte(CGRATES_CFG_JSON))

25
config/config_test.go
View File

File diff suppressed because one or more lines are too long

28
config/sessionscfg_test.go
View File

@@ -155,6 +155,13 @@ func TestSessionSCfgloadFromJsonCfgCase1(t *testing.T) {
ThresholdsDerivedReply: []*utils.DynamicBoolOpt{},
MaxUsage: []*utils.DynamicBoolOpt{},
ForceDuration: []*utils.DynamicBoolOpt{},
TTL: []*utils.DynamicDurationOpt{},
Chargeable: []*utils.DynamicBoolOpt{},
DebitInterval: []*utils.DynamicDurationOpt{},
LastUsage: []*utils.DynamicDurationPointerOpt{},
LastUsed: []*utils.DynamicDurationPointerOpt{},
MaxDelay: []*utils.DynamicDurationOpt{},
Usage: []*utils.DynamicDurationPointerOpt{},
},
}
jsonCfg := NewDefaultCGRConfig()
@@ -336,6 +343,13 @@ func TestSessionSCfgloadFromJsonCfgCase10(t *testing.T) {
ThresholdsDerivedReply: []*utils.DynamicBoolOpt{},
MaxUsage: []*utils.DynamicBoolOpt{},
ForceDuration: []*utils.DynamicBoolOpt{},
TTL: []*utils.DynamicDurationOpt{},
Chargeable: []*utils.DynamicBoolOpt{},
DebitInterval: []*utils.DynamicDurationOpt{},
LastUsage: []*utils.DynamicDurationPointerOpt{},
LastUsed: []*utils.DynamicDurationPointerOpt{},
MaxDelay: []*utils.DynamicDurationOpt{},
Usage: []*utils.DynamicDurationPointerOpt{},
},
}
jsonCfg := NewDefaultCGRConfig()
@@ -473,6 +487,13 @@ func TestSessionSCfgAsMapInterfaceCase1(t *testing.T) {
utils.MetaThresholdsDerivedReplyCfg: []*utils.DynamicBoolOpt{},
utils.MetaMaxUsageCfg: []*utils.DynamicBoolOpt{},
utils.MetaForceDurationCfg: []*utils.DynamicBoolOpt{},
utils.MetaTTLCfg: []*utils.DynamicDurationOpt{},
utils.MetaChargeableCfg: []*utils.DynamicBoolOpt{},
utils.MetaDebitIntervalCfg: []*utils.DynamicDurationOpt{},
utils.MetaLastUsageCfg: []*utils.DynamicDurationPointerOpt{},
utils.MetaLastUsedCfg: []*utils.DynamicDurationPointerOpt{},
utils.MetaMaxDelayCfg: []*utils.DynamicDurationOpt{},
utils.MetaUsage: []*utils.DynamicDurationPointerOpt{},
},
}
if cgrCfg, err := NewCGRConfigFromJSONStringWithDefaults(cfgJSONStr); err != nil {
@@ -576,6 +597,13 @@ func TestSessionSCfgAsMapInterfaceCase2(t *testing.T) {
utils.MetaThresholdsDerivedReplyCfg: []*utils.DynamicBoolOpt{},
utils.MetaMaxUsageCfg: []*utils.DynamicBoolOpt{},
utils.MetaForceDurationCfg: []*utils.DynamicBoolOpt{},
utils.MetaTTLCfg: []*utils.DynamicDurationOpt{},
utils.MetaChargeableCfg: []*utils.DynamicBoolOpt{},
utils.MetaDebitIntervalCfg: []*utils.DynamicDurationOpt{},
utils.MetaLastUsageCfg: []*utils.DynamicDurationPointerOpt{},
utils.MetaLastUsedCfg: []*utils.DynamicDurationPointerOpt{},
utils.MetaMaxDelayCfg: []*utils.DynamicDurationOpt{},
utils.MetaUsage: []*utils.DynamicDurationPointerOpt{},
},
}
cgrCfg, err := NewCGRConfigFromJSONStringWithDefaults(cfgJSONStr)