From 002a618e7938a8a356e47a9c5bc7b77db2d84139 Mon Sep 17 00:00:00 2001 From: tangbin Date: Sat, 9 May 2020 19:28:37 +0800 Subject: [PATCH] huawei network id fix --- pkg/compute/models/loadbalancers.go | 3 ++- pkg/multicloud/huawei/loadbalancer.go | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pkg/compute/models/loadbalancers.go b/pkg/compute/models/loadbalancers.go index db1edf1a47..566ee00558 100644 --- a/pkg/compute/models/loadbalancers.go +++ b/pkg/compute/models/loadbalancers.go @@ -950,7 +950,8 @@ func (lb *SLoadbalancer) SyncWithCloudLoadbalancer(ctx context.Context, userCred lb.EgressMbps = extLb.GetEgressMbps() lb.ChargeType = extLb.GetChargeType() lb.ManagerId = provider.Id - + lbNetworkIds := getExtLbNetworkIds(extLb) + lb.NetworkId = strings.Join(lbNetworkIds, ",") if extLb.GetMetadata() != nil { lb.LBInfo = extLb.GetMetadata() } diff --git a/pkg/multicloud/huawei/loadbalancer.go b/pkg/multicloud/huawei/loadbalancer.go index 7659fdd2c3..53a48f45a6 100644 --- a/pkg/multicloud/huawei/loadbalancer.go +++ b/pkg/multicloud/huawei/loadbalancer.go @@ -149,7 +149,12 @@ func (self *SLoadbalancer) GetNetworkType() string { } func (self *SLoadbalancer) GetNetworkIds() []string { - return []string{self.VipSubnetID} + net := self.GetNetwork() + if net != nil { + return []string{net.GetId()} + } + + return []string{} } func (self *SLoadbalancer) GetNetwork() *SNetwork {