diff options
author | Flavio Castelli <fcastelli@suse.com> | 2016-07-04 18:43:23 +0200 |
---|---|---|
committer | Flavio Castelli <fcastelli@suse.com> | 2016-07-20 13:11:13 +0200 |
commit | 0cc42cc992323bcd42db36536227d8616dca3189 (patch) | |
tree | 70a2bf92ba33496e6030affcc60ef44051fb244d /libvirt | |
parent | 16f9076bb7343d19c2924b3104171fba8e979793 (diff) | |
download | terraform-provider-libvirt-0cc42cc992323bcd42db36536227d8616dca3189.tar terraform-provider-libvirt-0cc42cc992323bcd42db36536227d8616dca3189.tar.gz |
code refactoring
This is performed automatically by go fmt, apparently Alvaro's IDE had
different settings.
Signed-off-by: Flavio Castelli <fcastelli@suse.com>
Diffstat (limited to 'libvirt')
-rw-r--r-- | libvirt/resource_libvirt_domain.go | 75 |
1 files changed, 38 insertions, 37 deletions
diff --git a/libvirt/resource_libvirt_domain.go b/libvirt/resource_libvirt_domain.go index ed2fd526..e1fc7dc6 100644 --- a/libvirt/resource_libvirt_domain.go +++ b/libvirt/resource_libvirt_domain.go @@ -534,57 +534,58 @@ func resourceLibvirtDomainRead(d *schema.ResourceData, meta interface{}) error { } switch networkInterfaceDef.Type { - case "network": { - network, err := virConn.LookupNetworkByName(networkInterfaceDef.Source.Network) - if err != nil { - return fmt.Errorf("Can't retrieve network ID for '%s'", networkInterfaceDef.Source.Network) - } - defer network.Free() + case "network": + { + network, err := virConn.LookupNetworkByName(networkInterfaceDef.Source.Network) + if err != nil { + return fmt.Errorf("Can't retrieve network ID for '%s'", networkInterfaceDef.Source.Network) + } + defer network.Free() - netIface["network_id"], err = network.GetUUIDString() - if err != nil { - return fmt.Errorf("Can't retrieve network ID for '%s'", networkInterfaceDef.Source.Network) - } + netIface["network_id"], err = network.GetUUIDString() + if err != nil { + return fmt.Errorf("Can't retrieve network ID for '%s'", networkInterfaceDef.Source.Network) + } - networkDef, err := newDefNetworkfromLibvirt(&network) - if err != nil { - return err - } + networkDef, err := newDefNetworkfromLibvirt(&network) + if err != nil { + return err + } - netIface["network_name"] = networkInterfaceDef.Source.Network + netIface["network_name"] = networkInterfaceDef.Source.Network - // try to look for this MAC in the DHCP configuration for this VM - if networkDef.HasDHCP() { + // try to look for this MAC in the DHCP configuration for this VM + if networkDef.HasDHCP() { hostnameSearch: - for _, ip := range networkDef.Ips { - if ip.Dhcp != nil { - for _, host := range ip.Dhcp.Hosts { - if strings.ToUpper(host.Mac) == netIface["mac"] { - log.Printf("[DEBUG] read: hostname for '%s': '%s'", netIface["mac"], host.Name) - netIface["hostname"] = host.Name - break hostnameSearch + for _, ip := range networkDef.Ips { + if ip.Dhcp != nil { + for _, host := range ip.Dhcp.Hosts { + if strings.ToUpper(host.Mac) == netIface["mac"] { + log.Printf("[DEBUG] read: hostname for '%s': '%s'", netIface["mac"], host.Name) + netIface["hostname"] = host.Name + break hostnameSearch + } } } } } - } - // look for an ip address and try to match it with the mac address - // not sure if using the target device name is a better idea here - addrs := make([]string, 0) - for _, ifaceWithAddr := range ifacesWithAddr { - if strings.ToUpper(ifaceWithAddr.Hwaddr) == netIface["mac"] { - for _, addr := range ifaceWithAddr.Addrs { - addrs = append(addrs, addr.Addr) + // look for an ip address and try to match it with the mac address + // not sure if using the target device name is a better idea here + addrs := make([]string, 0) + for _, ifaceWithAddr := range ifacesWithAddr { + if strings.ToUpper(ifaceWithAddr.Hwaddr) == netIface["mac"] { + for _, addr := range ifaceWithAddr.Addrs { + addrs = append(addrs, addr.Addr) + } } } - } - netIface["addresses"] = addrs - log.Printf("[DEBUG] read: addresses for '%s': %+v", netIface["mac"], addrs) + netIface["addresses"] = addrs + log.Printf("[DEBUG] read: addresses for '%s': %+v", netIface["mac"], addrs) - netIface["wait_for_lease"] = d.Get(prefix + ".wait_for_lease").(bool) + netIface["wait_for_lease"] = d.Get(prefix + ".wait_for_lease").(bool) - } + } case "bridge": netIface["bridge"] = networkInterfaceDef.Source.Bridge case "direct": |