From e6d40509040c436d427a98ff230f432ded91c1a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= Date: Tue, 16 Oct 2018 19:40:20 +0800 Subject: [PATCH] =?UTF-8?q?=E9=81=BF=E5=85=8D=E5=9B=A0=E5=A4=A7=E5=B0=8F?= =?UTF-8?q?=E5=86=99=E4=B8=8D=E4=B8=80=E8=87=B4=E5=AF=BC=E8=87=B4=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E6=97=B6=E5=88=A0=E9=99=A4=E5=8E=9F=E6=9C=89=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/util/azure/disk.go | 3 ++- pkg/util/azure/eip.go | 3 ++- pkg/util/azure/image.go | 3 ++- pkg/util/azure/instance.go | 2 +- pkg/util/azure/network.go | 2 +- pkg/util/azure/securitygroup.go | 2 +- pkg/util/azure/snapshot.go | 3 ++- pkg/util/azure/vpc.go | 2 +- pkg/util/azure/wire.go | 3 ++- 9 files changed, 14 insertions(+), 9 deletions(-) diff --git a/pkg/util/azure/disk.go b/pkg/util/azure/disk.go index 0e01dff33e..694efa9f4d 100644 --- a/pkg/util/azure/disk.go +++ b/pkg/util/azure/disk.go @@ -3,6 +3,7 @@ package azure import ( "context" "fmt" + "strings" "time" "yunion.io/x/jsonutils" @@ -225,7 +226,7 @@ func (self *SDisk) GetName() string { } func (self *SDisk) GetGlobalId() string { - return self.ID + return strings.ToLower(self.ID) } func (self *SDisk) IsEmulated() bool { diff --git a/pkg/util/azure/eip.go b/pkg/util/azure/eip.go index 2aac3641bd..048d3b8e55 100644 --- a/pkg/util/azure/eip.go +++ b/pkg/util/azure/eip.go @@ -2,6 +2,7 @@ package azure import ( "context" + "strings" "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2018-06-01/network" "yunion.io/x/jsonutils" @@ -276,7 +277,7 @@ func (self *SEipAddress) GetBandwidth() int { } func (self *SEipAddress) GetGlobalId() string { - return self.ID + return strings.ToLower(self.ID) } func (self *SEipAddress) GetId() string { diff --git a/pkg/util/azure/image.go b/pkg/util/azure/image.go index 7bed7a4c94..f0cefa12c9 100644 --- a/pkg/util/azure/image.go +++ b/pkg/util/azure/image.go @@ -2,6 +2,7 @@ package azure import ( "context" + "strings" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-06-01/compute" "yunion.io/x/jsonutils" @@ -86,7 +87,7 @@ func (self *SImage) IsEmulated() bool { } func (self *SImage) GetGlobalId() string { - return self.ID + return strings.ToLower(self.ID) } func (self *SImage) GetStatus() string { diff --git a/pkg/util/azure/instance.go b/pkg/util/azure/instance.go index fccae31651..a810d1ea73 100644 --- a/pkg/util/azure/instance.go +++ b/pkg/util/azure/instance.go @@ -627,7 +627,7 @@ func (self *SInstance) GetName() string { } func (self *SInstance) GetGlobalId() string { - return self.ID + return strings.ToLower(self.ID) } func (self *SRegion) GetInstanceStatus(instanceId string) (string, error) { diff --git a/pkg/util/azure/network.go b/pkg/util/azure/network.go index b5c6eb2f44..734f1bc716 100644 --- a/pkg/util/azure/network.go +++ b/pkg/util/azure/network.go @@ -35,7 +35,7 @@ func (self *SNetwork) GetName() string { } func (self *SNetwork) GetGlobalId() string { - return self.ID + return strings.ToLower(self.ID) } func (self *SNetwork) IsEmulated() bool { diff --git a/pkg/util/azure/securitygroup.go b/pkg/util/azure/securitygroup.go index eff2d09956..acfd749a31 100644 --- a/pkg/util/azure/securitygroup.go +++ b/pkg/util/azure/securitygroup.go @@ -157,7 +157,7 @@ func (self *SSecurityGroup) GetId() string { } func (self *SSecurityGroup) GetGlobalId() string { - return self.ID + return strings.ToLower(self.ID) } func (self *SSecurityGroup) GetDescription() string { diff --git a/pkg/util/azure/snapshot.go b/pkg/util/azure/snapshot.go index 7a59088b8d..246e9a7387 100644 --- a/pkg/util/azure/snapshot.go +++ b/pkg/util/azure/snapshot.go @@ -4,6 +4,7 @@ import ( "context" "encoding/json" "io/ioutil" + "strings" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-04-01/compute" "yunion.io/x/jsonutils" @@ -31,7 +32,7 @@ func (self *SSnapshot) GetId() string { } func (self *SSnapshot) GetGlobalId() string { - return self.ID + return strings.ToLower(self.ID) } func (self *SSnapshot) GetMetadata() *jsonutils.JSONDict { diff --git a/pkg/util/azure/vpc.go b/pkg/util/azure/vpc.go index 92326dfe3a..47b73fa932 100644 --- a/pkg/util/azure/vpc.go +++ b/pkg/util/azure/vpc.go @@ -65,7 +65,7 @@ func (self *SVpc) GetName() string { } func (self *SVpc) GetGlobalId() string { - return self.ID + return strings.ToLower(self.ID) } func (self *SVpc) IsEmulated() bool { diff --git a/pkg/util/azure/wire.go b/pkg/util/azure/wire.go index 5850f3df68..46af47f6c9 100644 --- a/pkg/util/azure/wire.go +++ b/pkg/util/azure/wire.go @@ -3,6 +3,7 @@ package azure import ( "context" "fmt" + "strings" "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2018-06-01/network" "yunion.io/x/jsonutils" @@ -25,7 +26,7 @@ func (self *SWire) GetId() string { } func (self *SWire) GetGlobalId() string { - return self.GetId() + return strings.ToLower(self.GetId()) } func (self *SWire) GetName() string {