Added flag for tenant in cgr-loader

cmd/cgr-loader/cgr-loader.go

@@ -104,6 +104,7 @@ var (
 	remove         = cgrLoaderFlags.Bool(utils.RemoveCgr, false, "Will remove instead of adding data from DB")
 	apiKey         = cgrLoaderFlags.String(utils.APIKeyCfg, utils.EmptyString, "Api Key used to comosed ArgDispatcher")
 	routeID        = cgrLoaderFlags.String(utils.RouteIDCfg, utils.EmptyString, "RouteID used to comosed ArgDispatcher")
+	tenant         = cgrLoaderFlags.String(utils.TenantCfg, dfltCfg.GeneralCfg().DefaultTenant, "")
 
 	fromStorDB    = cgrLoaderFlags.Bool(utils.FromStorDBCgr, false, "Load the tariff plan from storDb to dataDb")
 	toStorDB      = cgrLoaderFlags.Bool(utils.ToStorDBcgr, false, "Import the tariff plan from files to storDb")
@@ -389,7 +390,7 @@ func main() {
 	if err = tpReader.ReloadCache(ldrCfg.GeneralCfg().DefaultCaching, *verbose, map[string]interface{}{
 		utils.OptsAPIKey:  *apiKey,
 		utils.OptsRouteID: *routeID,
-	}); err != nil {
+	}, *tenant); err != nil {
 		log.Fatal("Could not reload cache: ", err)
 	}
 

cmd/cgr-loader/cgr-loader_it_test.go

@@ -211,6 +211,8 @@ var (
 		testLoadItResetDataDB,
 		testLoadItResetStorDb,
 		testLoadItStartLoader,
+		// testLoadItStartLoaderFlushStorDB,
+		testLoadItStartLoaderWithTenant,
 		testLoadItConnectToDB,
 		testLoadItCheckAttributes,
 		testLoadItStartLoaderRemove,
@@ -362,6 +364,17 @@ func testLoadItStartLoaderFromStorDB(t *testing.T) {
 	}
 }
 
+func testLoadItStartLoaderWithTenant(t *testing.T) {
+	cmd := exec.Command("cgr-loader", "-config_path="+ldrItCfgPath, "-path="+path.Join(*dataDir, "tariffplans", "tutorial"), "-caches_address=", "-scheduler_address=", `-tenant="tenant.com"`)
+	output := bytes.NewBuffer(nil)
+	cmd.Stdout = output
+	if err := cmd.Run(); err != nil {
+		t.Log(cmd.Args)
+		t.Log(output.String())
+		t.Fatal(err)
+	}
+}
+
 func testLoadItStartLoaderFlushStorDB(t *testing.T) {
 	cmd := exec.Command("cgr-loader", "-config_path="+ldrItCfgPath, "-path="+path.Join(*dataDir, "tariffplans", "dispatchers"), "-caches_address=", "-scheduler_address=", "-to_stordb", "-flush_stordb", "-tpid=TPID")
 	output := bytes.NewBuffer(nil)

cmd/cgr-loader/flags_test.go

@@ -243,6 +243,12 @@ func TestCGRLoaderFlags(t *testing.T) {
 		t.Errorf("Expected route_idss, received %+v", *routeID)
 	}
 
+	if err := cgrLoaderFlags.Parse([]string{"-tenant", "tenant.com"}); err != nil {
+		t.Error(err)
+	} else if *tenant != "tenant.com" {
+		t.Errorf("Expected tenant.com, received %+v", *tenant)
+	}
+
 	if err := cgrLoaderFlags.Parse([]string{"-from_stordb", "true"}); err != nil {
 		t.Error(err)
 	} else if *fromStorDB != true {