mirror of
https://github.com/yunionio/cloudpods.git
synced 2026-09-19 10:46:58 +08:00
避免host name使用中文
This commit is contained in:
+2
-17
@@ -39,7 +39,6 @@ type SAzureClient struct {
|
||||
envName string
|
||||
ressourceGroups []SResourceGroup
|
||||
fetchResourceGroups bool
|
||||
subscriptionName string
|
||||
env azureenv.Environment
|
||||
authorizer autorest.Authorizer
|
||||
iregions []cloudprovider.ICloudRegion
|
||||
@@ -510,22 +509,8 @@ func (self *SAzureClient) fetchRegions() error {
|
||||
self.iregions[i] = ®ions[i]
|
||||
}
|
||||
}
|
||||
body, err := self.ListSubscriptions()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
subscriptions, err := body.GetArray("value")
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
for _, subscription := range subscriptions {
|
||||
subscriptionId, _ := subscription.GetString("subscriptionId")
|
||||
if subscriptionId == self.subscriptionId {
|
||||
self.subscriptionName, _ = subscription.GetString("displayName")
|
||||
break
|
||||
}
|
||||
}
|
||||
return nil
|
||||
_, err := self.ListSubscriptions()
|
||||
return err
|
||||
}
|
||||
|
||||
func (self *SAzureClient) GetRegions() []SRegion {
|
||||
|
||||
@@ -26,7 +26,7 @@ func (self *SClassicHost) GetId() string {
|
||||
}
|
||||
|
||||
func (self *SClassicHost) GetName() string {
|
||||
return fmt.Sprintf("%s(%s)-classic", self.zone.region.client.subscriptionId, self.zone.region.client.subscriptionName)
|
||||
return fmt.Sprintf("%s-classic", self.zone.region.client.subscriptionId)
|
||||
}
|
||||
|
||||
func (self *SClassicHost) GetGlobalId() string {
|
||||
|
||||
@@ -23,7 +23,7 @@ func (self *SHost) GetId() string {
|
||||
}
|
||||
|
||||
func (self *SHost) GetName() string {
|
||||
return fmt.Sprintf("%s(%s)", self.zone.region.client.subscriptionId, self.zone.region.client.subscriptionName)
|
||||
return fmt.Sprintf("%s", self.zone.region.client.subscriptionId)
|
||||
}
|
||||
|
||||
func (self *SHost) GetGlobalId() string {
|
||||
|
||||
Reference in New Issue
Block a user