From 9256f0224d8cfb1a0f434c8450b47a7a8b5409cd Mon Sep 17 00:00:00 2001 From: kayrus Date: Wed, 8 Jan 2020 07:12:30 +0100 Subject: [PATCH] code review --- .../providers/openstack/openstack.go | 20 ++++++++++--------- .../providers/openstack/openstack_test.go | 3 +++ 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/pkg/cloudprovider/providers/openstack/openstack.go b/pkg/cloudprovider/providers/openstack/openstack.go index 0cbd22ccb8..096cbc7b21 100644 --- a/pkg/cloudprovider/providers/openstack/openstack.go +++ b/pkg/cloudprovider/providers/openstack/openstack.go @@ -675,21 +675,23 @@ func getServerByName(client *gophercloud.ServiceClient, name types.NodeName) (*S // * interfaces private IPs // * access IPs // * metadata hostname -// * server object Addresses +// * server object Addresses (floating type) func nodeAddresses(srv *servers.Server, interfaces []attachinterfaces.Interface, networkingOpts NetworkingOpts) ([]v1.NodeAddress, error) { addrs := []v1.NodeAddress{} // parse private IP addresses first in an ordered manner for _, iface := range interfaces { for _, fixedIP := range iface.FixedIPs { - isIPv6 := net.ParseIP(fixedIP.IPAddress).To4() == nil - if !(isIPv6 && networkingOpts.IPv6SupportDisabled) { - v1helper.AddToNodeAddresses(&addrs, - v1.NodeAddress{ - Type: v1.NodeInternalIP, - Address: fixedIP.IPAddress, - }, - ) + if iface.PortState == "ACTIVE" { + isIPv6 := net.ParseIP(fixedIP.IPAddress).To4() == nil + if !(isIPv6 && networkingOpts.IPv6SupportDisabled) { + v1helper.AddToNodeAddresses(&addrs, + v1.NodeAddress{ + Type: v1.NodeInternalIP, + Address: fixedIP.IPAddress, + }, + ) + } } } } diff --git a/pkg/cloudprovider/providers/openstack/openstack_test.go b/pkg/cloudprovider/providers/openstack/openstack_test.go index bd7fa0769a..605cb5cf3c 100644 --- a/pkg/cloudprovider/providers/openstack/openstack_test.go +++ b/pkg/cloudprovider/providers/openstack/openstack_test.go @@ -590,6 +590,7 @@ func TestNodeAddresses(t *testing.T) { interfaces := []attachinterfaces.Interface{ { + PortState: "ACTIVE", FixedIPs: []attachinterfaces.FixedIP{ { IPAddress: "10.0.0.32", @@ -668,6 +669,7 @@ func TestNodeAddressesCustomPublicNetwork(t *testing.T) { interfaces := []attachinterfaces.Interface{ { + PortState: "ACTIVE", FixedIPs: []attachinterfaces.FixedIP{ { IPAddress: "10.0.0.32", @@ -746,6 +748,7 @@ func TestNodeAddressesIPv6Disabled(t *testing.T) { interfaces := []attachinterfaces.Interface{ { + PortState: "ACTIVE", FixedIPs: []attachinterfaces.FixedIP{ { IPAddress: "10.0.0.32",