From 0afe33e999f9be21e5e3f4fc79daa6a60df3dacb Mon Sep 17 00:00:00 2001 From: TeoV Date: Mon, 24 Feb 2020 13:33:06 +0200 Subject: [PATCH] Update with consts in tests --- apier/v1/dm_remote_it_test.go | 6 +++--- apier/v1/filter_indexes_it_test.go | 26 +++++++++++++------------- apier/v1/stats_it_test.go | 28 ++++++++++++++-------------- engine/loader_csv_test.go | 4 ++-- engine/stordb_it_test.go | 4 ++-- migrator/filters_it_test.go | 6 +++--- migrator/filters_test.go | 6 +++--- migrator/stats_it_test.go | 2 +- migrator/stats_test.go | 2 +- 9 files changed, 42 insertions(+), 42 deletions(-) diff --git a/apier/v1/dm_remote_it_test.go b/apier/v1/dm_remote_it_test.go index f3837e602..9d77cb976 100644 --- a/apier/v1/dm_remote_it_test.go +++ b/apier/v1/dm_remote_it_test.go @@ -464,7 +464,7 @@ func testInternalRemoteITGetFilter(t *testing.T) { Rules: []*engine.FilterRule{ { Type: utils.MetaString, - Element: "~*req.Account", + Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account, Values: []string{"1001"}, }, }, @@ -942,10 +942,10 @@ func testInternalReplicateStats(t *testing.T) { TTL: time.Duration(10) * time.Second, Metrics: []*engine.MetricWithFilters{ &engine.MetricWithFilters{ - MetricID: "*acd", + MetricID: utils.MetaACD, }, &engine.MetricWithFilters{ - MetricID: "*tcd", + MetricID: utils.MetaTCD, }, }, ThresholdIDs: []string{"*none"}, diff --git a/apier/v1/filter_indexes_it_test.go b/apier/v1/filter_indexes_it_test.go index 106cf45d9..e704e7b88 100644 --- a/apier/v1/filter_indexes_it_test.go +++ b/apier/v1/filter_indexes_it_test.go @@ -158,7 +158,7 @@ func testV1FIdxSetThresholdProfile(t *testing.T) { Tenant: tenant, ID: "TestFilter", Rules: []*engine.FilterRule{{ - Element: "~*req.Account", + Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account, Type: utils.MetaString, Values: []string{"1001"}, }}, @@ -252,7 +252,7 @@ func testV1FIdxSetSecondThresholdProfile(t *testing.T) { Tenant: tenant, ID: "TestFilter2", Rules: []*engine.FilterRule{{ - Element: "~*req.Account", + Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account, Type: utils.MetaString, Values: []string{"1002"}, }}, @@ -417,7 +417,7 @@ func testV1FIdxSetStatQueueProfileIndexes(t *testing.T) { Tenant: tenant, ID: "FLTR_1", Rules: []*engine.FilterRule{{ - Element: "~*req.Account", + Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account, Type: utils.MetaString, Values: []string{"1001"}, }}, @@ -451,10 +451,10 @@ func testV1FIdxSetStatQueueProfileIndexes(t *testing.T) { TTL: time.Duration(10) * time.Second, Metrics: []*engine.MetricWithFilters{ &engine.MetricWithFilters{ - MetricID: "*sum", + MetricID: utils.MetaSum, }, &engine.MetricWithFilters{ - MetricID: "*acd", + MetricID: utils.MetaACD, }, }, ThresholdIDs: []string{"Val1", "Val2"}, @@ -520,7 +520,7 @@ func testV1FIdxSetSecondStatQueueProfileIndexes(t *testing.T) { Tenant: tenant, ID: "FLTR_2", Rules: []*engine.FilterRule{{ - Element: "~*req.Account", + Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account, Type: utils.MetaString, Values: []string{"1001"}, }}, @@ -557,7 +557,7 @@ func testV1FIdxSetSecondStatQueueProfileIndexes(t *testing.T) { MetricID: "*sum", }, &engine.MetricWithFilters{ - MetricID: "*acd", + MetricID: utils.MetaACD, }, }, ThresholdIDs: []string{"Val1", "Val2"}, @@ -666,7 +666,7 @@ func testV1FIdxSetResourceProfileIndexes(t *testing.T) { Tenant: tenant, ID: "FLTR_RES_RCFG1", Rules: []*engine.FilterRule{{ - Element: "~*req.Account", + Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account, Type: utils.MetaString, Values: []string{"1001"}, }}, @@ -759,7 +759,7 @@ func testV1FIdxSetSecondResourceProfileIndexes(t *testing.T) { Tenant: tenant, ID: "FLTR_2", Rules: []*engine.FilterRule{{ - Element: "~*req.Account", + Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account, Type: utils.MetaString, Values: []string{"1001"}, }}, @@ -895,7 +895,7 @@ func testV1FIdxSetSupplierProfileIndexes(t *testing.T) { ID: "FLTR_1", Rules: []*engine.FilterRule{ { - Element: "~*req.Account", + Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account, Type: utils.MetaString, Values: []string{"1001"}, }, @@ -994,7 +994,7 @@ func testV1FIdxSetSecondSupplierProfileIndexes(t *testing.T) { Tenant: tenant, ID: "FLTR_2", Rules: []*engine.FilterRule{{ - Element: "~*req.Account", + Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account, Type: utils.MetaString, Values: []string{"1001"}, }}, @@ -1137,7 +1137,7 @@ func testV1FIdxSetAttributeProfileIndexes(t *testing.T) { Tenant: tenant, ID: "FLTR_1", Rules: []*engine.FilterRule{{ - Element: "~*req.Account", + Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account, Type: utils.MetaString, Values: []string{"1001"}, }}, @@ -1245,7 +1245,7 @@ func testV1FIdxSetSecondAttributeProfileIndexes(t *testing.T) { Tenant: tenant, ID: "FLTR_2", Rules: []*engine.FilterRule{{ - Element: "~*req.Account", + Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account, Type: utils.MetaString, Values: []string{"1001"}, }}, diff --git a/apier/v1/stats_it_test.go b/apier/v1/stats_it_test.go index b3e7814b7..711f9bb06 100644 --- a/apier/v1/stats_it_test.go +++ b/apier/v1/stats_it_test.go @@ -340,7 +340,7 @@ func testV1STSSetStatQueueProfile(t *testing.T) { ID: "FLTR_1", Rules: []*engine.FilterRule{ { - Element: "~*req.Account", + Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account, Type: utils.MetaString, Values: []string{"1001"}, }, @@ -375,10 +375,10 @@ func testV1STSSetStatQueueProfile(t *testing.T) { TTL: time.Duration(10) * time.Second, Metrics: []*engine.MetricWithFilters{ &engine.MetricWithFilters{ - MetricID: "*acd", + MetricID: utils.MetaACD, }, &engine.MetricWithFilters{ - MetricID: "*tcd", + MetricID: utils.MetaTCD, }, }, ThresholdIDs: []string{"Val1", "Val2"}, @@ -420,7 +420,7 @@ func testV1STSUpdateStatQueueProfile(t *testing.T) { ID: "FLTR_2", Rules: []*engine.FilterRule{ { - Element: "~*req.Account", + Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account, Type: utils.MetaString, Values: []string{"1001"}, }, @@ -483,15 +483,15 @@ func testV1STSProcessMetricsWithFilter(t *testing.T) { TTL: time.Duration(1) * time.Second, Metrics: []*engine.MetricWithFilters{ &engine.MetricWithFilters{ - MetricID: "*acd", + MetricID: utils.MetaACD, FilterIDs: []string{"*rsr::~*req.Usage{*duration}(>10s)"}, }, &engine.MetricWithFilters{ - MetricID: "*tcd", + MetricID: utils.MetaTCD, FilterIDs: []string{"*gt:~*req.Usage:5s"}, }, &engine.MetricWithFilters{ - MetricID: "*sum:~CustomValue", + MetricID: utils.ConcatenatedKey(utils.MetaSum, utils.DynamicDataPrefix+utils.MetaReq+utils.NestingSep+"CustomValue"), FilterIDs: []string{"*exists:~*req.CustomValue:", "*gte:~*req.CustomValue:10.0"}, }, }, @@ -523,7 +523,7 @@ func testV1STSProcessMetricsWithFilter(t *testing.T) { expectedMetrics := map[string]string{ utils.MetaACD: utils.NOT_AVAILABLE, utils.MetaTCD: utils.NOT_AVAILABLE, - utils.ConcatenatedKey(utils.MetaSum, "~CustomValue"): utils.NOT_AVAILABLE, + utils.ConcatenatedKey(utils.MetaSum, utils.DynamicDataPrefix+utils.MetaReq+utils.NestingSep+"CustomValue"): utils.NOT_AVAILABLE, } if err := stsV1Rpc.Call(utils.StatSv1GetQueueStringMetrics, &utils.TenantIDWithArgDispatcher{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: expectedIDs[0]}}, &metrics); err != nil { @@ -551,7 +551,7 @@ func testV1STSProcessMetricsWithFilter(t *testing.T) { expectedMetrics = map[string]string{ utils.MetaACD: utils.NOT_AVAILABLE, utils.MetaTCD: "6s", - utils.ConcatenatedKey(utils.MetaSum, "~CustomValue"): utils.NOT_AVAILABLE, + utils.ConcatenatedKey(utils.MetaSum, utils.DynamicDataPrefix+utils.MetaReq+utils.NestingSep+"CustomValue"): utils.NOT_AVAILABLE, } if err := stsV1Rpc.Call(utils.StatSv1GetQueueStringMetrics, &utils.TenantIDWithArgDispatcher{ @@ -578,7 +578,7 @@ func testV1STSProcessMetricsWithFilter(t *testing.T) { expectedMetrics = map[string]string{ utils.MetaACD: "12s", utils.MetaTCD: "18s", - utils.ConcatenatedKey(utils.MetaSum, "~CustomValue"): "10", + utils.ConcatenatedKey(utils.MetaSum, utils.DynamicDataPrefix+utils.MetaReq+utils.NestingSep+"CustomValue"): "10", } if err := stsV1Rpc.Call(utils.StatSv1GetQueueStringMetrics, &utils.TenantIDWithArgDispatcher{ @@ -602,10 +602,10 @@ func testV1STSProcessStaticMetrics(t *testing.T) { TTL: time.Duration(1) * time.Second, Metrics: []*engine.MetricWithFilters{ &engine.MetricWithFilters{ - MetricID: "*sum:1", + MetricID: utils.ConcatenatedKey(utils.MetaSum, "1"), }, &engine.MetricWithFilters{ - MetricID: "*average:2", + MetricID: utils.ConcatenatedKey(utils.MetaAverage, "2"), }, }, ThresholdIDs: []string{"*none"}, @@ -707,10 +707,10 @@ func testV1STSProcessStatWithThreshold(t *testing.T) { TTL: time.Duration(1) * time.Second, Metrics: []*engine.MetricWithFilters{ &engine.MetricWithFilters{ - MetricID: "*tcd", + MetricID: utils.MetaTCD, }, &engine.MetricWithFilters{ - MetricID: "*sum:2", + MetricID: utils.ConcatenatedKey(utils.MetaSum, "2"), }, }, Stored: true, diff --git a/engine/loader_csv_test.go b/engine/loader_csv_test.go index 7b260b2a6..e6d6b6416 100644 --- a/engine/loader_csv_test.go +++ b/engine/loader_csv_test.go @@ -1151,7 +1151,7 @@ func TestLoadFilters(t *testing.T) { ID: "FLTR_1", Filters: []*utils.TPFilter{ &utils.TPFilter{ - Element: "~*req.Account", + Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account, Type: utils.MetaString, Values: []string{"1001", "1002"}, }, @@ -1176,7 +1176,7 @@ func TestLoadFilters(t *testing.T) { ID: "FLTR_ACNT_dan", Filters: []*utils.TPFilter{ &utils.TPFilter{ - Element: "~*req.Account", + Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account, Type: utils.MetaString, Values: []string{"dan"}, }, diff --git a/engine/stordb_it_test.go b/engine/stordb_it_test.go index a8b4e8f18..c1c9dfd39 100644 --- a/engine/stordb_it_test.go +++ b/engine/stordb_it_test.go @@ -1122,7 +1122,7 @@ func testStorDBitCRUDTpStats(t *testing.T) { MetricID: "*asr", }, &utils.MetricWithFilters{ - MetricID: "*acd", + MetricID: utils.MetaACD, }, } if err := storDB.SetTPStats(eTPs); err != nil { @@ -1141,7 +1141,7 @@ func testStorDBitCRUDTpStats(t *testing.T) { TTL: "1s", Metrics: []*utils.MetricWithFilters{ &utils.MetricWithFilters{ - MetricID: "*acd", + MetricID: utils.MetaACD, }, &utils.MetricWithFilters{ MetricID: "*asr", diff --git a/migrator/filters_it_test.go b/migrator/filters_it_test.go index 7cb1140f2..310719ae0 100644 --- a/migrator/filters_it_test.go +++ b/migrator/filters_it_test.go @@ -150,7 +150,7 @@ func testFltrITMigrateAndMove(t *testing.T) { Rules: []*engine.FilterRule{ &engine.FilterRule{ Type: utils.MetaPrefix, - Element: "~*req.Account", + Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account, Values: []string{"1001"}, }, }, @@ -307,7 +307,7 @@ func testFltrITMigratev2(t *testing.T) { Rules: []*engine.FilterRule{ &engine.FilterRule{ Type: utils.MetaString, - Element: "~*req.Account", + Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account, Values: []string{"1001"}, }, &engine.FilterRule{ @@ -445,7 +445,7 @@ func testFltrITMigratev3(t *testing.T) { Rules: []*engine.FilterRule{ &engine.FilterRule{ Type: utils.MetaString, - Element: "~*req.Account", + Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account, Values: []string{"1001"}, }, &engine.FilterRule{ diff --git a/migrator/filters_test.go b/migrator/filters_test.go index b72a2869b..7c2f1794a 100644 --- a/migrator/filters_test.go +++ b/migrator/filters_test.go @@ -80,7 +80,7 @@ func TestFiltersMigrate(t *testing.T) { Rules: []*engine.FilterRule{ &engine.FilterRule{ Type: utils.MetaString, - Element: "~*req.Account", + Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account, Values: []string{}, }, }, @@ -141,7 +141,7 @@ func TestFiltersMigrateV2(t *testing.T) { Rules: []*engine.FilterRule{ &engine.FilterRule{ Type: utils.MetaString, - Element: "~*req.Account", + Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account, Values: []string{}, }, }, @@ -165,7 +165,7 @@ func TestFiltersMigrateV2(t *testing.T) { Rules: []*engine.FilterRule{ &engine.FilterRule{ Type: utils.MetaPrefix, - Element: "~*req.Account", + Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account, Values: []string{}, }, }, diff --git a/migrator/stats_it_test.go b/migrator/stats_it_test.go index 90d24247f..fc7c2dca5 100755 --- a/migrator/stats_it_test.go +++ b/migrator/stats_it_test.go @@ -206,7 +206,7 @@ func testStsITMigrateAndMove(t *testing.T) { MetricID: "*asr", }, &engine.MetricWithFilters{ - MetricID: "*acd", + MetricID: utils.MetaACD, }, &engine.MetricWithFilters{ MetricID: "*acc", diff --git a/migrator/stats_test.go b/migrator/stats_test.go index a871c0c84..dfbe6719d 100644 --- a/migrator/stats_test.go +++ b/migrator/stats_test.go @@ -96,7 +96,7 @@ func TestV1StatsAsStats(t *testing.T) { MetricID: "*asr", }, &engine.MetricWithFilters{ - MetricID: "*acd", + MetricID: utils.MetaACD, }, &engine.MetricWithFilters{ MetricID: "*acc",