add: DeleteNode rm -rf /var/run/netns/hoge

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

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/shell/shell.go b/shell/shell.go
@@ -105,7 +105,7 @@ func ExecConf(nodeType string, nodeConfig NodeConfig) []string {
 }
 
 // DeleteNode Delete docker and netns
-func DeleteNode(node Node) string {
+func DeleteNode(node Node) []string {
 	var deleteCmd string
 	if node.Type == "docker" {
 		deleteCmd = fmt.Sprintf("docker stop %s", node.Name)
@@ -116,10 +116,14 @@ func DeleteNode(node Node) string {
 	} else {
 		// err := fmt.Errorf("not supported node type...")
 		// log.Fatal(err)
-		return ""
+		return []string{""}
 	}
 
-	return deleteCmd
+	deleteNsCmd := fmt.Sprintf("rm -rf /var/run/netns/%s", node.Name)
+
+	deleteNodeCmds := []string{deleteCmd, deleteNsCmd}
+
+	return deleteNodeCmds
 }
 
 // DeleteSwitch Delete bridge

diff --git a/shell/shell_test.go b/shell/shell_test.go
@@ -107,7 +107,7 @@ func TestDeleteNode(t *testing.T) {
 	tests := []struct {
 		name string
 		args args
-		want string
+		want []string
 	}{
 		{
 			name: "delete docker",
@@ -125,7 +125,7 @@ func TestDeleteNode(t *testing.T) {
 					},
 				},
 			},
-			want: "docker stop R1",
+			want: []string{"docker stop R1", "rm -rf /var/run/netns/R1"},
 		},
 		{
 			name: "delete netns",
@@ -142,7 +142,7 @@ func TestDeleteNode(t *testing.T) {
 					},
 				},
 			},
-			want: "ip netns del H1",
+			want: []string{"ip netns del H1", "rm -rf /var/run/netns/H1"},
 		},
 		{
 			name: "delete not support nodetype",
@@ -159,12 +159,12 @@ func TestDeleteNode(t *testing.T) {
 					},
 				},
 			},
-			want: "",
+			want: []string{""},
 		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if got := DeleteNode(tt.args.node); got != tt.want {
+			if got := DeleteNode(tt.args.node); !reflect.DeepEqual(got, tt.want) {
 				t.Errorf("DeleteNode() = %v, want %v", got, tt.want)
 			}
 		})