Skip to content
This repository was archived by the owner on Jun 6, 2023. It is now read-only.

Commit 36da1a6

Browse files
andronachedanbogos
andronache
authored and
danbogos
committed
Consts in utils
1 parent ea796ec commit 36da1a6

File tree

116 files changed

+1437
-1437
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

116 files changed

+1437
-1437
lines changed

‎actions/actions.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ func (aS *ActionS) scheduleActions(cgrEvs []*utils.CGREventWithOpts, aPrflIDs []
123123
continue
124124
}
125125
for _, sActs := range schedActSet {
126-
if sActs.schedule == utils.ASAP {
126+
if sActs.schedule == utils.MetaASAP {
127127
go aS.asapExecuteActions(sActs)
128128
continue
129129
}

‎agents/agentreq_test.go

Lines changed: 114 additions & 114 deletions
Large diffs are not rendered by default.

‎agents/diamagent_test.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -69,37 +69,37 @@ func TestProcessRequest(t *testing.T) {
6969
}
7070
reqProcessor := &config.RequestProcessor{
7171
ID: "Default",
72-
Tenant: config.NewRSRParsersMustCompile("cgrates.org", utils.INFIELD_SEP),
72+
Tenant: config.NewRSRParsersMustCompile("cgrates.org", utils.InfieldSep),
7373
Filters: []string{},
7474
RequestFields: []*config.FCTemplate{
7575
{Tag: utils.ToR,
7676
Type: utils.META_CONSTANT, Path: utils.MetaCgreq + utils.NestingSep + utils.ToR,
77-
Value: config.NewRSRParsersMustCompile(utils.VOICE, utils.INFIELD_SEP)},
77+
Value: config.NewRSRParsersMustCompile(utils.VOICE, utils.InfieldSep)},
7878
{Tag: utils.OriginID,
7979
Type: utils.META_COMPOSED, Path: utils.MetaCgreq + utils.NestingSep + utils.OriginID,
80-
Value: config.NewRSRParsersMustCompile("~*req.SessionId", utils.INFIELD_SEP), Mandatory: true},
80+
Value: config.NewRSRParsersMustCompile("~*req.SessionId", utils.InfieldSep), Mandatory: true},
8181
{Tag: utils.OriginHost,
8282
Type: utils.MetaRemoteHost, Path: utils.MetaCgreq + utils.NestingSep + utils.OriginHost, Mandatory: true},
8383
{Tag: utils.Category,
8484
Type: utils.META_CONSTANT, Path: utils.MetaCgreq + utils.NestingSep + utils.Category,
85-
Value: config.NewRSRParsersMustCompile(utils.CALL, utils.INFIELD_SEP)},
85+
Value: config.NewRSRParsersMustCompile(utils.CALL, utils.InfieldSep)},
8686
{Tag: utils.AccountField,
8787
Type: utils.META_COMPOSED, Path: utils.MetaCgreq + utils.NestingSep + utils.AccountField,
88-
Value: config.NewRSRParsersMustCompile("~*req.Account", utils.INFIELD_SEP), Mandatory: true},
88+
Value: config.NewRSRParsersMustCompile("~*req.Account", utils.InfieldSep), Mandatory: true},
8989
{Tag: utils.Destination,
9090
Type: utils.META_COMPOSED, Path: utils.MetaCgreq + utils.NestingSep + utils.Destination,
91-
Value: config.NewRSRParsersMustCompile("~*req.Destination", utils.INFIELD_SEP), Mandatory: true},
91+
Value: config.NewRSRParsersMustCompile("~*req.Destination", utils.InfieldSep), Mandatory: true},
9292
{Tag: utils.Usage,
9393
Type: utils.META_COMPOSED, Path: utils.MetaCgreq + utils.NestingSep + utils.Usage,
94-
Value: config.NewRSRParsersMustCompile("~*req.Usage", utils.INFIELD_SEP), Mandatory: true},
94+
Value: config.NewRSRParsersMustCompile("~*req.Usage", utils.InfieldSep), Mandatory: true},
9595
},
9696
ReplyFields: []*config.FCTemplate{
9797
{Tag: "ResultCode",
9898
Type: utils.META_CONSTANT, Path: utils.MetaRep + utils.NestingSep + "ResultCode",
99-
Value: config.NewRSRParsersMustCompile("2001", utils.INFIELD_SEP)},
99+
Value: config.NewRSRParsersMustCompile("2001", utils.InfieldSep)},
100100
{Tag: "GrantedUnits",
101101
Type: utils.MetaVariable, Path: utils.MetaRep + utils.NestingSep + "Granted-Service-Unit.CC-Time",
102-
Value: config.NewRSRParsersMustCompile("~*cgrep.MaxUsage{*duration_seconds}", utils.INFIELD_SEP),
102+
Value: config.NewRSRParsersMustCompile("~*cgrep.MaxUsage{*duration_seconds}", utils.InfieldSep),
103103
Mandatory: true},
104104
},
105105
}
@@ -516,7 +516,7 @@ func TestProcessRequest(t *testing.T) {
516516
reqProcessor.Flags = utils.FlagsWithParamsFromSlice([]string{utils.MetaTerminate, utils.MetaAccounts, utils.MetaAttributes, utils.MetaCDRs})
517517
reqProcessor.ReplyFields = []*config.FCTemplate{{Tag: "ResultCode",
518518
Type: utils.META_CONSTANT, Path: utils.MetaRep + utils.NestingSep + "ResultCode",
519-
Value: config.NewRSRParsersMustCompile("2001", utils.INFIELD_SEP)}}
519+
Value: config.NewRSRParsersMustCompile("2001", utils.InfieldSep)}}
520520
for _, v := range reqProcessor.ReplyFields {
521521
v.ComputePath()
522522
}

