modified: delete -it from execconf, exec

tinynetwork · Dec 12, 2019 · e412e80 · e412e80
1 parent 1df611a
commit e412e80
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/shell/shell.go b/shell/shell.go
@@ -87,11 +87,11 @@ func ExecConf(nodeType string, nodeConfig NodeConfig) []string {
 	for _, nodeConfigCmd := range nodeConfig.Cmds {
 		var execConfCmd string
 		if nodeType == "docker" {
-			execConfCmd = fmt.Sprintf("docker exec -it %s %s", nodeConfig.Name, nodeConfigCmd.Cmd)
+			execConfCmd = fmt.Sprintf("docker exec %s %s", nodeConfig.Name, nodeConfigCmd.Cmd)
 		} else if nodeType == "netns" {
 			execConfCmd = fmt.Sprintf("ip netns exec %s %s", nodeConfig.Name, nodeConfigCmd.Cmd)
 		} else if nodeType == "" {
-			execConfCmd = fmt.Sprintf("docker exec -it %s %s", nodeConfig.Name, nodeConfigCmd.Cmd)
+			execConfCmd = fmt.Sprintf("docker exec %s %s", nodeConfig.Name, nodeConfigCmd.Cmd)
 		} else {
 			// err := fmt.Errorf("not supported node type...")
 			// log.Fatal(err)
@@ -145,11 +145,11 @@ func (tnconfig *Tn) Exec(nodeName string, Cmds []string) string {
 	}
 
 	if selectedNode.Type == "docker" {
-		execCommand = fmt.Sprintf("docker exec -it %s", nodeName)
+		execCommand = fmt.Sprintf("docker exec %s", nodeName)
 	} else if selectedNode.Type == "netns" {
 		execCommand = fmt.Sprintf("ip netns exec %s", nodeName)
 	} else if selectedNode.Type == "" {
-		execCommand = fmt.Sprintf("docker exec -it %s", nodeName)
+		execCommand = fmt.Sprintf("docker exec %s", nodeName)
 	} else {
 		err := fmt.Errorf("no such node type...\n")
 		log.Fatal(err)

diff --git a/shell/shell_test.go b/shell/shell_test.go
@@ -55,7 +55,7 @@ func TestExecConf(t *testing.T) {
 					},
 				},
 			},
-			want: []string{"docker exec -it R1 /usr/lib/frr/frr start", "docker exec -it R1 ip addr add 10.0.0.1/24 dev net0", "docker exec -it R1 vtysh -c 'conf t' -c 'router bgp 65001' -c 'bgp router-id 10.255.0.1' -c 'neighbor 10.0.0.2 remote-as 65002'"},
+			want: []string{"docker exec R1 /usr/lib/frr/frr start", "docker exec R1 ip addr add 10.0.0.1/24 dev net0", "docker exec R1 vtysh -c 'conf t' -c 'router bgp 65001' -c 'bgp router-id 10.255.0.1' -c 'neighbor 10.0.0.2 remote-as 65002'"},
 		},
 		{
 			name: "ip netns exec",