Fix typo and rename variable

linkernetworks · Aug 1, 2018 · 299d289 · 299d289
1 parent 99cd36f
commit 299d289
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/entity/pod.go b/src/entity/pod.go
@@ -60,7 +60,7 @@ type Pod struct {
 	Networks      []PodNetwork      `bson:"networks,omitempty" json:"networks" validate:"required,dive,required"`
 	RestartPolicy string            `bson:"restartPolicy" json:"restartPolicy" validate:"required,eq=Always|eq=OnFailure|eq=Never`
 	Capability    bool              `bson:"capability" json:"capability" validate:"-"`
-	NetworkType   string            `bson:"networkType" json:"networkType" validate:"required,eq=Host|Cluster|Custom`
+	NetworkType   string            `bson:"networkType" json:"networkType" validate:"required,eq=host|cluster|custom`
 	NodeAffinity  []string          `bson:"nodeAffinity" json:"nodeAffinity" validate:"required"`
 }
 

diff --git a/src/pod/pod.go b/src/pod/pod.go
@@ -231,7 +231,7 @@ func CreatePod(sp *serviceprovider.Container, pod *entity.Pod) error {
 		return err
 	}
 
-	nodeNames := pod.NodeAffinity
+	nodeAffinity := pod.NodeAffinity
 	initContainers := []corev1.Container{}
 	hostNetwork := false
 	switch pod.NetworkType {
@@ -241,10 +241,10 @@ func CreatePod(sp *serviceprovider.Container, pod *entity.Pod) error {
 		tmp := []string{}
 		tmp, initContainers, err = generateNetwork(session, pod)
 		if len(tmp) != 0 {
-			nodeNames = utils.Intersection(nodeNames, tmp)
+			nodeAffinity = utils.Intersection(nodeAffinity, tmp)
 		}
 	case entity.PodClusterNetwork:
-		//For cluster network, we won't set the nodeAffinity and any netwokr options.
+		//For cluster network, we won't set the nodeAffinity and any network options.
 	default:
 		err = fmt.Errorf("UnSupported Pod NetworkType %s", pod.NetworkType)
 	}
@@ -283,7 +283,7 @@ func CreatePod(sp *serviceprovider.Container, pod *entity.Pod) error {
 			InitContainers: initContainers,
 			Containers:     containers,
 			Volumes:        volumes,
-			Affinity:       generateAffinity(nodeNames),
+			Affinity:       generateAffinity(nodeAffinity),
 			RestartPolicy:  corev1.RestartPolicy(pod.RestartPolicy),
 			HostNetwork:    hostNetwork,
 		},

diff --git a/src/server/handler_pod_test.go b/src/server/handler_pod_test.go
@@ -243,7 +243,7 @@ func (suite *PodTestSuite) TestGetPodWithInvalidID() {
 }
 
 func (suite *PodTestSuite) TestListPod() {
-	/*namespace := "default"
+	namespace := "default"
 	pods := []entity.Pod{}
 	count := 3
 	for i := 0; i < count; i++ {
@@ -302,7 +302,7 @@ func (suite *PodTestSuite) TestListPod() {
 				suite.Equal(len(pods[i].Containers), len(p.Containers))
 			}
 		})
-	}*/
+	}
 }
 
 func (suite *PodTestSuite) TestListPodWithInvalidPage() {