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

统一返回格式

Browse Source
This commit is contained in:
屈轩
2018-10-10 13:21:59 +08:00
parent 1c9c74461c
commit 120492b505
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/util/azure/azure.go
+5 -2
View File
@@ -156,7 +156,8 @@ func (self *SAzureClient) GetRegions() []SRegion {
func (self *SAzureClient) GetSubAccounts() (jsonutils.JSONObject, error) {
subClient := subscription.NewSubscriptionsClientWithBaseURI(self.baseUrl)
subClient.Authorizer = self.authorizer
result := jsonutils.NewArray()
result := jsonutils.NewDict()
accounts := jsonutils.NewArray()
if resp, err := subClient.List(context.Background()); err != nil {
return nil, err
} else {
@@ -165,8 +166,10 @@ func (self *SAzureClient) GetSubAccounts() (jsonutils.JSONObject, error) {
data.Add(jsonutils.NewString(*value.SubscriptionID), "subscriptionId")
data.Add(jsonutils.NewString(string(value.State)), "state")
data.Add(jsonutils.NewString(*value.DisplayName), "displayName")
result.Add(data)
accounts.Add(data)
}
result.Add(accounts, "data")
result.Add(jsonutils.NewInt(int64(accounts.Length())), "total")
}
return result, nil
}