diff --git a/dispatcher/attributes_it_test.go b/dispatcher/attributes_it_test.go index da24285fd..2c60902d7 100755 --- a/dispatcher/attributes_it_test.go +++ b/dispatcher/attributes_it_test.go @@ -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, }, }, diff --git a/dispatcher/chargers_it_test.go b/dispatcher/chargers_it_test.go index 8ed667309..69cf90a9e 100755 --- a/dispatcher/chargers_it_test.go +++ b/dispatcher/chargers_it_test.go @@ -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, }, }, diff --git a/dispatcher/resources_it_test.go b/dispatcher/resources_it_test.go index d0affa0d9..4a7be05d4 100755 --- a/dispatcher/resources_it_test.go +++ b/dispatcher/resources_it_test.go @@ -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, }, }, diff --git a/dispatcher/sessions_it_test.go b/dispatcher/sessions_it_test.go index 740b036e6..abede5e1c 100755 --- a/dispatcher/sessions_it_test.go +++ b/dispatcher/sessions_it_test.go @@ -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, }, }, diff --git a/dispatcher/stats_it_test.go b/dispatcher/stats_it_test.go index ed52715a7..d47417d22 100755 --- a/dispatcher/stats_it_test.go +++ b/dispatcher/stats_it_test.go @@ -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, }, }, diff --git a/dispatcher/suppliers_it_test.go b/dispatcher/suppliers_it_test.go index 7cbdddd9a..a98d2010e 100755 --- a/dispatcher/suppliers_it_test.go +++ b/dispatcher/suppliers_it_test.go @@ -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, }, }, diff --git a/dispatcher/thresholds_it_test.go b/dispatcher/thresholds_it_test.go index 9b72093fb..86eeee30d 100755 --- a/dispatcher/thresholds_it_test.go +++ b/dispatcher/thresholds_it_test.go @@ -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, }, }, diff --git a/dispatcher/utils.go b/dispatcher/utils.go index 4d5609bd3..b0db78ba3 100755 --- a/dispatcher/utils.go +++ b/dispatcher/utils.go @@ -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)) }