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

Merge pull request #5746 from yousong/bugfix/yousong-proxysetting

Browse Source 
proxysetting: add class level test action
This commit is contained in:
Zexi Li
2020-04-11 13:07:02 +08:00
committed by GitHub
parent 4945867f6c 80f2fb3f99
commit 379cf65e89
2 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/apis/cloudcommon/proxy/proxy.go
+5
View File
@@ -55,3 +55,8 @@ type ProxySettingResourceInput struct {
// 代理配置
ProxySettingId string `json:"proxy_setting_id"`
}
type ProxySettingTestInput struct {
HttpProxy string
HttpsProxy string
}
pkg/cloudcommon/db/proxy/proxysetting.go
+19 -9
View File
@@ -129,19 +129,13 @@ func (ps *SProxySetting) AllowPerformTest(ctx context.Context, userCred mcclient
return db.IsAdminAllowPerform(userCred, ps, "test")
}
func (ps *SProxySetting) PerformTest(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data jsonutils.JSONObject) (jsonutils.JSONObject, error) {
func (man *SProxySettingManager) test(ctx context.Context, urls map[string]string) (jsonutils.JSONObject, error) {
type TestURLResult struct {
Ok bool `json:"ok"`
Reason string `json:"reason"`
}
var (
r = map[string]TestURLResult{}
m = map[string]string{
"http_proxy": ps.HTTPProxy,
"https_proxy": ps.HTTPSProxy,
}
)
for k, v := range m {
r := map[string]TestURLResult{}
for k, v := range urls {
if v == "" {
r[k] = TestURLResult{Ok: true}
continue
@@ -188,6 +182,22 @@ func (ps *SProxySetting) PerformTest(ctx context.Context, userCred mcclient.Toke
return jsonutils.Marshal(r), nil
}
func (ps *SProxySetting) PerformTest(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data jsonutils.JSONObject) (jsonutils.JSONObject, error) {
urls := map[string]string{
"http_proxy": ps.HTTPProxy,
"https_proxy": ps.HTTPSProxy,
}
return ProxySettingManager.test(ctx, urls)
}
func (man *SProxySettingManager) PerformTest(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data proxyapi.ProxySettingTestInput) (jsonutils.JSONObject, error) {
urls := map[string]string{
"http_proxy": data.HttpProxy,
"https_proxy": data.HttpsProxy,
}
return man.test(ctx, urls)
}
func (man *SProxySettingManager) InitializeData() error {
_, err := man.FetchById(proxyapi.ProxySettingId_DIRECT)
if err == nil {