Automatic merge from release/2.5.0 -> release/2.6.0

* commit '274e31d858fb054a0ccda96a65f292df94727740':
  通过provider is_public_cloud区分公有云私有云
This commit is contained in:
邱剑
2019-02-18 18:29:46 +08:00
14 changed files with 116 additions and 36 deletions
+2 -1
View File
@@ -26,6 +26,8 @@ type ICloudProviderFactory interface {
ValidateChangeBandwidth(instanceId string, bandwidth int64) error
ValidateCreateCloudaccountData(ctx context.Context, userCred mcclient.TokenCredential, data *jsonutils.JSONDict) error
ValidateUpdateCloudaccountCredential(ctx context.Context, userCred mcclient.TokenCredential, data jsonutils.JSONObject, cloudaccount string) (*SCloudaccount, error)
IsPublicCloud() bool
}
type ICloudProvider interface {
@@ -33,7 +35,6 @@ type ICloudProvider interface {
GetName() string
GetSysInfo() (jsonutils.JSONObject, error)
GetVersion() string
IsPublicCloud() bool
IsOnPremiseInfrastructure() bool
GetIRegions() []ICloudRegion