From 4bd9051ae4f5fa94304b70adf64a1df4a03e8c9e Mon Sep 17 00:00:00 2001 From: Qiu Jian Date: Thu, 6 Feb 2020 03:07:52 +0800 Subject: [PATCH] fix: network update error caused by vpc feature --- pkg/compute/models/networks.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkg/compute/models/networks.go b/pkg/compute/models/networks.go index a1a0d3983b..f5131bf20e 100644 --- a/pkg/compute/models/networks.go +++ b/pkg/compute/models/networks.go @@ -1495,23 +1495,23 @@ func (self *SNetwork) validateUpdateData(ctx context.Context, userCred mcclient. } } - return nil, nil + return data, nil } func (self *SNetwork) ValidateUpdateData(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data *jsonutils.JSONDict) (*jsonutils.JSONDict, error) { if !self.isManaged() && !self.isOneCloudVpcNetwork() { + var err error + data, err = self.validateUpdateData(ctx, userCred, query, data) + if err != nil { + return nil, err + } + } else { data.Remove("guest_ip_start") data.Remove("guest_ip_end") data.Remove("guest_ip_mask") data.Remove("guest_gateway") data.Remove("guest_dns") data.Remove("guest_dhcp") - } else { - var err error - data, err = self.validateUpdateData(ctx, userCred, query, data) - if err != nil { - return nil, err - } } return self.SSharableVirtualResourceBase.ValidateUpdateData(ctx, userCred, query, data)