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

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/openstack/provider/provider.go
+4 -4
View File
@@ -25,6 +25,10 @@ func (self *SOpenStackProviderFactory) ValidateChangeBandwidth(instanceId string
return nil
}
func (self *SOpenStackProviderFactory) IsPublicCloud() bool {
return false
}
func (self *SOpenStackProviderFactory) ValidateCreateCloudaccountData(ctx context.Context, userCred mcclient.TokenCredential, data *jsonutils.JSONDict) error {
projectName, _ := data.GetString("project_name")
if len(projectName) == 0 {
@@ -94,10 +98,6 @@ type SOpenStackProvider struct {
client *openstack.SOpenStackClient
}
func (self *SOpenStackProvider) IsPublicCloud() bool {
return false
}
func (self *SOpenStackProvider) GetVersion() string {
return ""
}