make test passed

linkernetworks · Oct 4, 2018 · a82fe05 · a82fe05
1 parent 7532f4a
commit a82fe05
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 15 deletions.
diff --git a/src/deployment/deployment_test.go b/src/deployment/deployment_test.go
@@ -168,9 +168,11 @@ func (suite *DeploymentTestSuite) TestGenerateConfigMap() {
 func (suite *DeploymentTestSuite) TestCreateDeployment() {
 	containers := []entity.Container{
 		{
-			Name:    namesgenerator.GetRandomName(0),
-			Image:   "busybox",
-			Command: []string{"sleep", "3600"},
+			Name:                  namesgenerator.GetRandomName(0),
+			Image:                 "busybox",
+			Command:               []string{"sleep", "3600"},
+			ResourceRequestCPU:    40,
+			ResourceRequestMemory: 0,
 		},
 	}
 
@@ -195,9 +197,11 @@ func (suite *DeploymentTestSuite) TestCreateDeployment() {
 func (suite *DeploymentTestSuite) TestCreateDeploymentFailWithoutVolume() {
 	containers := []entity.Container{
 		{
-			Name:    namesgenerator.GetRandomName(0),
-			Image:   "busybox",
-			Command: []string{"sleep", "3600"},
+			Name:                  namesgenerator.GetRandomName(0),
+			Image:                 "busybox",
+			Command:               []string{"sleep", "3600"},
+			ResourceRequestCPU:    0,
+			ResourceRequestMemory: 0,
 		},
 	}
 
@@ -218,9 +222,11 @@ func (suite *DeploymentTestSuite) TestCreateDeploymentFailWithoutVolume() {
 func (suite *DeploymentTestSuite) TestCreateDeploymentFailWithoutNetwork() {
 	containers := []entity.Container{
 		{
-			Name:    namesgenerator.GetRandomName(0),
-			Image:   "busybox",
-			Command: []string{"sleep", "3600"},
+			Name:                  namesgenerator.GetRandomName(0),
+			Image:                 "busybox",
+			Command:               []string{"sleep", "3600"},
+			ResourceRequestCPU:    0,
+			ResourceRequestMemory: 0,
 		},
 	}
 
@@ -482,9 +488,11 @@ func (suite *DeploymentTestSuite) TestCreateDeploymentWithNetworkTypes() {
 func (suite *DeploymentTestSuite) TestCreateDeploymentWithAutoscaler() {
 	containers := []entity.Container{
 		{
-			Name:    namesgenerator.GetRandomName(0),
-			Image:   "busybox",
-			Command: []string{"sleep", "3600"},
+			Name:                  namesgenerator.GetRandomName(0),
+			Image:                 "busybox",
+			Command:               []string{"sleep", "3600"},
+			ResourceRequestCPU:    0,
+			ResourceRequestMemory: 30,
 		},
 	}
 

diff --git a/src/entity/deployment.go b/src/entity/deployment.go
@@ -72,7 +72,7 @@ type Deployment struct {
 	Capability                  bool                `bson:"capability" json:"capability" validate:"-"`
 	NetworkType                 string              `bson:"networkType" json:"networkType" validate:"required,eq=host|eq=cluster|eq=custom"`
 	NodeAffinity                []string            `bson:"nodeAffinity" json:"nodeAffinity" validate:"required"`
-	IsCapableAutoscaleResources []string            `bson:"isCapableAutoscaleResources" json:"isCapableAutoscaleResources" validate:"required,dive,required,eq=memory|eq=cpu"`
+	IsCapableAutoscaleResources []string            `bson:"isCapableAutoscaleResources" json:"isCapableAutoscaleResources" validate:"-"`
 	IsEnableAutoscale           bool                `bson:"isEnableAutoscale" json:"isEnableAutoscale" validate:"-"`
 	AutoscalerInfo              AutoscalerInfo      `bson:"autoscalerInfo" json:"autoscalerInfo" validate:"-"`
 	CreatedBy                   User                `json:"createdBy" validate:"-"`

diff --git a/tests/05-deployment/deployment.info b/tests/05-deployment/deployment.info
@@ -5,7 +5,7 @@
         "myip":"1.2.3.4"
     },
 	"namespace":"default",
-    "isCapableAutoscaleResources": [],
+    "isCapableAutoscaleResources":[],
 	"containers":[
 		{
 			"name":"first-container",

diff --git a/tests/07-ovs/deployment.info b/tests/07-ovs/deployment.info
@@ -3,11 +3,14 @@
 	"labels":{},
     "envVars":{},
 	"namespace":"default",
+    "isCapableAutoscaleResources":[],
 	"containers":[
 		{
 			"name":"first-container",
 			"image":"busybox",
-            "command":["sleep","3600"]
+            "command":["sleep","3600"],
+            "resourceRequestCPU": 0,
+            "resourceRequestMemory": 0
 		}
 	],
 	"networks":[