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

Automatic merge from release/2.7.0 -> release/2.8.0

Browse Source 
* commit '8da10ea93623f8e192330236106128b26742e8fa':
  fix: support batch update joint module
This commit is contained in:
周有松
2019-03-14 17:45:56 +08:00
parent 5be0284d08 8da10ea936
commit 457054dd7a
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/mcclient/modules/joint.go
+12 -1
View File
@@ -5,7 +5,6 @@ import (
"net/url"
"yunion.io/x/jsonutils"
"yunion.io/x/onecloud/pkg/mcclient"
)
@@ -175,3 +174,15 @@ func (this *JointResourceManager) Patch(s *mcclient.ClientSession, mid, sid stri
}
return this.filterSingleResult(s, result, nil)
}
func (this *JointResourceManager) BatchUpdate(s *mcclient.ClientSession, mid string, sids []string, query jsonutils.JSONObject, params jsonutils.JSONObject) []SubmitResult {
return BatchDo(sids, func(sid string) (jsonutils.JSONObject, error) {
return this.Update(s, mid, sid, query, params)
})
}
func (this *JointResourceManager) BatchPatch(s *mcclient.ClientSession, mid string, sids []string, query jsonutils.JSONObject, params jsonutils.JSONObject) []SubmitResult {
return BatchDo(sids, func(sid string) (jsonutils.JSONObject, error) {
return this.Patch(s, mid, sid, query, params)
})
}
pkg/mcclient/modules/modules.go
+2 -1
View File
@@ -6,7 +6,6 @@ import (
"yunion.io/x/jsonutils"
"yunion.io/x/log"
"yunion.io/x/onecloud/pkg/mcclient"
)
@@ -139,7 +138,9 @@ type JointManager interface {
BatchDetach(s *mcclient.ClientSession, mid string, sids []string) []SubmitResult
BatchDetach2(s *mcclient.ClientSession, mid string, sids []string) []SubmitResult
Update(s *mcclient.ClientSession, mid, sid string, query jsonutils.JSONObject, params jsonutils.JSONObject) (jsonutils.JSONObject, error)
BatchUpdate(s *mcclient.ClientSession, mid string, sids []string, query jsonutils.JSONObject, params jsonutils.JSONObject) []SubmitResult
Patch(s *mcclient.ClientSession, mid, sid string, query jsonutils.JSONObject, params jsonutils.JSONObject) (jsonutils.JSONObject, error)
BatchPatch(s *mcclient.ClientSession, mid string, sids []string, query jsonutils.JSONObject, params jsonutils.JSONObject) []SubmitResult
}
var (