From fcc0344fcbdd0d741c7a56b9e0f22ae4bdc71134 Mon Sep 17 00:00:00 2001
From: TeoV <teofil.voivozeanu@itsyscom.com>
Date: Mon, 19 Aug 2019 15:17:22 +0300
Subject: [PATCH] Change from LoadValue to Load for Suppliers

---
 engine/libsuppliers.go      |  4 ++--
 engine/libsuppliers_test.go | 18 +++++++++---------
 engine/suppliers.go         |  2 +-
 utils/consts.go             |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/engine/libsuppliers.go b/engine/libsuppliers.go
index a92119de0..466ffe5d2 100644
--- a/engine/libsuppliers.go
+++ b/engine/libsuppliers.go
@@ -147,8 +147,8 @@ func (sSpls *SortedSuppliers) SortResourceDescendent() {
 // sort based on the following formula (float64(ratio + metricVal) / float64(ratio)) -1 with fallback on Weight
 func (sSpls *SortedSuppliers) SortLoadDistribution() {
 	sort.Slice(sSpls.SortedSuppliers, func(i, j int) bool {
-		splIVal := ((sSpls.SortedSuppliers[i].SortingData[utils.Ratio].(float64)+sSpls.SortedSuppliers[i].SortingData[utils.LoadValue].(float64))/sSpls.SortedSuppliers[i].SortingData[utils.Ratio].(float64) - 1.0)
-		splJVal := ((sSpls.SortedSuppliers[j].SortingData[utils.Ratio].(float64)+sSpls.SortedSuppliers[j].SortingData[utils.LoadValue].(float64))/sSpls.SortedSuppliers[j].SortingData[utils.Ratio].(float64) - 1.0)
+		splIVal := ((sSpls.SortedSuppliers[i].SortingData[utils.Ratio].(float64)+sSpls.SortedSuppliers[i].SortingData[utils.Load].(float64))/sSpls.SortedSuppliers[i].SortingData[utils.Ratio].(float64) - 1.0)
+		splJVal := ((sSpls.SortedSuppliers[j].SortingData[utils.Ratio].(float64)+sSpls.SortedSuppliers[j].SortingData[utils.Load].(float64))/sSpls.SortedSuppliers[j].SortingData[utils.Ratio].(float64) - 1.0)
 		if splIVal == splJVal {
 			return sSpls.SortedSuppliers[i].SortingData[utils.Weight].(float64) > sSpls.SortedSuppliers[j].SortingData[utils.Weight].(float64)
 		}
diff --git a/engine/libsuppliers_test.go b/engine/libsuppliers_test.go
index 53b9c4159..55366a2d4 100644
--- a/engine/libsuppliers_test.go
+++ b/engine/libsuppliers_test.go
@@ -637,25 +637,25 @@ func TestLibSuppliersSortLoadDistribution(t *testing.T) {
 			&SortedSupplier{
 				SupplierID: "supplier1",
 				SortingData: map[string]interface{}{
-					utils.Weight:    25.0,
-					utils.Ratio:     4.0,
-					utils.LoadValue: 3.0,
+					utils.Weight: 25.0,
+					utils.Ratio:  4.0,
+					utils.Load:   3.0,
 				},
 			},
 			&SortedSupplier{
 				SupplierID: "supplier2",
 				SortingData: map[string]interface{}{
-					utils.Weight:    15.0,
-					utils.Ratio:     10.0,
-					utils.LoadValue: 5.0,
+					utils.Weight: 15.0,
+					utils.Ratio:  10.0,
+					utils.Load:   5.0,
 				},
 			},
 			&SortedSupplier{
 				SupplierID: "supplier3",
 				SortingData: map[string]interface{}{
-					utils.Weight:    25.0,
-					utils.Ratio:     1.0,
-					utils.LoadValue: 1.0,
+					utils.Weight: 25.0,
+					utils.Ratio:  1.0,
+					utils.Load:   1.0,
 				},
 			},
 		},
diff --git a/engine/suppliers.go b/engine/suppliers.go
index 2384a9b71..d852f0a87 100644
--- a/engine/suppliers.go
+++ b/engine/suppliers.go
@@ -443,7 +443,7 @@ func (spS *SupplierService) populateSortingData(ev *utils.CGREvent, spl *Supplie
 					return nil, false, err
 				}
 			}
-			sortedSpl.SortingData[utils.LoadValue] = metricSum
+			sortedSpl.SortingData[utils.Load] = metricSum
 		} else {
 			metricSupp, err := spS.statMetrics(spl.StatIDs, ev.Tenant) //create metric map for suppier
 			if err != nil {
diff --git a/utils/consts.go b/utils/consts.go
index 2ca0af2f3..88660a272 100755
--- a/utils/consts.go
+++ b/utils/consts.go
@@ -565,7 +565,7 @@ const (
 	MetaAccount                 = "*account"
 	ERs                         = "ERs"
 	Ratio                       = "Ratio"
-	LoadValue                   = "LoadValue"
+	Load                        = "Load"
 )
 
 // Migrator Action