From 7026de3ac17a9acca9f94b4214600f41ab3547a1 Mon Sep 17 00:00:00 2001 From: Hiroki Shirokura Date: Fri, 31 Jan 2020 14:49:33 +0900 Subject: [PATCH] Fix down behavior --- internal/pkg/shell/shell.go | 6 ++---- internal/pkg/shell/shell_test.go | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/internal/pkg/shell/shell.go b/internal/pkg/shell/shell.go index 603efe9..7877cf3 100644 --- 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 index 23eea22..0a293e3 100644 --- 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",