Gotea/docker-machine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix #4244

Browse Source 
Signed-off-by: Mario Kleinsasser <mario.kleinsasser@gmail.com>

Change fmt

Signed-off-by: Mario Kleinsasser <mario.kleinsasser@gmail.com>

Correct lint

Signed-off-by: Mario Kleinsasser <mario.kleinsasser@gmail.com>

Change the subnet check logic

Signed-off-by: Mario Kleinsasser <mario.kleinsasser@gmail.com>
This commit is contained in:
Mario Kleinsasser
2017-09-06 15:24:39 +02:00
committed by Joffrey F
parent 295730c547
commit 83812d4275
1 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
drivers/azure/azureutil/azureutil.go
View File

@@ -232,23 +232,40 @@ func (a AzureClient) GetSubnet(resourceGroup, virtualNetwork, name string) (netw
return a.subnetsClient().Get(resourceGroup, virtualNetwork, name, "")
}
// CreateSubnet creates or updates a subnet if it does not already exist.
func (a AzureClient) CreateSubnet(ctx *DeploymentContext, resourceGroup, virtualNetwork, name, subnetPrefix string) error {
log.Info("Configuring subnet.", logutil.Fields{
"name": name,
"vnet": virtualNetwork,
"cidr": subnetPrefix})
_, err := a.subnetsClient().CreateOrUpdate(resourceGroup, virtualNetwork, name,
network.Subnet{
Properties: &network.SubnetPropertiesFormat{
AddressPrefix: to.StringPtr(subnetPrefix),
},
}, nil)
if err != nil {
subnet, err := a.GetSubnet(resourceGroup, virtualNetwork, name)
if err == nil {
log.Info("Subnet already exists.")
ctx.SubnetID = to.String(subnet.ID)
return err
}
subnet, err := a.subnetsClient().Get(resourceGroup, virtualNetwork, name, "")
ctx.SubnetID = to.String(subnet.ID)
// If the subnet is not found, create it
if err.(autorest.DetailedError).StatusCode == 404 {
log.Info("Configuring subnet.", logutil.Fields{
"name": name,
"vnet": virtualNetwork,
"cidr": subnetPrefix})
_, err = a.subnetsClient().CreateOrUpdate(resourceGroup, virtualNetwork, name,
network.Subnet{
Properties: &network.SubnetPropertiesFormat{
AddressPrefix: to.StringPtr(subnetPrefix),
},
}, nil)
if err != nil {
return err
}
subnet, err = a.subnetsClient().Get(resourceGroup, virtualNetwork, name, "")
ctx.SubnetID = to.String(subnet.ID)
return err
}
log.Warn("Create subnet operation error %v: ", err)
return err
}
// CleanupSubnetIfExists removes a subnet if there are no IP configurations