Skip to content

Commit d7aa567

Browse files
committed
fix
1 parent f6c671a commit d7aa567

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

pkg/vpcmodel/externalNetwork.go

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,23 +68,21 @@ func GetDefaultPublicInternetAddressList() []string {
6868
}
6969
}
7070

71-
func (n *NetworkAddressLists) GetPublicInternetIPblocksList() ([]*netset.IPBlock, *netset.IPBlock, error) {
71+
func (n *NetworkAddressLists) GetPublicInternetIPblocksList() (ipList []*netset.IPBlock, ipRanges *netset.IPBlock, err error) {
7272
if len(n.publicInternetAddressList) == 0 {
7373
return ipStringsToIPblocks(GetDefaultPublicInternetAddressList())
7474
}
75-
allInternetRanges := netset.NewIPBlock()
7675
for _, ipRange := range n.publicInternetAddressList {
77-
allInternetRanges = allInternetRanges.Union(ipRange)
76+
ipRanges = ipRanges.Union(ipRange)
7877
}
79-
return n.publicInternetAddressList, allInternetRanges, nil
78+
return n.publicInternetAddressList, ipRanges, nil
8079
}
8180

82-
func (n *NetworkAddressLists) GetServiceNetworkIPblocksList() ([]*netset.IPBlock, *netset.IPBlock, error) {
83-
allServiceNetworkRanges := netset.NewIPBlock()
81+
func (n *NetworkAddressLists) GetServiceNetworkIPblocksList() (ipList []*netset.IPBlock, ipRanges *netset.IPBlock, err error) {
8482
for _, ipRange := range n.serviceNetworkAddressList {
85-
allServiceNetworkRanges = allServiceNetworkRanges.Union(ipRange)
83+
ipRanges = ipRanges.Union(ipRange)
8684
}
87-
return n.serviceNetworkAddressList, allServiceNetworkRanges, nil
85+
return n.serviceNetworkAddressList, ipRanges, nil
8886
}
8987

9088
// ExternalNetwork implements Node interface

0 commit comments

Comments
 (0)