Merge pull request #118 from linkernetworks/hwchiu/VX-192

Fix the parameter order
linkernetworks · Jul 19, 2018 · 88a1a25 · 88a1a25
2 parents 7647229 + 9bfa64e
commit 88a1a25
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/pod/pod.go b/src/pod/pod.go
@@ -61,7 +61,7 @@ func CheckPodParameter(sp *serviceprovider.Container, pod *entity.Pod) error {
 	return nil
 }
 
-func generateVolume(pod *entity.Pod, session *mongo.Session) ([]corev1.Volume, []corev1.VolumeMount, error) {
+func generateVolume(session *mongo.Session, pod *entity.Pod) ([]corev1.Volume, []corev1.VolumeMount, error) {
 	volumes := []corev1.Volume{}
 	volumeMounts := []corev1.VolumeMount{}
 
@@ -167,7 +167,7 @@ func generateInitContainer(networks []entity.PodNetwork) ([]corev1.Container, er
 //For the network, we will generate two things
 //[]string => a list of nodes and it will apply on nodeaffinity
 //[]corev1.Container => a list of init container we will apply on pod
-func generateNetwork(pod *entity.Pod, session *mongo.Session) ([]string, []corev1.Container, error) {
+func generateNetwork(session *mongo.Session, pod *entity.Pod) ([]string, []corev1.Container, error) {
 
 	networks := []entity.Network{}
 	containers := []corev1.Container{}
@@ -212,12 +212,12 @@ func CreatePod(sp *serviceprovider.Container, pod *entity.Pod) error {
 	session := sp.Mongo.NewSession()
 	defer session.Close()
 
-	volumes, volumeMounts, err := generateVolume(pod, session)
+	volumes, volumeMounts, err := generateVolume(session, pod)
 	if err != nil {
 		return err
 	}
 
-	nodeNames, initContainers, err := generateNetwork(pod, session)
+	nodeNames, initContainers, err := generateNetwork(session, pod)
 	if err != nil {
 		return err
 	}

diff --git a/src/pod/pod_test.go b/src/pod/pod_test.go
@@ -136,7 +136,7 @@ func (suite *PodTestSuite) TestGenerateVolume() {
 	session.Insert(entity.VolumeCollectionName, volume)
 	defer session.Remove(entity.VolumeCollectionName, "name", volume.Name)
 
-	volumes, volumeMounts, err := generateVolume(pod, session)
+	volumes, volumeMounts, err := generateVolume(session, pod)
 	suite.NotNil(volumes)
 	suite.NotNil(volumeMounts)
 	suite.NoError(err)
@@ -153,7 +153,7 @@ func (suite *PodTestSuite) TestGenerateVolumeFail() {
 
 	session := suite.sp.Mongo.NewSession()
 	defer session.Close()
-	volumes, volumeMounts, err := generateVolume(pod, session)
+	volumes, volumeMounts, err := generateVolume(session, pod)
 	suite.Nil(volumes)
 	suite.Nil(volumeMounts)
 	suite.Error(err)
@@ -307,7 +307,7 @@ func (suite *PodTestSuite) TestGenerateNetwork() {
 		},
 	}
 
-	nodes, containers, err := generateNetwork(pod, session)
+	nodes, containers, err := generateNetwork(session, pod)
 	suite.NoError(err)
 	suite.Equal(1, len(containers))
 	suite.Equal(0, len(nodes))
@@ -333,7 +333,7 @@ func (suite *PodTestSuite) TestGenerateNetworkFail() {
 	session := suite.sp.Mongo.NewSession()
 	defer session.Close()
 
-	nodes, containers, err := generateNetwork(pod, session)
+	nodes, containers, err := generateNetwork(session, pod)
 	suite.Error(err)
 	suite.Nil(nodes)
 	suite.Nil(containers)