network: Introduce constants for the network model strings

Introduce constants for the network model strings, so as to avoid using the strings directly at multiple places. Signed-off-by: Archana Shinde <[email protected]>
kata-containers · Oct 22, 2018 · 8152832 · 8152832
1 parent 71e7fa6
commit 8152832
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 10 deletions.
diff --git a/virtcontainers/network.go b/virtcontainers/network.go
@@ -65,22 +65,34 @@ func (n NetInterworkingModel) IsValid() bool {
 	return 0 <= int(n) && int(n) < int(NetXConnectInvalidModel)
 }
 
+const (
+	defaultNetModelStr = "default"
+
+	bridgedNetModelStr = "bridged"
+
+	macvtapNetModelStr = "macvtap"
+
+	enlightenedNetModelStr = "enlightened"
+
+	tcFilterNetModelStr = "tcfilter"
+)
+
 //SetModel change the model string value
 func (n *NetInterworkingModel) SetModel(modelName string) error {
 	switch modelName {
-	case "default":
+	case defaultNetModelStr:
 		*n = DefaultNetInterworkingModel
 		return nil
-	case "bridged":
+	case bridgedNetModelStr:
 		*n = NetXConnectBridgedModel
 		return nil
-	case "macvtap":
+	case macvtapNetModelStr:
 		*n = NetXConnectMacVtapModel
 		return nil
-	case "enlightened":
+	case enlightenedNetModelStr:
 		*n = NetXConnectEnlightenedModel
 		return nil
-	case "tcfilter":
+	case tcFilterNetModelStr:
 		*n = NetXConnectTCFilterModel
 		return nil
 	}

diff --git a/virtcontainers/network_test.go b/virtcontainers/network_test.go
@@ -213,11 +213,11 @@ func TestNetInterworkingModelSetModel(t *testing.T) {
 		wantErr   bool
 	}{
 		{"Invalid Model", "Invalid", true},
-		{"default Model", "default", false},
-		{"bridged Model", "bridged", false},
-		{"macvtap Model", "macvtap", false},
-		{"enlightened Model", "enlightened", false},
-		{"tcfilter Model", "tcfilter", false},
+		{"default Model", defaultNetModelStr, false},
+		{"bridged Model", bridgedNetModelStr, false},
+		{"macvtap Model", macvtapNetModelStr, false},
+		{"enlightened Model", enlightenedNetModelStr, false},
+		{"tcfilter Model", tcFilterNetModelStr, false},
 	}
 
 	for _, tt := range tests {