initContainer use long commands

linkernetworks · Aug 31, 2018 · 9b12b0e · 9b12b0e
1 parent a53be40
commit 9b12b0e
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 21 deletions.
diff --git a/src/deployment/deployment.go b/src/deployment/deployment.go
@@ -99,14 +99,14 @@ func generateClientCommand(network entity.DeploymentNetwork) (command []string)
 	ip := utils.IPToCIDR(network.IPAddress, network.Netmask)
 
 	command = []string{
-		"-s=unix:///tmp/vortex.sock",
-		"-b=" + network.BridgeName,
-		"-n=" + network.IfName,
-		"-i=" + ip,
+		"--server=unix:///tmp/vortex.sock",
+		"--bridge=" + network.BridgeName,
+		"--nic=" + network.IfName,
+		"--ip=" + ip,
 	}
 
 	if network.VlanTag != nil {
-		command = append(command, "-v="+strconv.Itoa((int)(*network.VlanTag)))
+		command = append(command, "--vlan="+strconv.Itoa((int)(*network.VlanTag)))
 	}
 	if len(network.RoutesGw) != 0 {
 		for _, netroute := range network.RoutesGw {

diff --git a/src/deployment/deployment_test.go b/src/deployment/deployment_test.go
@@ -260,14 +260,25 @@ func (suite *DeploymentTestSuite) TestGenerateClientCommand() {
 		BridgeName: bName,
 	}
 	command := generateClientCommand(deployNetwork)
-	ans := []string{"-s=unix:///tmp/vortex.sock", "-b=" + bName, "-n=" + ifName, "-i=1.2.3.4/24"}
+	ans := []string{
+		"--server=unix:///tmp/vortex.sock",
+		"--bridge=" + bName,
+		"--nic=" + ifName,
+		"--ip=1.2.3.4/24",
+	}
 	suite.Equal(ans, command)
 
 	var vlanTag int32
 	vlanTag = 123
 	deployNetwork.VlanTag = &vlanTag
 	command = generateClientCommand(deployNetwork)
-	ans = []string{"-s=unix:///tmp/vortex.sock", "-b=" + bName, "-n=" + ifName, "-i=1.2.3.4/24", "-v=123"}
+	ans = []string{
+		"--server=unix:///tmp/vortex.sock",
+		"--bridge=" + bName,
+		"--nic=" + ifName,
+		"--ip=1.2.3.4/24",
+		"--vlan=123",
+	}
 	suite.Equal(ans, command)
 
 }

diff --git a/src/pod/pod.go b/src/pod/pod.go
@@ -97,14 +97,14 @@ func generateClientCommand(network entity.PodNetwork) (command []string) {
 	ip := utils.IPToCIDR(network.IPAddress, network.Netmask)
 
 	command = []string{
-		"-s=unix:///tmp/vortex.sock",
-		"-b=" + network.BridgeName,
-		"-n=" + network.IfName,
-		"-i=" + ip,
+		"--server=unix:///tmp/vortex.sock",
+		"--bridge=" + network.BridgeName,
+		"--nic=" + network.IfName,
+		"--ip=" + ip,
 	}
 
 	if network.VlanTag != nil {
-		command = append(command, "-v="+strconv.Itoa((int)(*network.VlanTag)))
+		command = append(command, "--vlan="+strconv.Itoa((int)(*network.VlanTag)))
 	}
 	if len(network.RoutesGw) != 0 {
 		for _, netroute := range network.RoutesGw {

diff --git a/src/pod/pod_test.go b/src/pod/pod_test.go
@@ -273,10 +273,10 @@ func (suite *PodTestSuite) TestGenerateClientCommand() {
 	}
 	command := generateClientCommand(podNetwork)
 	ans := []string{
-		"-s=unix:///tmp/vortex.sock",
-		"-b=" + bName,
-		"-n=" + ifName,
-		"-i=1.2.3.4/24",
+		"--server=unix:///tmp/vortex.sock",
+		"--bridge=" + bName,
+		"--nic=" + ifName,
+		"--ip=1.2.3.4/24",
 		"--route-gw=192.168.2.0/24,192.168.2.254",
 		"--route-intf=192.168.3.0/24",
 	}
@@ -287,11 +287,11 @@ func (suite *PodTestSuite) TestGenerateClientCommand() {
 	podNetwork.VlanTag = &vlanTag
 	command = generateClientCommand(podNetwork)
 	ans = []string{
-		"-s=unix:///tmp/vortex.sock",
-		"-b=" + bName,
-		"-n=" + ifName,
-		"-i=1.2.3.4/24",
-		"-v=123",
+		"--server=unix:///tmp/vortex.sock",
+		"--bridge=" + bName,
+		"--nic=" + ifName,
+		"--ip=1.2.3.4/24",
+		"--vlan=123",
 		"--route-gw=192.168.2.0/24,192.168.2.254",
 		"--route-intf=192.168.3.0/24",
 	}