From bca4fb87f26411d5217e698fbcf8e05f931a8e05 Mon Sep 17 00:00:00 2001 From: andronache Date: Wed, 7 Jul 2021 16:20:41 +0300 Subject: [PATCH] Fixed integration tests failling --- dispatchers/responder_it_test.go | 14 +++++++------- general_tests/cacherpl_it_test.go | 4 ++-- registrarc/registrarc_it_test.go | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dispatchers/responder_it_test.go b/dispatchers/responder_it_test.go index 7aa6d6948..b69ccf700 100644 --- a/dispatchers/responder_it_test.go +++ b/dispatchers/responder_it_test.go @@ -78,13 +78,13 @@ func testDspResponderStatus(t *testing.T) { utils.OptsAPIKey: "rsp12345", }, } - if err := dispEngine.RPC.Call(utils.CoreSv1Status, &ev, &reply); err != nil { + if err := dispEngine.RPC.Call(utils.DispatcherSv1RemoteStatus, &ev, &reply); err != nil { t.Error(err) } else if reply[utils.NodeID] != "ALL" { t.Errorf("Received: %s", utils.ToJSON(reply)) } allEngine.stopEngine(t) - if err := dispEngine.RPC.Call(utils.CoreSv1Status, &ev, &reply); err != nil { + if err := dispEngine.RPC.Call(utils.DispatcherSv1RemoteStatus, &ev, &reply); err != nil { t.Error(err) } else if reply[utils.NodeID] != "ALL2" { t.Errorf("Received: %s", utils.ToJSON(reply)) @@ -114,12 +114,12 @@ func getNodeWithRoute(route string, t *testing.T) string { }, } - if err := dispEngine.RPC.Call(utils.CoreSv1Ping, pingEv, &pingReply); err != nil { + if err := dispEngine.RPC.Call(utils.DispatcherSv1RemotePing, pingEv, &pingReply); err != nil { t.Error(err) } else if pingReply != utils.Pong { t.Errorf("Received: %s", pingReply) } - if err := dispEngine.RPC.Call(utils.CoreSv1Status, ev, &reply); err != nil { + if err := dispEngine.RPC.Call(utils.DispatcherSv1RemoteStatus, ev, &reply); err != nil { t.Error(err) } if reply[utils.NodeID] == nil { @@ -152,7 +152,7 @@ func testDspResponderShutdown(t *testing.T) { } else if reply != "Done!" { t.Errorf("Received: %s", utils.ToJSON(reply)) } - if err := dispEngine.RPC.Call(utils.CoreSv1Status, &ev, &statusReply); err != nil { + if err := dispEngine.RPC.Call(utils.DispatcherSv1RemoteStatus, &ev, &statusReply); err != nil { t.Error(err) } else if statusReply[utils.NodeID] != "ALL2" { t.Errorf("Received: %s", utils.ToJSON(statusReply)) @@ -223,12 +223,12 @@ func testDspResponderInternal(t *testing.T) { utils.OptsRouteID: route, }, } - if err := dispEngine.RPC.Call(utils.CoreSv1Ping, pingEv, &pingReply); err != nil { + if err := dispEngine.RPC.Call(utils.DispatcherSv1RemotePing, pingEv, &pingReply); err != nil { t.Error(err) } else if pingReply != utils.Pong { t.Errorf("Received: %s", pingReply) } - if err := dispEngine.RPC.Call(utils.CoreSv1Status, &ev, &reply); err != nil { + if err := dispEngine.RPC.Call(utils.DispatcherSv1RemoteStatus, &ev, &reply); err != nil { t.Error(err) } if reply[utils.NodeID] == nil { diff --git a/general_tests/cacherpl_it_test.go b/general_tests/cacherpl_it_test.go index 5be8aad9e..04e6ce4c4 100644 --- a/general_tests/cacherpl_it_test.go +++ b/general_tests/cacherpl_it_test.go @@ -313,7 +313,7 @@ func testCacheRplPing(t *testing.T) { utils.OptsRouteID: "testRoute123", }, } - if err := dspEngine1RPC.Call(utils.CoreSv1Status, &ev, &reply); err != nil { + if err := dspEngine1RPC.Call(utils.DispatcherSv1RemoteStatus, &ev, &reply); err != nil { t.Error(err) } else if reply[utils.NodeID] != "Engine1" { t.Errorf("Received: %s", utils.ToJSON(reply)) @@ -338,7 +338,7 @@ func testCacheRplCheckReplication(t *testing.T) { ev := utils.TenantWithAPIOpts{ Tenant: "cgrates.org", } - if err := dspEngine2RPC.Call(utils.CoreSv1Status, &ev, &reply); err != nil { + if err := dspEngine2RPC.Call(utils.DispatcherSv1RemoteStatus, &ev, &reply); err != nil { t.Error(err) } else if reply[utils.NodeID] != "DispatcherEngine2" { t.Errorf("Received: %s", utils.ToJSON(reply)) diff --git a/registrarc/registrarc_it_test.go b/registrarc/registrarc_it_test.go index 2dcedfefe..04c3b6745 100644 --- a/registrarc/registrarc_it_test.go +++ b/registrarc/registrarc_it_test.go @@ -127,7 +127,7 @@ func testDsphLoadData(t *testing.T) { func testDsphGetNodeID() (id string, err error) { var status map[string]interface{} - if err = dspRPC.Call(utils.CoreSv1Status, utils.TenantWithAPIOpts{ + if err = dspRPC.Call(utils.DispatcherSv1RemoteStatus, utils.TenantWithAPIOpts{ Tenant: "cgrates.org", APIOpts: map[string]interface{}{}, }, &status); err != nil {