Skip to content

[WIP] Libnetwork: Refactor to use deterministic network order #689

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
mheon wants to merge 2 commits into
base: main
Choose a base branch
from
+292 −204
Draft

[WIP] Libnetwork: Refactor to use deterministic network order #689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77c3de3
HACK HACK HACK: Build Netavark from source to test changes
mheon Mar 17, 2026
814488c
Libnetwork: Refactor to use deterministic network order
mheon Mar 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions common/libnetwork/internal/util/validate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,12 +145,12 @@ func ValidateSetupOptions(n NetUtil, namespacePath string, options types.SetupOp
if len(options.Networks) == 0 {
return errors.New("must specify at least one network")
}
for name, netOpts := range options.Networks {
network, err := n.Network(name)
for _, net := range options.Networks {
network, err := n.Network(net.Name)
if err != nil {
return err
}
err = validatePerNetworkOpts(network, &netOpts)
err = validatePerNetworkOpts(network, &net.PerNetworkOptions)
if err != nil {
return err
}
Expand Down
62 changes: 31 additions & 31 deletions common/libnetwork/netavark/ipam.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,10 @@ func (n *netavarkNetwork) allocIPs(opts *types.NetworkOptions) error {
defer db.Close()

err = db.Update(func(tx *bbolt.Tx) error {
for netName, netOpts := range opts.Networks {
network := n.networks[netName]
for index, namedNet := range opts.Networks {
network := n.networks[namedNet.Name]
if network == nil {
return newIPAMError(nil, "could not find network %q", netName)
return newIPAMError(nil, "could not find network %q", namedNet.Name)
}

// check if we have to alloc ips
Expand All @@ -89,23 +89,23 @@ func (n *netavarkNetwork) allocIPs(opts *types.NetworkOptions) error {
}

// create/get network bucket
netBkt, err := tx.CreateBucketIfNotExists([]byte(netName))
netBkt, err := tx.CreateBucketIfNotExists([]byte(namedNet.Name))
if err != nil {
return newIPAMError(err, "failed to create/get network bucket for network %s", netName)
return newIPAMError(err, "failed to create/get network bucket for network %s", namedNet.Name)
}

// requestIPs is the list of ips which should be used for this container
requestIPs := make([]net.IP, 0, len(netOpts.StaticIPs))
requestIPs := make([]net.IP, 0, len(namedNet.PerNetworkOptions.StaticIPs))

for i, subnet := range network.Subnets {
subnetBkt, err := netBkt.CreateBucketIfNotExists([]byte(subnet.Subnet.String()))
if err != nil {
return newIPAMError(err, "failed to create/get subnet bucket for network %s", netName)
return newIPAMError(err, "failed to create/get subnet bucket for network %s", namedNet.Name)
}

// check for static ips requested for this subnet and allocate them if available
hasSubnetStaticIP := false
for _, staticIP := range netOpts.StaticIPs {
for _, staticIP := range namedNet.PerNetworkOptions.StaticIPs {
if subnet.Subnet.Contains(staticIP) {
hasSubnetStaticIP = true

Expand Down Expand Up @@ -146,7 +146,7 @@ func (n *netavarkNetwork) allocIPs(opts *types.NetworkOptions) error {

idsBucket, err := netBkt.CreateBucketIfNotExists(idBucketKey)
if err != nil {
return newIPAMError(err, "failed to create/get id bucket for network %s", netName)
return newIPAMError(err, "failed to create/get id bucket for network %s", namedNet.Name)
}

ipsBytes, err := json.Marshal(requestIPs)
Expand All @@ -159,8 +159,8 @@ func (n *netavarkNetwork) allocIPs(opts *types.NetworkOptions) error {
return newIPAMError(err, "failed to store ips in database")
}

netOpts.StaticIPs = requestIPs
opts.Networks[netName] = netOpts
namedNet.PerNetworkOptions.StaticIPs = requestIPs
opts.Networks[index].PerNetworkOptions = namedNet.PerNetworkOptions
}
return nil
})
Expand Down Expand Up @@ -249,30 +249,30 @@ func (n *netavarkNetwork) getAssignedIPs(opts *types.NetworkOptions) error {
defer db.Close()

err = db.View(func(tx *bbolt.Tx) error {
for netName, netOpts := range opts.Networks {
network := n.networks[netName]
for index, namedNet := range opts.Networks {
network := n.networks[namedNet.Name]
if network == nil {
return newIPAMError(nil, "could not find network %q", netName)
return newIPAMError(nil, "could not find network %q", namedNet.Name)
}

// check if we have to alloc ips
if !requiresIPAMAlloc(network) {
continue
}
// get network bucket
netBkt := tx.Bucket([]byte(netName))
netBkt := tx.Bucket([]byte(namedNet.Name))
if netBkt == nil {
return newIPAMError(nil, "failed to get network bucket for network %s", netName)
return newIPAMError(nil, "failed to get network bucket for network %s", namedNet.Name)
}

idBkt := netBkt.Bucket(idBucketKey)
if idBkt == nil {
return newIPAMError(nil, "failed to get id bucket for network %s", netName)
return newIPAMError(nil, "failed to get id bucket for network %s", namedNet.Name)
}

ipJSON := idBkt.Get([]byte(opts.ContainerID))
if ipJSON == nil {
return newIPAMError(nil, "failed to get ips for container ID %s on network %s", opts.ContainerID, netName)
return newIPAMError(nil, "failed to get ips for container ID %s on network %s", opts.ContainerID, namedNet.Name)
}

// assignedIPs is the list of ips which should be used for this container
Expand All @@ -287,8 +287,8 @@ func (n *netavarkNetwork) getAssignedIPs(opts *types.NetworkOptions) error {
util.NormalizeIP(&assignedIPs[i])
}

netOpts.StaticIPs = assignedIPs
opts.Networks[netName] = netOpts
namedNet.PerNetworkOptions.StaticIPs = assignedIPs
opts.Networks[index].PerNetworkOptions = namedNet.PerNetworkOptions
}
return nil
})
Expand All @@ -306,56 +306,56 @@ func (n *netavarkNetwork) deallocIPs(opts *types.NetworkOptions) error {
defer db.Close()

err = db.Update(func(tx *bbolt.Tx) error {
for netName, netOpts := range opts.Networks {
network := n.networks[netName]
for _, namedNet := range opts.Networks {
network := n.networks[namedNet.Name]
if network == nil {
return newIPAMError(nil, "could not find network %q", netName)
return newIPAMError(nil, "could not find network %q", namedNet.Name)
}

// check if we have to alloc ips
if !requiresIPAMAlloc(network) {
continue
}
// get network bucket
netBkt := tx.Bucket([]byte(netName))
netBkt := tx.Bucket([]byte(namedNet.Name))
if netBkt == nil {
return newIPAMError(nil, "failed to get network bucket for network %s", netName)
return newIPAMError(nil, "failed to get network bucket for network %s", namedNet.Name)
}

for _, subnet := range network.Subnets {
subnetBkt := netBkt.Bucket([]byte(subnet.Subnet.String()))
if subnetBkt == nil {
return newIPAMError(nil, "failed to get subnet bucket for network %s", netName)
return newIPAMError(nil, "failed to get subnet bucket for network %s", namedNet.Name)
}

// search for a static ip which matches the current subnet
// in this case the user wants this one and we should not assign a free one
removed := false
for _, assignedIP := range netOpts.StaticIPs {
for _, assignedIP := range namedNet.PerNetworkOptions.StaticIPs {
if subnet.Subnet.Contains(assignedIP) {
removed = true
util.NormalizeIP(&assignedIP)

err = subnetBkt.Delete(assignedIP)
if err != nil {
return newIPAMError(err, "failed to remove ip %s from subnet bucket for network %s", assignedIP.String(), netName)
return newIPAMError(err, "failed to remove ip %s from subnet bucket for network %s", assignedIP.String(), namedNet.Name)
}
}
}

if !removed {
return newIPAMError(nil, "failed to find ip for subnet %s on network %s", subnet.Subnet.String(), netName)
return newIPAMError(nil, "failed to find ip for subnet %s on network %s", subnet.Subnet.String(), namedNet.Name)
}
}

idBkt := netBkt.Bucket(idBucketKey)
if idBkt == nil {
return newIPAMError(nil, "failed to get id bucket for network %s", netName)
return newIPAMError(nil, "failed to get id bucket for network %s", namedNet.Name)
}

err = idBkt.Delete([]byte(opts.ContainerID))
if err != nil {
return newIPAMError(err, "failed to remove allocated ips for container ID %s on network %s", opts.ContainerID, netName)
return newIPAMError(err, "failed to remove allocated ips for container ID %s on network %s", opts.ContainerID, namedNet.Name)
}
}
return nil
Expand Down
Loading
Loading