opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-19 10:46:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #978 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-vpc-delete to release/2.4.0

Browse Source 
* commit 'f0deb530e511c54db2a2f7495a6b2749c6c8a1a5':
  默认删除routetables
This commit is contained in:
邱剑
2019-01-26 12:12:55 +08:00
parent 196fefd30e f0deb530e5
commit ea34b35e52
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/vpcs.go
+17 -2
View File
@@ -102,7 +102,7 @@ func (self *SVpc) CustomizeCreate(ctx context.Context, userCred mcclient.TokenCr
}
func (self *SVpc) ValidateDeleteCondition(ctx context.Context) error {
if self.GetNetworkCount() > 0 || self.GetRouteTableCount() > 0 {
if self.GetNetworkCount() > 0 {
return httperrors.NewNotEmptyError("VPC not empty")
}
if self.Id == DEFAULT_VPC_ID {
@@ -150,8 +150,19 @@ func (self *SVpc) GetNetworkCount() int {
return q.Count()
}
func (self *SVpc) GetRouteTableQuery() *sqlchemy.SQuery {
return RouteTableManager.Query().Equals("vpc_id", self.Id)
}
func (self *SVpc) GetRouteTables() []SRouteTable {
q := self.GetRouteTableQuery()
routes := []SRouteTable{}
db.FetchModelObjects(RouteTableManager, q, &routes)
return routes
}
func (self *SVpc) GetRouteTableCount() int {
return RouteTableManager.Query().Equals("vpc_id", self.Id).Count()
return self.GetRouteTableQuery().Count()
}
func (self *SVpc) getMoreDetails(extra *jsonutils.JSONDict) *jsonutils.JSONDict {
@@ -479,6 +490,10 @@ func (self *SVpc) CustomizeDelete(ctx context.Context, userCred mcclient.TokenCr
func (self *SVpc) RealDelete(ctx context.Context, userCred mcclient.TokenCredential) error {
db.OpsLog.LogEvent(self, db.ACT_DELOCATE, self.GetShortDesc(ctx), userCred)
self.SetStatus(userCred, VPC_STATUS_DELETED, "real delete")
routes := self.GetRouteTables()
for i := 0; i < len(routes); i++ {
routes[i].RealDelete(ctx, userCred)
}
return self.SEnabledStatusStandaloneResourceBase.Delete(ctx, userCred)
}