From a62f7e1db2fb038ecb915e200ab4710fa4a88235 Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Tue, 20 Nov 2018 09:12:40 +0000 Subject: [PATCH 1/2] cloudproviders: reword error message in create data validation --- pkg/compute/models/cloudproviders.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/compute/models/cloudproviders.go b/pkg/compute/models/cloudproviders.go index 5b25fb1cbb..18724288ec 100644 --- a/pkg/compute/models/cloudproviders.go +++ b/pkg/compute/models/cloudproviders.go @@ -130,7 +130,7 @@ func (self *SCloudprovider) ValidateUpdateData(ctx context.Context, userCred mcc } func (self *SCloudproviderManager) ValidateCreateData(ctx context.Context, userCred mcclient.TokenCredential, ownerProjId string, query jsonutils.JSONObject, data *jsonutils.JSONDict) (*jsonutils.JSONDict, error) { - return nil, httperrors.NewUnsupportOperationError("Not support create cloudprovider, please considir create cloudaccount") + return nil, httperrors.NewUnsupportOperationError("Directly creating cloudprovider is not supported, create cloudaccount instead") } func (self *SCloudprovider) getPassword() (string, error) { From cf2b42f78b5abbff4c4b1a91e7c3bcc4a54ce6ef Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Tue, 20 Nov 2018 09:12:08 +0000 Subject: [PATCH 2/2] climc: cloudprovider: drop cloud-provider-create command It's not allowed since release/2.3.0 --- cmd/climc/shell/cloudproviders.go | 32 ------------------------------- 1 file changed, 32 deletions(-) diff --git a/cmd/climc/shell/cloudproviders.go b/cmd/climc/shell/cloudproviders.go index 9ac65dfcf0..f35da1d11f 100644 --- a/cmd/climc/shell/cloudproviders.go +++ b/cmd/climc/shell/cloudproviders.go @@ -31,38 +31,6 @@ func init() { return nil }) - type CloudproviderCreateOptions struct { - NAME string `help:"Name of cloud provider"` - ACCOUNT string `help:"Account to access the cloud provider, tenantId/subscriptionId for Azure"` - SECRET string `help:"Secret to access the cloud provider, clientId/clientScret for Azure"` - PROVIDER string `help:"Driver for cloud provider" choices:"VMware|Aliyun|Azure"` - AccessURL string `helo:"hello" metavar:"Azure choices: "` - Desc string `help:"Description"` - Enabled bool `help:"Enabled the provider automatically"` - } - R(&CloudproviderCreateOptions{}, "cloud-provider-create", "Create a cloud provider", func(s *mcclient.ClientSession, args *CloudproviderCreateOptions) error { - params := jsonutils.NewDict() - params.Add(jsonutils.NewString(args.NAME), "name") - params.Add(jsonutils.NewString(args.ACCOUNT), "account") - params.Add(jsonutils.NewString(args.SECRET), "secret") - params.Add(jsonutils.NewString(args.PROVIDER), "provider") - if args.Enabled { - params.Add(jsonutils.JSONTrue, "enabled") - } - if len(args.AccessURL) > 0 { - params.Add(jsonutils.NewString(args.AccessURL), "access_url") - } - if len(args.Desc) > 0 { - params.Add(jsonutils.NewString(args.Desc), "description") - } - result, err := modules.Cloudproviders.Create(s, params) - if err != nil { - return err - } - printObject(result) - return nil - }) - type CloudproviderUpdateOptions struct { ID string `help:"ID or Name of cloud provider"` Name string `help:"New name to update"`