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

cloudprovider: use ProviderConfig

Browse Source
This commit is contained in:
Yousong Zhou
2020-03-25 17:16:35 +08:00
parent e2826b1338
commit 8009857c8a
19 changed files with 116 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/multicloud/objectstore/ceph/provider/provider.go
+2 -2
View File
@@ -33,8 +33,8 @@ func (self *SCephRadosProviderFactory) GetName() string {
return api.CLOUD_PROVIDER_CEPH
}
func (self *SCephRadosProviderFactory) GetProvider(providerId, providerName, url, account, secret string) (cloudprovider.ICloudProvider, error) {
client, err := ceph.NewCephRados(providerId, providerName, url, account, secret, false)
func (self *SCephRadosProviderFactory) GetProvider(cfg cloudprovider.ProviderConfig) (cloudprovider.ICloudProvider, error) {
client, err := ceph.NewCephRados(cfg.Id, cfg.Name, cfg.URL, cfg.Account, cfg.Secret, false)
if err != nil {
return nil, err
}
pkg/multicloud/objectstore/provider/provider.go
+5 -2
View File
@@ -71,8 +71,11 @@ func (self *SObjectStoreProviderFactory) ValidateUpdateCloudaccountCredential(ct
return output, nil
}
func (self *SObjectStoreProviderFactory) GetProvider(providerId, providerName, url, account, secret string) (cloudprovider.ICloudProvider, error) {
client, err := objectstore.NewObjectStoreClient(providerId, providerName, url, account, secret, false)
func (self *SObjectStoreProviderFactory) GetProvider(cfg cloudprovider.ProviderConfig) (cloudprovider.ICloudProvider, error) {
dbg := false
client, err := objectstore.NewObjectStoreClient(
cfg.Id, cfg.Name, cfg.URL, cfg.Account, cfg.Secret, dbg,
)
if err != nil {
return nil, err
}
pkg/multicloud/objectstore/xsky/provider/provider.go
+2 -2
View File
@@ -33,8 +33,8 @@ func (self *SXskyProviderFactory) GetName() string {
return api.CLOUD_PROVIDER_XSKY
}
func (self *SXskyProviderFactory) GetProvider(providerId, providerName, url, account, secret string) (cloudprovider.ICloudProvider, error) {
client, err := xsky.NewXskyClient(providerId, providerName, url, account, secret, false)
func (self *SXskyProviderFactory) GetProvider(cfg cloudprovider.ProviderConfig) (cloudprovider.ICloudProvider, error) {
client, err := xsky.NewXskyClient(cfg.Id, cfg.Name, cfg.URL, cfg.Account, cfg.Secret, false)
if err != nil {
return nil, err
}