From 66f4f9a46edd58cdadca6cabd5e4a511112a0a3d Mon Sep 17 00:00:00 2001 From: DanB Date: Tue, 31 Jan 2017 16:22:03 +0100 Subject: [PATCH] Tests for ApierV1.ReplayFailedPosts, various fixes --- apier/v1/apier.go | 1 + apier/v1/apier_it_test.go | 51 ++++++++++++++++++++++++------ data/conf/samples/apier/apier.json | 1 + engine/action.go | 4 +-- 4 files changed, 45 insertions(+), 12 deletions(-) diff --git a/apier/v1/apier.go b/apier/v1/apier.go index 6f58b9345..a62ba2805 100644 --- a/apier/v1/apier.go +++ b/apier/v1/apier.go @@ -1744,5 +1744,6 @@ func (v1 *ApierV1) ReplayFailedPosts(args ArgsReplyFailedPosts, reply *string) ( } } } + *reply = utils.OK return nil } diff --git a/apier/v1/apier_it_test.go b/apier/v1/apier_it_test.go index a20f4eb08..c2b78a83c 100644 --- a/apier/v1/apier_it_test.go +++ b/apier/v1/apier_it_test.go @@ -23,6 +23,7 @@ import ( "encoding/json" "flag" "fmt" + "io/ioutil" "net/http" "net/rpc" "net/rpc/jsonrpc" @@ -1678,17 +1679,47 @@ func TestApierStartStopServiceStatus(t *testing.T) { } } -/* -func TestApierGetCacheStats3(t *testing.T) { - var rcvStats *utils.CacheStats - expectedStats := &utils.CacheStats{Destinations: 4, RatingPlans: 3, RatingProfiles: 8, Actions: 7, SharedGroups: 1, RatingAliases: 1, AccountAliases: 1, DerivedChargers: 1} - var args utils.AttrCacheStats - if err := rater.Call("ApierV1.GetCacheStats", args, &rcvStats); err != nil { - t.Error("Got error on ApierV1.GetCacheStats: ", err.Error()) - } else if !reflect.DeepEqual(expectedStats, rcvStats) { - t.Errorf("Calling ApierV1.GetCacheStats expected: %v, received: %v", expectedStats, rcvStats) +func TestApierReplayFailedPosts(t *testing.T) { + fileName := "act>*call_url|*http_json|http%3A%2F%2Flocalhost%3A2081|63bed4ea-615e-4096-b1f4-499f64f29b28.json" + fileContent := []byte(`{"ID":"cgrates.org:1007","BalanceMap":{"*monetary":[{"Uuid":"367be35a-96ee-40a5-b609-9130661f5f12","ID":"","Value":0,"Directions":{"*out":true},"ExpirationDate":"0001-01-01T00:00:00Z","Weight":10,"DestinationIDs":{},"RatingSubject":"","Categories":{},"SharedGroups":{"SHARED_A":true},"Timings":null,"TimingIDs":{},"Disabled":false,"Factor":null,"Blocker":false}]},"UnitCounters":{"*monetary":[{"CounterType":"*event","Counters":[{"Value":0,"Filter":{"Uuid":null,"ID":"b8531413-10d5-47ad-81ad-2bc272e8f0ca","Type":"*monetary","Value":null,"Directions":{"*out":true},"ExpirationDate":null,"Weight":null,"DestinationIDs":{"FS_USERS":true},"RatingSubject":null,"Categories":null,"SharedGroups":null,"TimingIDs":null,"Timings":null,"Disabled":null,"Factor":null,"Blocker":null}}]}]},"ActionTriggers":[{"ID":"STANDARD_TRIGGERS","UniqueID":"46ac7b8c-685d-4555-bf73-fa6cfbc2fa21","ThresholdType":"*min_balance","ThresholdValue":2,"Recurrent":false,"MinSleep":0,"ExpirationDate":"0001-01-01T00:00:00Z","ActivationDate":"0001-01-01T00:00:00Z","Balance":{"Uuid":null,"ID":null,"Type":"*monetary","Value":null,"Directions":{"*out":true},"ExpirationDate":null,"Weight":null,"DestinationIDs":null,"RatingSubject":null,"Categories":null,"SharedGroups":null,"TimingIDs":null,"Timings":null,"Disabled":null,"Factor":null,"Blocker":null},"Weight":10,"ActionsID":"LOG_WARNING","MinQueuedItems":0,"Executed":true,"LastExecutionTime":"2017-01-31T14:03:57.961651647+01:00"},{"ID":"STANDARD_TRIGGERS","UniqueID":"b8531413-10d5-47ad-81ad-2bc272e8f0ca","ThresholdType":"*max_event_counter","ThresholdValue":5,"Recurrent":false,"MinSleep":0,"ExpirationDate":"0001-01-01T00:00:00Z","ActivationDate":"0001-01-01T00:00:00Z","Balance":{"Uuid":null,"ID":null,"Type":"*monetary","Value":null,"Directions":{"*out":true},"ExpirationDate":null,"Weight":null,"DestinationIDs":{"FS_USERS":true},"RatingSubject":null,"Categories":null,"SharedGroups":null,"TimingIDs":null,"Timings":null,"Disabled":null,"Factor":null,"Blocker":null},"Weight":10,"ActionsID":"LOG_WARNING","MinQueuedItems":0,"Executed":false,"LastExecutionTime":"0001-01-01T00:00:00Z"},{"ID":"STANDARD_TRIGGERS","UniqueID":"8b424186-7a31-4aef-99c5-35e12e6fed41","ThresholdType":"*max_balance","ThresholdValue":20,"Recurrent":false,"MinSleep":0,"ExpirationDate":"0001-01-01T00:00:00Z","ActivationDate":"0001-01-01T00:00:00Z","Balance":{"Uuid":null,"ID":null,"Type":"*monetary","Value":null,"Directions":{"*out":true},"ExpirationDate":null,"Weight":null,"DestinationIDs":null,"RatingSubject":null,"Categories":null,"SharedGroups":null,"TimingIDs":null,"Timings":null,"Disabled":null,"Factor":null,"Blocker":null},"Weight":10,"ActionsID":"LOG_WARNING","MinQueuedItems":0,"Executed":false,"LastExecutionTime":"0001-01-01T00:00:00Z"},{"ID":"STANDARD_TRIGGERS","UniqueID":"28557f3b-139c-4a27-9d17-bda1f54b7c19","ThresholdType":"*max_balance","ThresholdValue":100,"Recurrent":false,"MinSleep":0,"ExpirationDate":"0001-01-01T00:00:00Z","ActivationDate":"0001-01-01T00:00:00Z","Balance":{"Uuid":null,"ID":null,"Type":"*monetary","Value":null,"Directions":{"*out":true},"ExpirationDate":null,"Weight":null,"DestinationIDs":null,"RatingSubject":null,"Categories":null,"SharedGroups":null,"TimingIDs":null,"Timings":null,"Disabled":null,"Factor":null,"Blocker":null},"Weight":10,"ActionsID":"DISABLE_AND_LOG","MinQueuedItems":0,"Executed":false,"LastExecutionTime":"0001-01-01T00:00:00Z"}],"AllowNegative":false,"Disabled":false}"`) + args := ArgsReplyFailedPosts{ + FailedRequestsInDir: utils.StringPointer("/tmp/TestsApierV1/in"), + FailedRequestsOutDir: utils.StringPointer("/tmp/TestsApierV1/out"), } -}*/ + for _, dir := range []string{*args.FailedRequestsInDir, *args.FailedRequestsOutDir} { + if err := os.RemoveAll(dir); err != nil { + t.Errorf("Error %s removing folder: %s", err, dir) + } + if err := os.MkdirAll(dir, 0755); err != nil { + t.Errorf("Error %s creating folder: %s", err, dir) + } + } + fileOut, err := os.Create(path.Join(*args.FailedRequestsInDir, fileName)) + if err != nil { + t.Error(err) + } + defer fileOut.Close() + if _, err := fileOut.Write(fileContent); err != nil { + t.Error(err) + } + var reply string + if err := rater.Call("ApierV1.ReplayFailedPosts", args, &reply); err != nil { + t.Error(err) + } else if reply != utils.OK { + t.Error("Unexpected reply: ", reply) + } + outPath := path.Join(*args.FailedRequestsOutDir, fileName) + if outContent, err := ioutil.ReadFile(outPath); err != nil { + t.Error(err) + } else if !reflect.DeepEqual(fileContent, outContent) { + t.Errorf("Expecting: %q, received: %q", string(fileContent), string(outContent)) + } + for _, dir := range []string{*args.FailedRequestsInDir, *args.FailedRequestsOutDir} { + if err := os.RemoveAll(dir); err != nil { + t.Errorf("Error %s removing folder: %s", err, dir) + } + } +} // Simply kill the engine after we are done with tests within this file func TestApierStopEngine(t *testing.T) { diff --git a/data/conf/samples/apier/apier.json b/data/conf/samples/apier/apier.json index b88c9a2b9..4290c0ca3 100644 --- a/data/conf/samples/apier/apier.json +++ b/data/conf/samples/apier/apier.json @@ -6,6 +6,7 @@ "general": { "log_level": 7, + "poster_attempts": 1, }, diff --git a/engine/action.go b/engine/action.go index 3a249afa3..b3f220a5b 100644 --- a/engine/action.go +++ b/engine/action.go @@ -413,7 +413,7 @@ func callUrl(ub *Account, sq *StatsQueueTriggered, a *Action, acs Actions) error return err } cfg := config.CgrConfig() - ffn := &utils.FallbackFileName{Module: fmt.Sprintf("%s/%s", utils.ActionsPoster, a.ActionType), + ffn := &utils.FallbackFileName{Module: fmt.Sprintf("%s>%s", utils.ActionsPoster, a.ActionType), Transport: utils.MetaHTTPjson, Address: a.ExtraParameters, RequestID: utils.GenUUID(), FileSuffix: utils.JSNSuffix} _, err = utils.NewHTTPPoster(config.CgrConfig().HttpSkipTlsVerify, @@ -436,7 +436,7 @@ func callUrlAsync(ub *Account, sq *StatsQueueTriggered, a *Action, acs Actions) return err } cfg := config.CgrConfig() - ffn := &utils.FallbackFileName{Module: fmt.Sprintf("%s/%s", utils.ActionsPoster, a.ActionType), + ffn := &utils.FallbackFileName{Module: fmt.Sprintf("%s>%s", utils.ActionsPoster, a.ActionType), Transport: utils.MetaHTTPjson, Address: a.ExtraParameters, RequestID: utils.GenUUID(), FileSuffix: utils.JSNSuffix} go utils.NewHTTPPoster(config.CgrConfig().HttpSkipTlsVerify,