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

Automatic merge from release/2.5.0 -> release/2.6.0

Browse Source 
* commit '274e31d858fb054a0ccda96a65f292df94727740':
  通过provider is_public_cloud区分公有云私有云
This commit is contained in:
邱剑
2019-02-18 18:29:46 +08:00
parent 44e1992570 274e31d858
commit 23d883ceae
14 changed files with 116 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/util/aws/provider/provider.go
+4 -4
View File
@@ -21,6 +21,10 @@ func (self *SAwsProviderFactory) ValidateChangeBandwidth(instanceId string, band
return nil
}
func (self *SAwsProviderFactory) IsPublicCloud() bool {
return true
}
func (self *SAwsProviderFactory) ValidateCreateCloudaccountData(ctx context.Context, userCred mcclient.TokenCredential, data *jsonutils.JSONDict) error {
accessKeyID, _ := data.GetString("access_key_id")
if len(accessKeyID) == 0 {
@@ -101,10 +105,6 @@ func (self *SAwsProvider) GetVersion() string {
return aws.AWS_API_VERSION
}
func (self *SAwsProvider) IsPublicCloud() bool {
return true
}
func (self *SAwsProvider) IsOnPremiseInfrastructure() bool {
return false
}