From 082fe1e76440154ae5a193f82b18d0951a0a3e06 Mon Sep 17 00:00:00 2001 From: Qu Xuan Date: Tue, 18 Feb 2020 15:36:20 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=81=BF=E5=85=8D=E5=B0=86=E8=99=9A?= =?UTF-8?q?=E6=8B=9F=E6=9C=BAip=E5=90=8C=E6=AD=A5=E5=88=B0=E5=BC=B9?= =?UTF-8?q?=E6=80=A7=E7=BD=91=E5=8D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/multicloud/openstack/port.go | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkg/multicloud/openstack/port.go b/pkg/multicloud/openstack/port.go index 222ddff47a..673f6e3b0f 100644 --- a/pkg/multicloud/openstack/port.go +++ b/pkg/multicloud/openstack/port.go @@ -17,10 +17,10 @@ package openstack import ( "fmt" "net/url" + "strings" "time" "yunion.io/x/pkg/errors" - "yunion.io/x/pkg/utils" api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudprovider" @@ -150,13 +150,11 @@ func (region *SRegion) GetINetworkInterfaces() ([]cloudprovider.ICloudNetworkInt } ret := []cloudprovider.ICloudNetworkInterface{} for i := 0; i < len(ports); i++ { - if len(ports[i].DeviceID) == 0 || !utils.IsInStringArray(ports[i].DeviceOwner, []string{ - "compute:nova", //instance ip addr - "network:floatingip", //float ip addr - }) { - ports[i].region = region - ret = append(ret, &ports[i]) + if strings.HasPrefix(ports[i].DeviceOwner, "compute:") || ports[i].DeviceOwner == "network:floatingip" { + continue } + ports[i].region = region + ret = append(ret, &ports[i]) } return ret, nil }