pass test

Author: jschwinger233

strategy/fill_global.go

@@ -5,6 +5,7 @@ import (
 	"github.com/projecteru2/core/types"
 )
 
+// FillGlobalPlan try fill strategy and fallback to global strategy
 func FillGlobalPlan(strategyInfo []Info, need, total, limit int, resourceType types.ResourceType) (map[string]int, error) {
 	originStrategyInfo := make([]Info, len(strategyInfo))
 	copy(originStrategyInfo, strategyInfo)
@@ -13,6 +14,6 @@ func FillGlobalPlan(strategyInfo []Info, need, total, limit int, resourceType ty
 	if err == nil {
 		return deployMap, nil
 	}
-	log.Info("[FillGlobalPlan] fill plan failed, try global fill: %+v", err)
+	log.Infof("[FillGlobalPlan] fill plan failed, try global fill: %+v", err)
 	return GlobalPlan(originStrategyInfo, need, total, limit, resourceType)
 }

strategy/fillglobal_test.go

@@ -0,0 +1,48 @@
+package strategy
+
+import (
+	"testing"
+
+	"github.com/projecteru2/core/types"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestFillGlobalPlan(t *testing.T) {
+	// can fill
+	strategyInfos := []Info{
+		{
+			Nodename: "n1",
+			Capacity: 10,
+			Count:    1,
+		},
+		{
+			Nodename: "n2",
+			Capacity: 10,
+			Count:    0,
+		},
+	}
+	deployMap, err := FillPlan(strategyInfos, 1, 2, 1, types.ResourceAll)
+	assert.Nil(t, err)
+	assert.EqualValues(t, 0, deployMap["n1"])
+	assert.EqualValues(t, 1, deployMap["n2"])
+	deployMap, err = FillGlobalPlan(strategyInfos, 1, 2, 1, types.ResourceAll)
+	assert.Nil(t, err)
+	assert.EqualValues(t, 0, deployMap["n1"])
+	assert.EqualValues(t, 1, deployMap["n2"])
+
+	// can't fill
+	strategyInfos = []Info{
+		{
+			Nodename: "n1",
+			Capacity: 10,
+			Count:    1,
+			Usages:   map[types.ResourceType]float64{types.ResourceAll: 0.1},
+			Rates:    map[types.ResourceType]float64{types.ResourceAll: 0.1},
+		},
+	}
+	_, err = FillPlan(strategyInfos, 1, 2, 1, types.ResourceAll)
+	assert.EqualError(t, err, "Cannot alloc a fill node plan, each node has enough workloads")
+	deployMap, err = FillGlobalPlan(strategyInfos, 1, 2, 1, types.ResourceAll)
+	assert.Nil(t, err)
+	assert.EqualValues(t, 1, deployMap["n1"])
+}

strategy/strategy.go

@@ -18,7 +18,7 @@ const (
 	Each = "EACH"
 	// Global .
 	Global = "GLOBAL"
-	// Fill + Global
+	// FillGlobal .
 	FillGlobal = "FILLGLOBAL"
 	// Dummy for calculate capacity
 	Dummy = "DUMMY"