beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

libnetwork: macvlan: processIPAM(): simplify

Browse source 
Remove redundant checks and intermediate variables.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2022-07-01 10:39:49 +02:00
parent 5d13b38479
commit b768d69c04
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
1 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
libnetwork/drivers/macvlan/macvlan_network.go
View file

@ -236,22 +236,16 @@ func (config *configuration) fromOptions(labels map[string]string) error {
// processIPAM parses v4 and v6 IP information and binds it to the network configuration
func (config *configuration) processIPAM(ipamV4Data, ipamV6Data []driverapi.IPAMData) {
if len(ipamV4Data) > 0 {
for _, ipd := range ipamV4Data {
s := &ipSubnet{
SubnetIP: ipd.Pool.String(),
GwIP: ipd.Gateway.String(),
}
config.Ipv4Subnets = append(config.Ipv4Subnets, s)
}
for _, ipd := range ipamV4Data {
config.Ipv4Subnets = append(config.Ipv4Subnets, &ipSubnet{
SubnetIP: ipd.Pool.String(),
GwIP: ipd.Gateway.String(),
})
}
if len(ipamV6Data) > 0 {
for _, ipd := range ipamV6Data {
s := &ipSubnet{
SubnetIP: ipd.Pool.String(),
GwIP: ipd.Gateway.String(),
}
config.Ipv6Subnets = append(config.Ipv6Subnets, s)
}
for _, ipd := range ipamV6Data {
config.Ipv6Subnets = append(config.Ipv6Subnets, &ipSubnet{
SubnetIP: ipd.Pool.String(),
GwIP: ipd.Gateway.String(),
})
}
}