避免host name使用中文

This commit is contained in:
屈轩
2018-10-29 15:47:59 +08:00
parent 69c5abd3c5
commit 1fbb35ae67
3 changed files with 4 additions and 19 deletions
+2 -17
View File
@@ -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] = &regions[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 {
+1 -1
View File
@@ -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 {
+1 -1
View File
@@ -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 {