From 6a5ad9208d0b0e65c9daaaedd3e7df46fcc7bf08 Mon Sep 17 00:00:00 2001 From: Zexi Li Date: Mon, 3 Sep 2018 12:18:53 +0800 Subject: [PATCH] =?UTF-8?q?region:=20=E6=94=AF=E6=8C=81=20container=20netw?= =?UTF-8?q?ork?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/compute/models/networks.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/compute/models/networks.go b/pkg/compute/models/networks.go index e4df6a1ea0..c4864dd3ee 100644 --- a/pkg/compute/models/networks.go +++ b/pkg/compute/models/networks.go @@ -13,6 +13,7 @@ import ( "yunion.io/x/pkg/util/fileutils" "yunion.io/x/pkg/util/netutils" "yunion.io/x/pkg/util/regutils" + "yunion.io/x/pkg/util/sets" "yunion.io/x/pkg/utils" "yunion.io/x/sqlchemy" @@ -30,6 +31,7 @@ const ( SERVER_TYPE_GUEST = "guest" SERVER_TYPE_BAREMETAL = "baremetal" + SERVER_TYPE_CONTAINER = "container" STATIC_ALLOC = "static" @@ -965,7 +967,7 @@ func (manager *SNetworkManager) ValidateCreateData(ctx context.Context, userCred serverTypeStr, _ := data.GetString("server_type") if len(serverTypeStr) == 0 { serverTypeStr = SERVER_TYPE_GUEST - } else if serverTypeStr != SERVER_TYPE_GUEST && serverTypeStr != SERVER_TYPE_BAREMETAL { + } else if !sets.NewString(SERVER_TYPE_GUEST, SERVER_TYPE_BAREMETAL, SERVER_TYPE_CONTAINER).Has(serverTypeStr) { return nil, httperrors.NewInputParameterError("Invalid server_type: %s", serverTypeStr) } data.Add(jsonutils.NewString(serverTypeStr), "server_type")