opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-08-31 01:35:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(region): not allow merge default secgroup

Browse Source
This commit is contained in:
ioito
2022-03-03 15:47:48 +08:00
parent 4518281b44
commit 4e4ae3fffa
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/secgroups.go
+4 -1
View File
@@ -99,7 +99,7 @@ func (manager *SSecurityGroupManager) ListItemFilter(
if err != nil {
return q, httperrors.NewGeneralError(errors.Wrapf(err, "GetAllowList"))
}
sq := manager.Query().NotEquals("id", secgroup.Id)
sq := manager.Query().NotEquals("id", secgroup.Id).NotEquals("id", api.SECGROUP_DEFAULT_ID)
secgroups := []SSecurityGroup{}
err = db.FetchModelObjects(manager, sq, &secgroups)
if err != nil {
@@ -905,6 +905,9 @@ func (self *SSecurityGroup) PerformMerge(ctx context.Context, userCred mcclient.
}
return nil, httperrors.NewGeneralError(err)
}
if _secgroup.GetId() == api.SECGROUP_DEFAULT_ID {
return nil, httperrors.NewInputParameterError("not allow merge default security group")
}
secgroup := _secgroup.(*SSecurityGroup)
secgroup.SetModelManager(SecurityGroupManager, secgroup)
_inAllowList, _outAllowList, err := secgroup.GetAllowList()
pkg/mcclient/options/secgroup.go
+1 -1
View File
@@ -85,7 +85,7 @@ type SecgroupMergeOptions struct {
}
func (opts *SecgroupMergeOptions) Params() (jsonutils.JSONObject, error) {
return jsonutils.Marshal(map[string][]string{"secgruops": opts.SECGROUPS}), nil
return jsonutils.Marshal(map[string][]string{"secgroup_ids": opts.SECGROUPS}), nil
}
type SecgroupsAddRuleOptions struct {