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

Merge pull request #5457 from ioito/hotfix/qx-cloudaccount-test-connectivity

Browse Source 
hotfix: 支持更新云账号密码时测试账号连通性
This commit is contained in:
yunion-ci-robot
2020-03-12 18:08:16 +08:00
committed by GitHub
parent 12c6576ef6 b47ee82112
commit 79cf558a13
3 changed files with 186 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/cloudaccounts.go
+24
View File
@@ -453,6 +453,30 @@ func (self *SCloudaccount) PerformSync(ctx context.Context, userCred mcclient.To
return nil, err
}
func (self *SCloudaccount) AllowPerformTestConnectivity(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data jsonutils.JSONObject) bool {
return db.IsAdminAllowPerform(userCred, self, "test-connectivity")
}
// 测试账号连通性(更新秘钥信息时)
func (self *SCloudaccount) PerformTestConnectivity(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, input cloudprovider.SCloudaccountCredential) (jsonutils.JSONObject, error) {
providerDriver, err := self.GetProviderFactory()
if err != nil {
return nil, httperrors.NewBadRequestError("failed to found provider factory error: %v", err)
}
account, err := providerDriver.ValidateUpdateCloudaccountCredential(ctx, userCred, input, self.Account)
if err != nil {
return nil, err
}
_, err = cloudprovider.IsValidCloudAccount(self.AccessUrl, account.Account, account.Secret, self.Provider)
if err != nil {
return nil, httperrors.NewInputParameterError("invalid cloud account info error: %s", err.Error())
}
return nil, nil
}
func (self *SCloudaccount) AllowPerformUpdateCredential(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data jsonutils.JSONObject) bool {
return db.IsAdminAllowPerform(userCred, self, "update-credential")
}