‎agents/librad_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,10 @@ func TestRadReplyAppendAttributes(t *testing.T) {
8181
rplyFlds := []*config.FCTemplate{
8282
{Tag: "ReplyCode", Path: utils.MetaRep + utils.NestingSep + MetaRadReplyCode,
8383
Type: utils.MetaVariable,
84-
Value: config.NewRSRParsersMustCompile("~*cgrep.Attributes.RadReply", utils.INFIELD_SEP)},
84+
Value: config.NewRSRParsersMustCompile("~*cgrep.Attributes.RadReply", utils.InfieldSep)},
8585
{Tag: "Acct-Session-Time", Path: utils.MetaRep + utils.NestingSep + "Acct-Session-Time",
8686
Type: utils.MetaVariable,
87-
Value: config.NewRSRParsersMustCompile("~*cgrep.MaxUsage{*duration_seconds}", utils.INFIELD_SEP)},
87+
Value: config.NewRSRParsersMustCompile("~*cgrep.MaxUsage{*duration_seconds}", utils.InfieldSep)},
8888
}
8989
for _, v := range rplyFlds {
9090
v.ComputePath()

‎agents/libsip_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ func TestUpdateSIPMsgFromNavMap(t *testing.T) {
3333
rplyFlds := []*config.FCTemplate{
3434
{Tag: "Request", Path: utils.MetaRep + utils.NestingSep + "Request",
3535
Type: utils.MetaVariable,
36-
Value: config.NewRSRParsersMustCompile("~*cgrep.Attributes.Request", utils.INFIELD_SEP)},
36+
Value: config.NewRSRParsersMustCompile("~*cgrep.Attributes.Request", utils.InfieldSep)},
3737
{Tag: "Contact", Path: utils.MetaRep + utils.NestingSep + "Contact",
3838
Type: utils.MetaVariable,
39-
Value: config.NewRSRParsersMustCompile("~*cgrep.Attributes.Account", utils.INFIELD_SEP)},
39+
Value: config.NewRSRParsersMustCompile("~*cgrep.Attributes.Account", utils.InfieldSep)},
4040
}
4141
for _, v := range rplyFlds {
4242
v.ComputePath()

‎apier/v1/actions_it_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ func testActionSGetActionProfile(t *testing.T) {
130130
ID: "ONE_TIME_ACT",
131131
FilterIDs: []string{},
132132
Weight: 10,
133-
Schedule: utils.ASAP,
133+
Schedule: utils.MetaASAP,
134134
Targets: map[string]utils.StringSet{
135135
utils.MetaAccounts: utils.StringSet{"1001": {}, "1002": {}},
136136
},

‎apier/v1/apier.go

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -835,7 +835,7 @@ func (apierSv1 *APIerSv1) SetActionPlan(attrs *AttrSetActionPlan, reply *string)
835835

836836
func verifyFormat(tStr string) bool {
837837
if tStr == utils.EmptyString ||
838-
tStr == utils.ASAP {
838+
tStr == utils.MetaASAP {
839839
return true
840840
}
841841

@@ -1051,7 +1051,7 @@ func (apierSv1 *APIerSv1) LoadTariffPlanFromFolder(attrs *utils.AttrLoadTpFromFo
10511051

10521052
// create the TpReader
10531053
loader, err := engine.NewTpReader(apierSv1.DataManager.DataDB(),
1054-
engine.NewFileCSVStorage(utils.CSV_SEP, attrs.FolderPath),
1054+
engine.NewFileCSVStorage(utils.CSVSep, attrs.FolderPath),
10551055
"", apierSv1.Config.GeneralCfg().DefaultTimezone,
10561056
apierSv1.Config.ApierCfg().CachesConns, apierSv1.Config.ApierCfg().SchedulerConns,
10571057
apierSv1.Config.DataDbCfg().DataDbType == utils.INTERNAL)
@@ -1118,7 +1118,7 @@ func (apierSv1 *APIerSv1) RemoveTPFromFolder(attrs *utils.AttrLoadTpFromFolder,
11181118

11191119
// create the TpReader
11201120
loader, err := engine.NewTpReader(apierSv1.DataManager.DataDB(),
1121-
engine.NewFileCSVStorage(utils.CSV_SEP, attrs.FolderPath), "", apierSv1.Config.GeneralCfg().DefaultTimezone,
1121+
engine.NewFileCSVStorage(utils.CSVSep, attrs.FolderPath), "", apierSv1.Config.GeneralCfg().DefaultTimezone,
11221122
apierSv1.Config.ApierCfg().CachesConns, apierSv1.Config.ApierCfg().SchedulerConns,
11231123
apierSv1.Config.DataDbCfg().DataDbType == utils.INTERNAL)
11241124
if err != nil {
@@ -1558,7 +1558,7 @@ func (apierSv1 *APIerSv1) ExportToFolder(arg *utils.ArgExportToFolder, reply *st
15581558
defer f.Close()
15591559

15601560
csvWriter := csv.NewWriter(f)
1561-
csvWriter.Comma = utils.CSV_SEP
1561+
csvWriter.Comma = utils.CSVSep
15621562
//write the header of the file
15631563
if err := csvWriter.Write(engine.AttributeMdls{}.CSVHeader()); err != nil {
15641564
return err
@@ -1596,7 +1596,7 @@ func (apierSv1 *APIerSv1) ExportToFolder(arg *utils.ArgExportToFolder, reply *st
15961596
defer f.Close()
15971597

15981598
csvWriter := csv.NewWriter(f)
1599-
csvWriter.Comma = utils.CSV_SEP
1599+
csvWriter.Comma = utils.CSVSep
16001600
//write the header of the file
16011601
if err := csvWriter.Write(engine.ChargerMdls{}.CSVHeader()); err != nil {
16021602
return err
@@ -1634,7 +1634,7 @@ func (apierSv1 *APIerSv1) ExportToFolder(arg *utils.ArgExportToFolder, reply *st
16341634
defer f.Close()
16351635

16361636
csvWriter := csv.NewWriter(f)
1637-
csvWriter.Comma = utils.CSV_SEP
1637+
csvWriter.Comma = utils.CSVSep
16381638
//write the header of the file
16391639
if err := csvWriter.Write(engine.DispatcherProfileMdls{}.CSVHeader()); err != nil {
16401640
return err
@@ -1672,7 +1672,7 @@ func (apierSv1 *APIerSv1) ExportToFolder(arg *utils.ArgExportToFolder, reply *st
16721672
defer f.Close()
16731673

16741674
csvWriter := csv.NewWriter(f)
1675-
csvWriter.Comma = utils.CSV_SEP
1675+
csvWriter.Comma = utils.CSVSep
16761676
//write the header of the file
16771677
if err := csvWriter.Write(engine.DispatcherHostMdls{}.CSVHeader()); err != nil {
16781678
return err
@@ -1708,7 +1708,7 @@ func (apierSv1 *APIerSv1) ExportToFolder(arg *utils.ArgExportToFolder, reply *st
17081708
defer f.Close()
17091709

17101710
csvWriter := csv.NewWriter(f)
1711-
csvWriter.Comma = utils.CSV_SEP
1711+
csvWriter.Comma = utils.CSVSep
17121712
//write the header of the file
17131713
if err := csvWriter.Write(engine.FilterMdls{}.CSVHeader()); err != nil {
17141714
return err
@@ -1746,7 +1746,7 @@ func (apierSv1 *APIerSv1) ExportToFolder(arg *utils.ArgExportToFolder, reply *st
17461746
defer f.Close()
17471747

17481748
csvWriter := csv.NewWriter(f)
1749-
csvWriter.Comma = utils.CSV_SEP
1749+
csvWriter.Comma = utils.CSVSep
17501750
//write the header of the file
17511751
if err := csvWriter.Write(engine.ResourceMdls{}.CSVHeader()); err != nil {
17521752
return err
@@ -1784,7 +1784,7 @@ func (apierSv1 *APIerSv1) ExportToFolder(arg *utils.ArgExportToFolder, reply *st
17841784
defer f.Close()
17851785

17861786
csvWriter := csv.NewWriter(f)
1787-
csvWriter.Comma = utils.CSV_SEP
1787+
csvWriter.Comma = utils.CSVSep
17881788
//write the header of the file
17891789
if err := csvWriter.Write(engine.StatMdls{}.CSVHeader()); err != nil {
17901790
return err
@@ -1822,7 +1822,7 @@ func (apierSv1 *APIerSv1) ExportToFolder(arg *utils.ArgExportToFolder, reply *st
18221822
defer f.Close()
18231823

18241824
csvWriter := csv.NewWriter(f)
1825-
csvWriter.Comma = utils.CSV_SEP
1825+
csvWriter.Comma = utils.CSVSep
18261826
//write the header of the file
18271827
if err := csvWriter.Write(engine.RouteMdls{}.CSVHeader()); err != nil {
18281828
return err
@@ -1860,7 +1860,7 @@ func (apierSv1 *APIerSv1) ExportToFolder(arg *utils.ArgExportToFolder, reply *st
18601860
defer f.Close()
18611861

18621862
csvWriter := csv.NewWriter(f)
1863-
csvWriter.Comma = utils.CSV_SEP
1863+
csvWriter.Comma = utils.CSVSep
18641864
//write the header of the file
18651865
if err := csvWriter.Write(engine.ThresholdMdls{}.CSVHeader()); err != nil {
18661866
return err
@@ -1898,7 +1898,7 @@ func (apierSv1 *APIerSv1) ExportToFolder(arg *utils.ArgExportToFolder, reply *st
18981898
defer f.Close()
18991899

19001900
csvWriter := csv.NewWriter(f)
1901-
csvWriter.Comma = utils.CSV_SEP
1901+
csvWriter.Comma = utils.CSVSep
19021902
//write the header of the file
19031903
if err := csvWriter.Write(engine.RateProfileMdls{}.CSVHeader()); err != nil {
19041904
return err
@@ -1936,7 +1936,7 @@ func (apierSv1 *APIerSv1) ExportToFolder(arg *utils.ArgExportToFolder, reply *st
19361936
defer f.Close()
19371937

19381938
csvWriter := csv.NewWriter(f)
1939-
csvWriter.Comma = utils.CSV_SEP
1939+
csvWriter.Comma = utils.CSVSep
19401940
//write the header of the file
19411941
if err := csvWriter.Write(engine.ActionProfileMdls{}.CSVHeader()); err != nil {
19421942
return err

‎apier/v1/apier2_it_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ func testAPIerVerifyAttributesAfterLoad(t *testing.T) {
160160
FilterIDs: []string{},
161161
Path: utils.MetaReq + utils.NestingSep + "Password",
162162
Type: utils.META_CONSTANT,
163-
Value: config.NewRSRParsersMustCompile("CGRateS.org", utils.INFIELD_SEP),
163+
Value: config.NewRSRParsersMustCompile("CGRateS.org", utils.InfieldSep),
164164
},
165165
},
166166
Weight: 20.0,

0 commit comments

Comments
 (0)