Merge branch 'master' of https://github.com/cgrates/cgrates

Conflicts:
	engine/loader_csv_test.go
	engine/loader_it_test.go
	engine/tp_reader.go

engine/tp_reader.go

@@ -52,7 +52,12 @@ type TpReader struct {
 	cdrStats         map[string]*CdrStats
 	users            map[string]*UserProfile
 	aliases          map[string]*Alias
+<<<<<<< HEAD
 	resProfiles      map[string]*utils.TPResource
+=======
+	resCfgs          map[string]*utils.TPResource
+	res              []string // IDs of resources which need creation based on resourceConfigs
+>>>>>>> dd8afa24867e3d532c7a2b81fc8070aceec07dad
 	stats            map[string]*utils.TPStats
 	thresholds       map[string]*utils.TPThreshold
 
@@ -126,7 +131,11 @@ func (tpr *TpReader) Init() {
 	tpr.users = make(map[string]*UserProfile)
 	tpr.aliases = make(map[string]*Alias)
 	tpr.derivedChargers = make(map[string]*utils.DerivedChargers)
+<<<<<<< HEAD
 	tpr.resProfiles = make(map[string]*utils.TPResource)
+=======
+	tpr.resCfgs = make(map[string]*utils.TPResource)
+>>>>>>> dd8afa24867e3d532c7a2b81fc8070aceec07dad
 	tpr.stats = make(map[string]*utils.TPStats)
 	tpr.thresholds = make(map[string]*utils.TPThreshold)
 	tpr.revDests = make(map[string][]string)
@@ -1600,7 +1609,18 @@ func (tpr *TpReader) LoadResourceProfilesFiltered(tag string) error {
 	for _, rl := range rls {
 		mapRsPs[rl.ID] = rl
 	}
+<<<<<<< HEAD
 	tpr.resProfiles = mapRsPs
+=======
+	tpr.resCfgs = mapRLs
+	for rID := range mapRLs {
+		if has, err := tpr.dataStorage.HasData(utils.ResourcesPrefix, rID); err != nil {
+			return err
+		} else if !has {
+			tpr.res = append(tpr.res, rID)
+		}
+	}
+>>>>>>> dd8afa24867e3d532c7a2b81fc8070aceec07dad
 	return nil
 }
 
@@ -1933,10 +1953,37 @@ func (tpr *TpReader) WriteToDatabase(flush, verbose, disable_reverse bool) (err
 		}
 	}
 	if verbose {
+<<<<<<< HEAD
 		log.Print("ResourceProfiles:")
 	}
 	for _, tpRsp := range tpr.resProfiles {
 		rsp, err := APItoResource(tpRsp, tpr.timezone)
+=======
+		log.Print("ResourceConfigs:")
+	}
+	for _, tpRL := range tpr.resCfgs {
+		rl, err := APItoResource(tpRL, tpr.timezone)
+		if err != nil {
+			return err
+		}
+		if err = tpr.dataStorage.SetResourceCfg(rl, utils.NonTransactional); err != nil {
+			return err
+		}
+		if verbose {
+			log.Print("\t", rl.ID)
+		}
+	}
+	if verbose {
+		log.Print("Resources:")
+	}
+	for _, rID := range tpr.res {
+		if err = tpr.dataStorage.SetResource(&Resource{ID: rID, Usages: make(map[string]*ResourceUsage)}); err != nil {
+			return
+		}
+	}
+	for _, tpRL := range tpr.resCfgs {
+		rl, err := APItoResource(tpRL, tpr.timezone)
+>>>>>>> dd8afa24867e3d532c7a2b81fc8070aceec07dad
 		if err != nil {
 			return err
 		}
@@ -2013,7 +2060,11 @@ func (tpr *TpReader) WriteToDatabase(flush, verbose, disable_reverse bool) (err
 				return err
 			}
 		}
+<<<<<<< HEAD
 		if len(tpr.resProfiles) > 0 {
+=======
+		if len(tpr.resCfgs) > 0 {
+>>>>>>> dd8afa24867e3d532c7a2b81fc8070aceec07dad
 			if verbose {
 				log.Print("Indexing resource profiles")
 			}
@@ -2021,7 +2072,11 @@ func (tpr *TpReader) WriteToDatabase(flush, verbose, disable_reverse bool) (err
 			if err != nil {
 				return err
 			}
+<<<<<<< HEAD
 			for _, tpRL := range tpr.resProfiles {
+=======
+			for _, tpRL := range tpr.resCfgs {
+>>>>>>> dd8afa24867e3d532c7a2b81fc8070aceec07dad
 				if rl, err := APItoResource(tpRL, tpr.timezone); err != nil {
 					return err
 				} else {
@@ -2141,7 +2196,11 @@ func (tpr *TpReader) ShowStatistics() {
 	// cdr stats
 	log.Print("CDR stats: ", len(tpr.cdrStats))
 	// resource limits
+<<<<<<< HEAD
 	log.Print("ResourceProfiles: ", len(tpr.resProfiles))
+=======
+	log.Print("ResourceLimits: ", len(tpr.resCfgs))
+>>>>>>> dd8afa24867e3d532c7a2b81fc8070aceec07dad
 	// stats
 	log.Print("Stats: ", len(tpr.stats))
 }
@@ -2253,10 +2312,17 @@ func (tpr *TpReader) GetLoadedIds(categ string) ([]string, error) {
 			i++
 		}
 		return keys, nil
+<<<<<<< HEAD
 	case utils.ResourceProfilesPrefix:
 		keys := make([]string, len(tpr.resProfiles))
 		i := 0
 		for k := range tpr.resProfiles {
+=======
+	case utils.ResourceConfigsPrefix:
+		keys := make([]string, len(tpr.resCfgs))
+		i := 0
+		for k := range tpr.resCfgs {
+>>>>>>> dd8afa24867e3d532c7a2b81fc8070aceec07dad
 			keys[i] = k
 			i++
 		}