From 2c72ca35d3e2e7fdb1380b4d05768996cbc778ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= Date: Fri, 18 Jan 2019 16:25:13 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=BF=94=E5=9B=9Eeip=E8=B4=A6=E5=8F=B7?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/compute/models/elasticips.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkg/compute/models/elasticips.go b/pkg/compute/models/elasticips.go index 8b543e8bd6..3b2b163696 100644 --- a/pkg/compute/models/elasticips.go +++ b/pkg/compute/models/elasticips.go @@ -737,9 +737,8 @@ func (self *SElasticip) GetCustomizeColumns(ctx context.Context, userCred mcclie } func (self *SElasticip) getMoreDetails(extra *jsonutils.JSONDict) *jsonutils.JSONDict { - if cloudprovider := self.GetCloudprovider(); cloudprovider != nil { - extra.Add(jsonutils.NewString(cloudprovider.Provider), "provider") - } + info := self.getCloudProviderInfo() + extra.Update(jsonutils.Marshal(&info)) vm := self.GetAssociateVM() if vm != nil { extra.Add(jsonutils.NewString(vm.GetName()), "associate_name") From 5c55f0633af1a750dbd6e28f6b759991fe3ea467 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= Date: Fri, 18 Jan 2019 16:26:14 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8F=96=E6=B6=88=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E7=9A=84region=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/compute/models/elasticips.go | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkg/compute/models/elasticips.go b/pkg/compute/models/elasticips.go index 3b2b163696..bb72366cae 100644 --- a/pkg/compute/models/elasticips.go +++ b/pkg/compute/models/elasticips.go @@ -743,11 +743,6 @@ func (self *SElasticip) getMoreDetails(extra *jsonutils.JSONDict) *jsonutils.JSO if vm != nil { extra.Add(jsonutils.NewString(vm.GetName()), "associate_name") } - region := self.GetRegion() - if region != nil { - extra.Add(jsonutils.NewString(region.GetName()), "cloudregion") - extra.Add(jsonutils.NewString(region.GetName()), "region") - } return extra }