From d9f8413836a132e09fcf0c83ab1477e4fce173cf 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 | 6 ++++++ 2 files changed, 17 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..2b3b824d02 100644 --- a/pkg/cloudprovider/providers/openstack/openstack_test.go +++ b/pkg/cloudprovider/providers/openstack/openstack_test.go @@ -593,9 +593,11 @@ func TestNodeAddresses(t *testing.T) { FixedIPs: []attachinterfaces.FixedIP{ { IPAddress: "10.0.0.32", + PortState: "ACTIVE", }, { IPAddress: "10.0.0.31", + PortState: "ACTIVE", }, }, }, @@ -671,9 +673,11 @@ func TestNodeAddressesCustomPublicNetwork(t *testing.T) { FixedIPs: []attachinterfaces.FixedIP{ { IPAddress: "10.0.0.32", + PortState: "ACTIVE", }, { IPAddress: "10.0.0.31", + PortState: "ACTIVE", }, }, }, @@ -749,9 +753,11 @@ func TestNodeAddressesIPv6Disabled(t *testing.T) { FixedIPs: []attachinterfaces.FixedIP{ { IPAddress: "10.0.0.32", + PortState: "ACTIVE", }, { IPAddress: "10.0.0.31", + PortState: "ACTIVE", }, }, },