From 120492b505541a2e4bf8cd661fea02fb8062ff12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= Date: Wed, 10 Oct 2018 13:21:59 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E8=BF=94=E5=9B=9E=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/util/azure/azure.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkg/util/azure/azure.go b/pkg/util/azure/azure.go index dac574fa36..80aacffa8b 100644 --- a/pkg/util/azure/azure.go +++ b/pkg/util/azure/azure.go @@ -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 }