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

通过provider is_public_cloud区分公有云私有云

Browse Source
This commit is contained in:
屈轩
2019-02-18 17:43:31 +08:00
parent b9b57e8441
commit 2ffe44a383
14 changed files with 116 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cloudprovider/cloudprovider.go
+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
pkg/compute/models/cloudaccounts.go
+15 -2
View File
@@ -52,8 +52,8 @@ type SCloudaccount struct {
LastSync time.Time `get:"admin" list:"admin"` // = Column(DateTime, nullable=True)
// Sysinfo jsonutils.JSONObject `get:"admin"` // Column(JSONEncodedDict, nullable=True)
Provider string `width:"64" charset:"ascii" list:"admin" create:"admin_required"`
IsPublicCloud bool `nullable:"false" get:"user" create:"required" list:"user"`
Provider string `width:"64" charset:"ascii" list:"admin" create:"admin_required"`
}
func (self *SCloudaccountManager) AllowListItems(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject) bool {
@@ -146,6 +146,7 @@ func (manager *SCloudaccountManager) ValidateCreateData(ctx context.Context, use
if err := providerDriver.ValidateCreateCloudaccountData(ctx, userCred, data); err != nil {
return nil, err
}
data.Set("is_public_cloud", jsonutils.NewBool(providerDriver.IsPublicCloud()))
// check duplication
// url, account, provider must be unique
account, _ := data.GetString("account")
@@ -319,6 +320,18 @@ func (self *SCloudaccount) StartSyncCloudProviderInfoTask(ctx context.Context, u
params.Add(jsonutils.Marshal(syncRange), "sync_range")
}
providerDriver, _ := cloudprovider.GetProviderDriver(self.Provider)
isPublicCloud := providerDriver.IsPublicCloud()
if self.IsPublicCloud != isPublicCloud {
_, err := self.GetModelManager().TableSpec().Update(self, func() error {
self.IsPublicCloud = isPublicCloud
return nil
})
if err != nil {
log.Errorf("Update cloudaccount %s public attr error: %v", self.Name, err)
}
}
if cloudProviders == nil {
cloudProviders = self.GetCloudproviders()
}
pkg/compute/models/cloudproviders.go
+38
View File
@@ -127,6 +127,44 @@ func (self *SCloudprovider) ValidateDeleteCondition(ctx context.Context) error {
return self.SEnabledStatusStandaloneResourceBase.ValidateDeleteCondition(ctx)
}
func (manager *SCloudproviderManager) GetPublicProviderIds() []string {
return manager.GetProviderIds(true)
}
func (manager *SCloudproviderManager) GetPrivateProviderIds() []string {
return manager.GetProviderIds(false)
}
func (manager *SCloudproviderManager) GetProviderIds(isPublic bool) []string {
providerIds := []string{}
q := manager.Query("id")
account := CloudaccountManager.Query().SubQuery()
q = q.Join(account, sqlchemy.Equals(
account.Field("id"), q.Field("cloudaccount_id")),
)
if isPublic {
q = q.Filter(sqlchemy.IsTrue(account.Field("is_public_cloud")))
} else {
q = q.Filter(sqlchemy.IsFalse(account.Field("is_public_cloud")))
}
rows, err := q.Rows()
if err != nil {
log.Errorf("Get providerIds err: %v", err)
return providerIds
}
defer rows.Close()
for rows.Next() {
var providerId string
err = rows.Scan(&providerId)
if err != nil {
log.Errorf("Get providerId err: %v", err)
return providerIds
}
providerIds = append(providerIds, providerId)
}
return providerIds
}
func (self *SCloudprovider) CleanSchedCache() {
hosts := []SHost{}
q := HostManager.Query().Equals("manager_id", self.Id)
pkg/compute/models/disks.go
+8 -3
View File
@@ -167,12 +167,17 @@ func (manager *SDiskManager) ListItemFilter(ctx context.Context, q *sqlchemy.SQu
sq := storages.Query(storages.Field("id")).Filter(sqlchemy.NotIn(storages.Field("storage_type"), STORAGE_LOCAL_TYPES))
q = q.Filter(sqlchemy.In(q.Field("storage_id"), sq))
}
publicProviderIds := CloudproviderManager.GetPublicProviderIds()
if jsonutils.QueryBoolean(query, "public_cloud", false) {
sq := storages.Query(storages.Field("id")).Filter(sqlchemy.IsNotNull(storages.Field("manager_id")))
sq := storages.Query(storages.Field("id")).Filter(sqlchemy.In(storages.Field("manager_id"), publicProviderIds))
q = q.Filter(sqlchemy.In(q.Field("storage_id"), sq))
} else if jsonutils.QueryBoolean(query, "private_cloud", false) {
sq := storages.Query(storages.Field("id")).Filter(sqlchemy.IsNull(storages.Field("manager_id")))
sq := storages.Query(storages.Field("id")).Filter(
sqlchemy.OR(
sqlchemy.NotIn(storages.Field("manager_id"), publicProviderIds),
sqlchemy.IsNullOrEmpty(storages.Field("manager_id")),
),
)
q = q.Filter(sqlchemy.In(q.Field("storage_id"), sq))
}
pkg/compute/models/guest_actions.go
+2 -2
View File
@@ -1541,7 +1541,7 @@ func (self *SGuest) PerformChangeConfig(ctx context.Context, userCred mcclient.T
diskIdx += 1
}
provider, e := self.GetHost().GetDriver()
provider, e := self.GetHost().GetProviderDriver()
if e != nil || !provider.IsPublicCloud() {
for storageId, needSize := range diskSizes {
iStorage, err := StorageManager.FetchById(storageId)
@@ -1554,7 +1554,7 @@ func (self *SGuest) PerformChangeConfig(ctx context.Context, userCred mcclient.T
}
}
} else {
log.Debugf("Skip storage free capacity validating for public cloud: %s", provider.GetName())
log.Debugf("Skip storage free capacity validating for public cloud: %s", provider.GetId())
}
if newDisks.Length() > 0 {
pkg/compute/models/managedresource.go
+11
View File
@@ -28,6 +28,17 @@ func (self *SManagedResourceBase) GetCloudaccount() *SCloudaccount {
return cp.GetCloudaccount()
}
func (self *SManagedResourceBase) GetProviderDriver() (cloudprovider.ICloudProviderFactory, error) {
provider := self.GetCloudprovider()
if provider == nil {
if len(self.ManagerId) > 0 {
return nil, cloudprovider.ErrInvalidProvider
}
return nil, fmt.Errorf("Resource is self managed")
}
return provider.GetProviderDriver()
}
func (self *SManagedResourceBase) GetDriver() (cloudprovider.ICloudProvider, error) {
provider := self.GetCloudprovider()
if provider == nil {
pkg/compute/models/snapshots.go
+12
View File
@@ -130,6 +130,18 @@ func (manager *SSnapshotManager) ListItemFilter(ctx context.Context, q *sqlchemy
q = q.In("manager_id", sq)
}
publicProviderIds := CloudproviderManager.GetPublicProviderIds()
if jsonutils.QueryBoolean(query, "public_cloud", false) {
q = q.Filter(sqlchemy.In(q.Field("manager_id"), publicProviderIds))
} else if jsonutils.QueryBoolean(query, "private_cloud", false) {
q = q.Filter(
sqlchemy.OR(
sqlchemy.NotIn(q.Field("manager_id"), publicProviderIds),
sqlchemy.IsNullOrEmpty(q.Field("manager_id")),
),
)
}
if managerStr := jsonutils.GetAnyString(query, []string{"manager", "manager_id"}); len(managerStr) > 0 {
managerObj, err := CloudproviderManager.FetchByIdOrName(nil, managerStr)
if err != nil {
pkg/util/aliyun/provider/provider.go
+4 -4
View File
@@ -23,6 +23,10 @@ func (self *SAliyunProviderFactory) ValidateChangeBandwidth(instanceId string, b
return nil
}
func (self *SAliyunProviderFactory) IsPublicCloud() bool {
return true
}
func (self *SAliyunProviderFactory) ValidateCreateCloudaccountData(ctx context.Context, userCred mcclient.TokenCredential, data *jsonutils.JSONDict) error {
accessKeyID, _ := data.GetString("access_key_id")
if len(accessKeyID) == 0 {
@@ -90,10 +94,6 @@ type SAliyunProvider struct {
client *aliyun.SAliyunClient
}
func (self *SAliyunProvider) IsPublicCloud() bool {
return true
}
func (self *SAliyunProvider) IsOnPremiseInfrastructure() bool {
return false
}
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
}
pkg/util/azure/provider/provider.go
+4 -4
View File
@@ -23,6 +23,10 @@ func (self *SAzureProviderFactory) ValidateChangeBandwidth(instanceId string, ba
return fmt.Errorf("Changing %s bandwidth is not supported", azure.CLOUD_PROVIDER_AZURE)
}
func (self *SAzureProviderFactory) IsPublicCloud() bool {
return true
}
func (self *SAzureProviderFactory) ValidateCreateCloudaccountData(ctx context.Context, userCred mcclient.TokenCredential, data *jsonutils.JSONDict) error {
directoryID, _ := data.GetString("directory_id")
if len(directoryID) == 0 {
@@ -79,10 +83,6 @@ type SAzureProvider struct {
client *azure.SAzureClient
}
func (self *SAzureProvider) IsPublicCloud() bool {
return true
}
func (self *SAzureProvider) IsOnPremiseInfrastructure() bool {
return false
}
pkg/util/esxi/provider/provider.go
+4 -4
View File
@@ -27,6 +27,10 @@ func (self *SESXiProviderFactory) ValidateChangeBandwidth(instanceId string, ban
return fmt.Errorf("Changing %s bandwidth is not supported", esxi.CLOUD_PROVIDER_VMWARE)
}
func (self *SESXiProviderFactory) IsPublicCloud() bool {
return false
}
func (self *SESXiProviderFactory) ValidateCreateCloudaccountData(ctx context.Context, userCred mcclient.TokenCredential, data *jsonutils.JSONDict) error {
username, _ := data.GetString("username")
if len(username) == 0 {
@@ -111,10 +115,6 @@ type SESXiProvider struct {
client *esxi.SESXiClient
}
func (self *SESXiProvider) IsPublicCloud() bool {
return false
}
func (self *SESXiProvider) IsOnPremiseInfrastructure() bool {
return true
}
pkg/util/huawei/provider/provider.go
+4 -4
View File
@@ -18,6 +18,10 @@ func (self *SHuaweiProviderFactory) ValidateChangeBandwidth(instanceId string, b
return nil
}
func (self *SHuaweiProviderFactory) IsPublicCloud() bool {
return true
}
func (self *SHuaweiProviderFactory) ValidateCreateCloudaccountData(ctx context.Context, userCred mcclient.TokenCredential, data *jsonutils.JSONDict) error {
accessKeyID, _ := data.GetString("access_key_id")
if len(accessKeyID) == 0 {
@@ -94,10 +98,6 @@ func (self *SHuaweiProvider) GetSysInfo() (jsonutils.JSONObject, error) {
return info, nil
}
func (self *SHuaweiProvider) IsPublicCloud() bool {
return true
}
func (self *SHuaweiProvider) IsOnPremiseInfrastructure() bool {
return false
}
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 ""
}
pkg/util/qcloud/provider/provider.go
+4 -4
View File
@@ -27,6 +27,10 @@ func (self *SQcloudProviderFactory) ValidateChangeBandwidth(instanceId string, b
return nil
}
func (self *SQcloudProviderFactory) IsPublicCloud() bool {
return true
}
func (self *SQcloudProviderFactory) ValidateCreateCloudaccountData(ctx context.Context, userCred mcclient.TokenCredential, data *jsonutils.JSONDict) error {
appID, _ := data.GetString("app_id")
if len(appID) == 0 {
@@ -86,10 +90,6 @@ type SQcloudProvider struct {
client *qcloud.SQcloudClient
}
func (self *SQcloudProvider) IsPublicCloud() bool {
return true
}
func (self *SQcloudProvider) IsOnPremiseInfrastructure() bool {
return false
}