Add integration test for DeleteTPFromFolder

apier/v1/apier.go

@@ -825,9 +825,9 @@ func (self *ApierV1) LoadTariffPlanFromFolder(attrs utils.AttrLoadTpFromFolder,
 	return nil
 }
 
-// DeleteTariffPlanFromFolder will load the tarrifplan into TpReader object
+// DeleteTariffPlanFromFolder will load the tarrifplan from folder into TpReader object
 // and will delete if from database
-func (self *ApierV1) DeleteTariffPlanFromFolder(attrs utils.AttrLoadTpFromFolder, reply *string) error {
+func (self *ApierV1) DeleteTPFromFolder(attrs utils.AttrLoadTpFromFolder, reply *string) error {
 	// verify if FolderPath is present
 	if len(attrs.FolderPath) == 0 {
 		return fmt.Errorf("%s:%s", utils.ErrMandatoryIeMissing.Error(), "FolderPath")
@@ -866,7 +866,7 @@ func (self *ApierV1) DeleteTariffPlanFromFolder(attrs utils.AttrLoadTpFromFolder
 		return utils.NewErrServerError(err)
 	}
 	// reload cache
-	utils.Logger.Info("ApierV1.LoadTariffPlanFromFolder, reloading cache.")
+	utils.Logger.Info("ApierV1.DeleteTPFromFolder, reloading cache.")
 	if err := loader.ReloadCache(attrs.FlushDb, true, attrs.ArgDispatcher); err != nil {
 		return utils.NewErrServerError(err)
 	}
@@ -874,6 +874,42 @@ func (self *ApierV1) DeleteTariffPlanFromFolder(attrs utils.AttrLoadTpFromFolder
 	return nil
 }
 
+// DeleteTariffPlanFromFolder will load the tarrifplan from StorDB into TpReader object
+// and will delete if from database
+func (self *ApierV1) DeleteTPFromStorDB(attrs AttrLoadTpFromStorDb, reply *string) error {
+	if len(attrs.TPid) == 0 {
+		return utils.NewErrMandatoryIeMissing("TPid")
+	}
+	dbReader := engine.NewTpReader(self.DataManager.DataDB(), self.StorDb,
+		attrs.TPid, self.Config.GeneralCfg().DefaultTimezone,
+		self.CacheS, self.SchedulerS)
+	if err := dbReader.LoadAll(); err != nil {
+		return utils.NewErrServerError(err)
+	}
+	if attrs.Validate {
+		if !dbReader.IsValid() {
+			*reply = OK
+			return errors.New("invalid data")
+		}
+	}
+	if attrs.DryRun {
+		*reply = OK
+		return nil // Mission complete, no errors
+	}
+	// remove data from Database
+	if err := dbReader.RemoveFromDatabase(false, false); err != nil {
+		return utils.NewErrServerError(err)
+	}
+	// reload cache
+	utils.Logger.Info("ApierV1.DeleteTPFromStorDB, reloading cache.")
+	if err := dbReader.ReloadCache(attrs.FlushDb, true, attrs.ArgDispatcher); err != nil {
+		return utils.NewErrServerError(err)
+	}
+
+	*reply = OK
+	return nil
+}
+
 type AttrRemoveRatingProfile struct {
 	Direction string
 	Tenant    string

apier/v1/apier2_it_test.go

@@ -0,0 +1,139 @@
+// +build integration
+
+/*
+Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
+Copyright (C) ITsysCOM GmbH
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>
+*/
+
+package v1
+
+import (
+	"net/rpc"
+	"net/rpc/jsonrpc"
+	"path"
+	"testing"
+	"time"
+
+	"github.com/cgrates/cgrates/config"
+	"github.com/cgrates/cgrates/engine"
+	"github.com/cgrates/cgrates/utils"
+)
+
+var (
+	apierCfgPath   string
+	apierCfg       *config.CGRConfig
+	apierRPC       *rpc.Client
+	apierConfigDIR string //run tests for specific configuration
+)
+
+var sTestsAPIer = []func(t *testing.T){
+	testAPIerInitCfg,
+	testAPIerInitDataDb,
+	testAPIerResetStorDb,
+	testAPIerStartEngine,
+	testAPIerRPCConn,
+	testAPIerLoadFromFolder,
+	testAPIerDeleteTPFromFolder,
+	testAPIerAfterDelete,
+	testAPIerKillEngine,
+}
+
+//Test start here
+func TestAPIerIT(t *testing.T) {
+	apierConfigDIR = "tutmysql"
+	for _, stest := range sTestsAPIer {
+		t.Run(apierConfigDIR, stest)
+	}
+}
+
+func testAPIerInitCfg(t *testing.T) {
+	var err error
+	apierCfgPath = path.Join(costDataDir, "conf", "samples", apierConfigDIR)
+	apierCfg, err = config.NewCGRConfigFromPath(apierCfgPath)
+	if err != nil {
+		t.Error(err)
+	}
+	apierCfg.DataFolderPath = costDataDir // Share DataFolderPath through config towards StoreDb for Flush()
+	config.SetCgrConfig(apierCfg)
+}
+
+func testAPIerInitDataDb(t *testing.T) {
+	if err := engine.InitDataDb(apierCfg); err != nil {
+		t.Fatal(err)
+	}
+}
+
+// Wipe out the cdr database
+func testAPIerResetStorDb(t *testing.T) {
+	if err := engine.InitStorDb(apierCfg); err != nil {
+		t.Fatal(err)
+	}
+}
+
+// Start CGR Engine
+func testAPIerStartEngine(t *testing.T) {
+	if _, err := engine.StopStartEngine(apierCfgPath, *waitRater); err != nil {
+		t.Fatal(err)
+	}
+}
+
+// Connect rpc client to rater
+func testAPIerRPCConn(t *testing.T) {
+	var err error
+	apierRPC, err = jsonrpc.Dial("tcp", apierCfg.ListenCfg().RPCJSONListen) // We connect over JSON so we can also troubleshoot if needed
+	if err != nil {
+		t.Fatal(err)
+	}
+}
+
+func testAPIerLoadFromFolder(t *testing.T) {
+	var reply string
+	attrs := &utils.AttrLoadTpFromFolder{FolderPath: path.Join(*dataDir, "tariffplans", "tutorial")}
+	if err := apierRPC.Call("ApierV1.LoadTariffPlanFromFolder", attrs, &reply); err != nil {
+		t.Error(err)
+	}
+	time.Sleep(500 * time.Millisecond)
+}
+
+func testAPIerDeleteTPFromFolder(t *testing.T) {
+	var reply string
+	attrs := &utils.AttrLoadTpFromFolder{FolderPath: path.Join(*dataDir, "tariffplans", "tutorial")}
+	if err := apierRPC.Call("ApierV1.DeleteTPFromFolder", attrs, &reply); err != nil {
+		t.Error(err)
+	}
+	time.Sleep(500 * time.Millisecond)
+}
+
+func testAPIerAfterDelete(t *testing.T) {
+	var reply *engine.AttributeProfile
+	if err := apierRPC.Call("ApierV1.GetAttributeProfile",
+		&utils.TenantID{Tenant: "cgrates.org", ID: "ApierTest"}, &reply); err == nil ||
+		err.Error() != utils.ErrNotFound.Error() {
+		t.Fatal(err)
+	}
+	var replyTh *engine.ThresholdProfile
+	if err := apierRPC.Call("ApierV1.GetThresholdProfile",
+		&utils.TenantID{Tenant: "cgrates.org", ID: "THD_Test"}, &replyTh); err == nil ||
+		err.Error() != utils.ErrNotFound.Error() {
+		t.Error(err)
+	}
+}
+
+func testAPIerKillEngine(t *testing.T) {
+	if err := engine.KillEngine(*waitRater); err != nil {
+		t.Error(err)
+	}
+}