Fix down behavior

tinynetwork · Jan 31, 2020 · 7026de3 · 7026de3
1 parent ca1a920
commit 7026de3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/internal/pkg/shell/shell.go b/internal/pkg/shell/shell.go
@@ -124,12 +124,10 @@ func (nodeConfig *NodeConfig) ExecConf(nodeType string) []string {
 // DeleteNode Delete docker and netns
 func (node *Node) DeleteNode() []string {
 	var deleteCmd string
-	if node.Type == "docker" {
-		deleteCmd = fmt.Sprintf("docker stop %s", node.Name)
+	if node.Type == "docker" || node.Type == "" {
+		deleteCmd = fmt.Sprintf("docker rm -f %s", node.Name)
 	} else if node.Type == "netns" {
 		deleteCmd = fmt.Sprintf("ip netns del %s", node.Name)
-	} else if node.Type == "" {
-		deleteCmd = fmt.Sprintf("docker stop %s", node.Name)
 	} else {
 		// err := fmt.Errorf("not supported node type...")
 		// log.Fatal(err)

diff --git a/internal/pkg/shell/shell_test.go b/internal/pkg/shell/shell_test.go
@@ -136,7 +136,7 @@ func TestNode_DeleteNode(t *testing.T) {
 					},
 				},
 			},
-			want: []string{"docker stop R1", "rm -rf /var/run/netns/R1"},
+			want: []string{"docker rm -f R1", "rm -rf /var/run/netns/R1"},
 		},
 		{
 			name: "delete netns",