From 5984f84c12412aacc10040f554a77b4f6048ceb6 Mon Sep 17 00:00:00 2001 From: thetuxkeeper Date: Wed, 11 May 2016 17:21:54 +0200 Subject: [PATCH] provider/vsphere: read gateway and ipv6_gateway read gateway and ipv6_gateway information for vsphere_virtual_machine resources. --- .../resource_vsphere_virtual_machine.go | 25 +++++++++++++++++++ .../resource_vsphere_virtual_machine_test.go | 6 +++++ 2 files changed, 31 insertions(+) diff --git a/builtin/providers/vsphere/resource_vsphere_virtual_machine.go b/builtin/providers/vsphere/resource_vsphere_virtual_machine.go index 86b093731..8ae9108fd 100644 --- a/builtin/providers/vsphere/resource_vsphere_virtual_machine.go +++ b/builtin/providers/vsphere/resource_vsphere_virtual_machine.go @@ -795,6 +795,31 @@ func resourceVSphereVirtualMachineRead(d *schema.ResourceData, meta interface{}) networkInterfaces = append(networkInterfaces, networkInterface) } } + if mvm.Guest.IpStack != nil { + for _, v := range mvm.Guest.IpStack { + if v.IpRouteConfig != nil && v.IpRouteConfig.IpRoute != nil { + for _, route := range v.IpRouteConfig.IpRoute { + if route.Gateway.Device != "" { + gatewaySetting := "" + if route.Network == "::" { + gatewaySetting = "ipv6_gateway" + } else if route.Network == "0.0.0.0" { + gatewaySetting = "ipv4_gateway" + } + if gatewaySetting != "" { + deviceID, err := strconv.Atoi(route.Gateway.Device) + if err != nil { + log.Printf("[WARN] error at processing %s of device id %#v: %#v", gatewaySetting, route.Gateway.Device, err) + } else { + log.Printf("[DEBUG] %s of device id %d: %s", gatewaySetting, deviceID, route.Gateway.IpAddress) + networkInterfaces[deviceID][gatewaySetting] = route.Gateway.IpAddress + } + } + } + } + } + } + } log.Printf("[DEBUG] networkInterfaces: %#v", networkInterfaces) err = d.Set("network_interface", networkInterfaces) if err != nil { diff --git a/builtin/providers/vsphere/resource_vsphere_virtual_machine_test.go b/builtin/providers/vsphere/resource_vsphere_virtual_machine_test.go index 426993973..d4a2738f3 100644 --- a/builtin/providers/vsphere/resource_vsphere_virtual_machine_test.go +++ b/builtin/providers/vsphere/resource_vsphere_virtual_machine_test.go @@ -50,6 +50,7 @@ func TestAccVSphereVirtualMachine_basic(t *testing.T) { gateway, label, ip_address, + gateway, datastoreOpt, template, ), @@ -111,6 +112,7 @@ func TestAccVSphereVirtualMachine_diskInitType(t *testing.T) { gateway, label, ip_address, + gateway, datastoreOpt, template, ), @@ -490,6 +492,7 @@ func TestAccVSphereVirtualMachine_createWithExistingVmdk(t *testing.T) { gateway, label, ip_address, + gateway, datastoreOpt, vmdk_path, ), @@ -935,6 +938,7 @@ resource "vsphere_virtual_machine" "foo" { label = "%s" ipv4_address = "%s" ipv4_prefix_length = 24 + ipv4_gateway = "%s" } disk { %s @@ -958,6 +962,7 @@ resource "vsphere_virtual_machine" "thin" { label = "%s" ipv4_address = "%s" ipv4_prefix_length = 24 + ipv4_gateway = "%s" } disk { %s @@ -1078,6 +1083,7 @@ resource "vsphere_virtual_machine" "with_existing_vmdk" { label = "%s" ipv4_address = "%s" ipv4_prefix_length = 24 + ipv4_gateway = "%s" } disk { %s