opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5013 from swordqiu/automated-cherry-pick-of-#5012-upstream-release-3.1

Browse Source 
Automated cherry pick of #5012: fix: network update error caused by vpc feature
This commit is contained in:
yunion-ci-robot
2020-02-06 09:34:48 +08:00
committed by GitHub
parent 74c272cfae 4bd9051ae4
commit b4fff49236
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/networks.go
+7 -7
View File
@@ -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)