Update dispatcher to take & as separator

This commit is contained in:
TeoV
2018-07-24 09:21:28 -04:00
committed by Dan Christian Bogos
parent e1986e992c
commit 9dd1cf3d1f
8 changed files with 8 additions and 8 deletions

View File

@@ -253,7 +253,7 @@ func testDspAttrAddAttributesWithPermision2(t *testing.T) {
&engine.Attribute{
FieldName: utils.APIMethods,
Initial: utils.META_ANY,
Substitute: utils.NewRSRParsersMustCompile("AttributeSv1.GetAttributeForEvent;|;AttributeSv1.ProcessEvent", true),
Substitute: utils.NewRSRParsersMustCompile("AttributeSv1.GetAttributeForEvent&AttributeSv1.ProcessEvent", true),
Append: true,
},
},

View File

@@ -210,7 +210,7 @@ func testDspCppAddAttributesWithPermision2(t *testing.T) {
&engine.Attribute{
FieldName: utils.APIMethods,
Initial: utils.META_ANY,
Substitute: utils.NewRSRParsersMustCompile("ThresholdSv1.ProcessEvent;|;ChargerSv1.GetChargersForEvent", true),
Substitute: utils.NewRSRParsersMustCompile("ThresholdSv1.ProcessEvent&ChargerSv1.GetChargersForEvent", true),
Append: true,
},
},

View File

@@ -215,7 +215,7 @@ func testDspResAddAttributesWithPermision2(t *testing.T) {
&engine.Attribute{
FieldName: utils.APIMethods,
Initial: utils.META_ANY,
Substitute: utils.NewRSRParsersMustCompile("ThresholdSv1.ProcessEvent;|;ResourceSv1.GetResourcesForEvent", true),
Substitute: utils.NewRSRParsersMustCompile("ThresholdSv1.ProcessEvent&ResourceSv1.GetResourcesForEvent", true),
Append: true,
},
},

View File

@@ -232,7 +232,7 @@ func testDspSessionAddAttributesWithPermision2(t *testing.T) {
&engine.Attribute{
FieldName: utils.APIMethods,
Initial: utils.META_ANY,
Substitute: utils.NewRSRParsersMustCompile("SessionSv1.AuthorizeEventWithDigest;|;SessionSv1.InitiateSessionWithDigest;|;SessionSv1.UpdateSession;|;SessionSv1.TerminateSession;|;SessionSv1.ProcessCDR;|;SessionSv1.ProcessEvent", true),
Substitute: utils.NewRSRParsersMustCompile("SessionSv1.AuthorizeEventWithDigest&SessionSv1.InitiateSessionWithDigest&SessionSv1.UpdateSession&SessionSv1.TerminateSession&SessionSv1.ProcessCDR&SessionSv1.ProcessEvent", true),
Append: true,
},
},

View File

@@ -227,7 +227,7 @@ func testDspStsAddStsibutesWithPermision2(t *testing.T) {
&engine.Attribute{
FieldName: utils.APIMethods,
Initial: utils.META_ANY,
Substitute: utils.NewRSRParsersMustCompile("StatSv1.ProcessEvent;|;StatSv1.GetQueueStringMetrics", true),
Substitute: utils.NewRSRParsersMustCompile("StatSv1.ProcessEvent&StatSv1.GetQueueStringMetrics", true),
Append: true,
},
},

View File

@@ -218,7 +218,7 @@ func testDspSupAddAttributesWithPermision2(t *testing.T) {
&engine.Attribute{
FieldName: utils.APIMethods,
Initial: utils.META_ANY,
Substitute: utils.NewRSRParsersMustCompile("ThresholdSv1.ProcessEvent;|;SupplierSv1.GetSuppliers", true),
Substitute: utils.NewRSRParsersMustCompile("ThresholdSv1.ProcessEvent&SupplierSv1.GetSuppliers", true),
Append: true,
},
},

View File

@@ -227,7 +227,7 @@ func testDspThAddAttributesWithPermision2(t *testing.T) {
&engine.Attribute{
FieldName: utils.APIMethods,
Initial: utils.META_ANY,
Substitute: utils.NewRSRParsersMustCompile("ThresholdSv1.ProcessEvent;|;ThresholdSv1.GetThresholdsForEvent", true),
Substitute: utils.NewRSRParsersMustCompile("ThresholdSv1.ProcessEvent&ThresholdSv1.GetThresholdsForEvent", true),
Append: true,
},
},

View File

@@ -97,5 +97,5 @@ func ParseStringMap(s string) utils.StringMap {
if s == utils.ZERO {
return make(utils.StringMap)
}
return utils.StringMapFromSlice(strings.Split(s, utils.HandlerArgSep))
return utils.StringMapFromSlice(strings.Split(s, utils.ANDSep))
}