lywsvip/cloudpods
1
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-06-22 21:33:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: deprecated-by => yunion:deprecated-by

Browse Source
This commit is contained in:
Qiu Jian
2020-04-15 22:51:57 +08:00
parent 5651805eb0
commit 98fcd1df0f
46 changed files with 162 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/cloudcommon/cmdline/helper.go
View File

@@ -402,7 +402,7 @@ func FetchServerCreateInputByJSON(obj jsonutils.JSONObject) (*compute.ServerCrea
input.InstanceType = skuName
}
if keypair := jsonutils.GetAnyString(obj, []string{"keypair", "keypair_id"}); keypair != "" {
input.KeypairId = keypair
input.Keypair = keypair
}
if secgroup := jsonutils.GetAnyString(obj, []string{"secgroup", "secgroup_id", "secgrp_id"}); len(secgroup) != 0 {
input.SecgroupId = secgroup

6
pkg/cloudcommon/db/proxy/proxysetting.go
View File

@@ -227,14 +227,14 @@ func RegisterReferrer(man db.IModelManager) {
}
func ValidateProxySettingResourceInput(userCred mcclient.TokenCredential, input proxyapi.ProxySettingResourceInput) (*SProxySetting, proxyapi.ProxySettingResourceInput, error) {
m, err := ProxySettingManager.FetchByIdOrName(userCred, input.ProxySettingId)
m, err := ProxySettingManager.FetchByIdOrName(userCred, input.ProxySetting)
if err != nil {
if errors.Cause(err) == sql.ErrNoRows {
return nil, input, errors.Wrapf(httperrors.ErrResourceNotFound, "%s %s", ProxySettingManager.Keyword(), input.ProxySettingId)
return nil, input, errors.Wrapf(httperrors.ErrResourceNotFound, "%s %s", ProxySettingManager.Keyword(), input.ProxySetting)
} else {
return nil, input, errors.Wrapf(err, "ProxySettingManager.FetchByIdOrName")
}
}
input.ProxySettingId = m.GetId()
input.ProxySetting = m.GetId()
return m.(*SProxySetting), input, nil
}