GitList

integration/network/bridge/bridge_linux_test.go

@@ -16,6 +16,7 @@ import (
                      	"github.com/docker/docker/internal/nlwrap"
                      	"github.com/docker/docker/internal/testutils/networking"
                      	"github.com/docker/docker/libnetwork/drivers/bridge"
                     +	"github.com/docker/docker/libnetwork/netlabel"
                      	"github.com/docker/docker/testutil"
                      	"github.com/docker/docker/testutil/daemon"
                      	"github.com/vishvananda/netlink"
@@ -404,3 +405,21 @@ func TestIsolated(t *testing.T) {
                      	ping(t, "-4")
                      	ping(t, "-6")
+                     }
+                    +
                     +func TestEndpointWithCustomIfname(t *testing.T) {
                     +	ctx := setupTest(t)
                     +	apiClient := testEnv.APIClient()
+                    +
                     +	ctrID := ctr.Run(ctx, t, apiClient,
                     +		ctr.WithCmd("ip", "-o", "link", "show", "foobar"),
                     +		ctr.WithEndpointSettings("bridge", &networktypes.EndpointSettings{
                     +			DriverOpts: map[string]string{
                     +				netlabel.Ifname: "foobar",
                     +			},
                     +		}))
                     +	defer ctr.Remove(ctx, t, apiClient, ctrID, containertypes.RemoveOptions{Force: true})
+                    +
                     +	out, err := ctr.Output(ctx, apiClient, ctrID)
                     +	assert.NilError(t, err)
                     +	assert.Assert(t, strings.Contains(out.Stdout, ": foobar@if"), "expected ': foobar@if' in 'ip link show':\n%s", out.Stdout)
                     +}

integration/network/ipvlan/ipvlan_test.go

History View file @ 56a7817

@@ -15,6 +15,7 @@ import (
                      	"github.com/docker/docker/integration/internal/container"
                      	net "github.com/docker/docker/integration/internal/network"
                      	n "github.com/docker/docker/integration/network"
                     +	"github.com/docker/docker/libnetwork/netlabel"
                      	"github.com/docker/docker/testutil"
                      	"github.com/docker/docker/testutil/daemon"
                      	"gotest.tools/v3/assert"
@@ -682,3 +683,33 @@ func TestPointToPoint(t *testing.T) {
                      		})
+                     	}
+                     }
+                    +
                     +func TestEndpointWithCustomIfname(t *testing.T) {
                     +	skip.If(t, testEnv.IsRemoteDaemon)
                     +	skip.If(t, testEnv.IsRootless, "rootless mode has different view of network")
+                    +
                     +	ctx := setupTest(t)
                     +	apiClient := testEnv.APIClient()
+                    +
                     +	// master dummy interface 'di' notation represent 'docker ipvlan'
                     +	const master = "di-dummy0"
                     +	n.CreateMasterDummy(ctx, t, master)
                     +	defer n.DeleteInterface(ctx, t, master)
+                    +
                     +	// create a network specifying the desired sub-interface name
                     +	const netName = "ipvlan-custom-ifname"
                     +	net.CreateNoError(ctx, t, apiClient, netName, net.WithIPvlan("di-dummy0.70", ""))
+                    +
                     +	ctrID := container.Run(ctx, t, apiClient,
                     +		container.WithCmd("ip", "-o", "link", "show", "foobar"),
                     +		container.WithEndpointSettings(netName, &network.EndpointSettings{
                     +			DriverOpts: map[string]string{
                     +				netlabel.Ifname: "foobar",
                     +			},
                     +		}))
                     +	defer container.Remove(ctx, t, apiClient, ctrID, containertypes.RemoveOptions{Force: true})
+                    +
                     +	out, err := container.Output(ctx, apiClient, ctrID)
                     +	assert.NilError(t, err)
                     +	assert.Assert(t, strings.Contains(out.Stdout, ": foobar@if"), "expected ': foobar@if' in 'ip link show':\n%s", out.Stdout)
                     +}

integration/network/ipvlan/main_test.go

History View file @ 56a7817

@@ -48,3 +48,10 @@ func TestMain(m *testing.M) {
                      	shutdown(ctx)
                      	os.Exit(code)
+                     }
+                    +
                     +func setupTest(t *testing.T) context.Context {
                     +	ctx := testutil.StartSpan(baseContext, t)
                     +	environment.ProtectAll(ctx, t, testEnv)
                     +	t.Cleanup(func() { testEnv.Clean(ctx, t) })
                     +	return ctx
                     +}

integration/network/macvlan/macvlan_test.go

History View file @ 56a7817

@@ -14,6 +14,7 @@ import (
                      	"github.com/docker/docker/integration/internal/container"
                      	net "github.com/docker/docker/integration/internal/network"
                      	n "github.com/docker/docker/integration/network"
                     +	"github.com/docker/docker/libnetwork/netlabel"
                      	"github.com/docker/docker/testutil"
                      	"github.com/docker/docker/testutil/daemon"
                      	"gotest.tools/v3/assert"
@@ -640,3 +641,32 @@ func TestPointToPoint(t *testing.T) {
                      	assert.Check(t, is.Equal(res.Stderr.Len(), 0))
                      	assert.Check(t, is.Contains(res.Stdout.String(), "1 packets transmitted, 1 packets received"))
+                     }
+                    +
                     +func TestEndpointWithCustomIfname(t *testing.T) {
                     +	skip.If(t, testEnv.IsRemoteDaemon)
                     +	skip.If(t, testEnv.IsRootless, "rootless mode has different view of network")
+                    +
                     +	ctx := setupTest(t)
                     +	apiClient := testEnv.APIClient()
+                    +
                     +	const master = "dm-dummy0"
                     +	n.CreateMasterDummy(ctx, t, master)
                     +	defer n.DeleteInterface(ctx, t, master)
+                    +
                     +	// create a network specifying the desired sub-interface name
                     +	const netName = "macvlan-custom-ifname"
                     +	net.CreateNoError(ctx, t, apiClient, netName, net.WithMacvlan("dm-dummy0.60"))
+                    +
                     +	ctrID := container.Run(ctx, t, apiClient,
                     +		container.WithCmd("ip", "-o", "link", "show", "foobar"),
                     +		container.WithEndpointSettings(netName, &network.EndpointSettings{
                     +			DriverOpts: map[string]string{
                     +				netlabel.Ifname: "foobar",
                     +			},
                     +		}))
                     +	defer container.Remove(ctx, t, apiClient, ctrID, containertypes.RemoveOptions{Force: true})
+                    +
                     +	out, err := container.Output(ctx, apiClient, ctrID)
                     +	assert.NilError(t, err)
                     +	assert.Assert(t, strings.Contains(out.Stdout, ": foobar@if"), "expected ': foobar@if' in 'ip link show':\n%s", out.Stdout)
                     +}

integration/network/macvlan/main_test.go

History View file @ 56a7817

@@ -52,3 +52,10 @@ func TestMain(m *testing.M) {
                      	shutdown(ctx)
                      	os.Exit(code)
+                     }
+                    +
                     +func setupTest(t *testing.T) context.Context {
                     +	ctx := testutil.StartSpan(baseContext, t)
                     +	environment.ProtectAll(ctx, t, testEnv)
                     +	t.Cleanup(func() { testEnv.Clean(ctx, t) })
                     +	return ctx
                     +}

integration/network/overlay/main_test.go

History View file @ 56a7817

                     new file mode 100644
@@ -0,0 +1,61 @@
                     +//go:build !windows
+                    +
                     +package overlay // import "github.com/docker/docker/integration/network/overlay"
+                    +
                     +import (
                     +	"context"
                     +	"os"
                     +	"testing"
+                    +
                     +	"github.com/docker/docker/testutil"
                     +	"github.com/docker/docker/testutil/environment"
                     +	"go.opentelemetry.io/otel"
                     +	"go.opentelemetry.io/otel/attribute"
                     +	"go.opentelemetry.io/otel/codes"
                     +)
+                    +
                     +var (
                     +	testEnv     *environment.Execution
                     +	baseContext context.Context
                     +)
+                    +
                     +func TestMain(m *testing.M) {
                     +	shutdown := testutil.ConfigureTracing()
+                    +
                     +	ctx, span := otel.Tracer("").Start(context.Background(), "integration/network/overlay/TestMain")
                     +	baseContext = ctx
+                    +
                     +	var err error
                     +	testEnv, err = environment.New(ctx)
                     +	if err != nil {
                     +		span.SetStatus(codes.Error, err.Error())
                     +		span.End()
                     +		shutdown(ctx)
                     +		panic(err)
                     +	}
+                    +
                     +	err = environment.EnsureFrozenImagesLinux(ctx, testEnv)
                     +	if err != nil {
                     +		span.SetStatus(codes.Error, err.Error())
                     +		span.End()
                     +		shutdown(ctx)
                     +		panic(err)
                     +	}
+                    +
                     +	testEnv.Print()
                     +	code := m.Run()
                     +	if code != 0 {
                     +		span.SetStatus(codes.Error, "m.Run() returned non-zero exit code")
                     +	}
                     +	span.SetAttributes(attribute.Int("exit", code))
                     +	span.End()
                     +	shutdown(ctx)
                     +	os.Exit(code)
                     +}
+                    +
                     +func setupTest(t *testing.T) context.Context {
                     +	ctx := testutil.StartSpan(baseContext, t)
                     +	environment.ProtectAll(ctx, t, testEnv)
                     +	t.Cleanup(func() { testEnv.Clean(ctx, t) })
                     +	return ctx
                     +}

integration/network/overlay/main_windows_test.go

History View file @ 56a7817

                     new file mode 100644
@@ -0,0 +1 @@
                     +package overlay // import "github.com/docker/docker/integration/network/overlay"

integration/network/overlay/overlay_test.go

History View file @ 56a7817

                     new file mode 100644
@@ -0,0 +1,49 @@
                     +//go:build !windows
+                    +
                     +package overlay // import "github.com/docker/docker/integration/network/overlay"
+                    +
                     +import (
                     +	"strings"
                     +	"testing"
+                    +
                     +	containertypes "github.com/docker/docker/api/types/container"
                     +	"github.com/docker/docker/api/types/network"
                     +	"github.com/docker/docker/integration/internal/container"
                     +	net "github.com/docker/docker/integration/internal/network"
                     +	"github.com/docker/docker/libnetwork/netlabel"
                     +	"github.com/docker/docker/testutil/daemon"
                     +	"gotest.tools/v3/assert"
                     +	"gotest.tools/v3/skip"
                     +)
+                    +
                     +func TestEndpointWithCustomIfname(t *testing.T) {
                     +	skip.If(t, testEnv.IsRootless, "rootless mode doesn't support overlay networks")
+                    +
                     +	ctx := setupTest(t)
+                    +
                     +	d := daemon.New(t)
                     +	d.StartAndSwarmInit(ctx, t)
                     +	defer d.Stop(t)
                     +	defer d.SwarmLeave(ctx, t, true)
+                    +
                     +	apiClient := d.NewClientT(t)
+                    +
                     +	// create a network specifying the desired sub-interface name
                     +	const netName = "overlay-custom-ifname"
                     +	net.CreateNoError(ctx, t, apiClient, netName,
                     +		net.WithDriver("overlay"),
                     +		net.WithAttachable())
+                    +
                     +	ctrID := container.Run(ctx, t, apiClient,
                     +		container.WithCmd("ip", "-o", "link", "show", "foobar"),
                     +		container.WithEndpointSettings(netName, &network.EndpointSettings{
                     +			DriverOpts: map[string]string{
                     +				netlabel.Ifname: "foobar",
                     +			},
                     +		}))
                     +	defer container.Remove(ctx, t, apiClient, ctrID, containertypes.RemoveOptions{Force: true})
+                    +
                     +	out, err := container.Output(ctx, apiClient, ctrID)
                     +	assert.NilError(t, err)
                     +	assert.Assert(t, strings.Contains(out.Stdout, ": foobar@if"), "expected ': foobar@if' in 'ip link show':\n%s", out.Stdout)
                     +}

integration/network/service_test.go

History View file @ 56a7817

@@ -2,15 +2,19 @@ package network // import "github.com/docker/docker/integration/network"
                      import (
                      	"context"
                     +	"strings"
                      	"testing"
                      	"time"
                      	"github.com/docker/docker/api/types"
                     +	containertypes "github.com/docker/docker/api/types/container"
                      	networktypes "github.com/docker/docker/api/types/network"
                      	swarmtypes "github.com/docker/docker/api/types/swarm"
                      	"github.com/docker/docker/client"
                     +	"github.com/docker/docker/integration/internal/container"
                      	"github.com/docker/docker/integration/internal/network"
                      	"github.com/docker/docker/integration/internal/swarm"
                     +	"github.com/docker/docker/libnetwork/netlabel"
                      	"github.com/docker/docker/testutil"
                      	"github.com/docker/docker/testutil/daemon"
                      	"gotest.tools/v3/assert"
@@ -465,3 +469,66 @@ func TestServiceWithDefaultAddressPoolInit(t *testing.T) {
                      	err = d.SwarmLeave(ctx, t, true)
                      	assert.NilError(t, err)
+                     }
+                    +
                     +func TestCustomIfnameIsPreservedOnLiveRestore(t *testing.T) {
                     +	skip.If(t, testEnv.DaemonInfo.OSType == "windows", "custom interface name is only supported by Linux netdrivers")
                     +	skip.If(t, testEnv.IsRootless, "rootless mode doesn't support live-restore")
+                    +
                     +	ctx := setupTest(t)
+                    +
                     +	d := daemon.New(t)
                     +	defer d.Stop(t)
                     +	d.StartWithBusybox(ctx, t, "--live-restore=true")
+                    +
                     +	apiClient := d.NewClientT(t)
                     +	defer apiClient.Close()
+                    +
                     +	ctrId := container.Run(ctx, t, apiClient,
                     +		container.WithCmd("top"),
                     +		container.WithEndpointSettings("bridge", &networktypes.EndpointSettings{
                     +			DriverOpts: map[string]string{
                     +				netlabel.Ifname: "foobar",
                     +			},
                     +		}))
                     +	defer container.Remove(ctx, t, apiClient, ctrId, containertypes.RemoveOptions{Force: true})
+                    +
                     +	d.Restart(t, "--live-restore=true")
+                    +
                     +	res, err := container.Exec(ctx, apiClient, ctrId, []string{"ip", "-o", "link", "show", "foobar"})
                     +	assert.NilError(t, err)
                     +	assert.Check(t, is.Equal(res.ExitCode, 0))
                     +	assert.Check(t, strings.Contains(res.Stdout(), ": foobar@if"), "expected ': foobar@if' in 'ip link show':\n%s", res.Stdout())
+                    +
                     +	// On live-restore, the daemon rebuilds the list of interfaces for all
                     +	// containers. Call NetworkDisconnect here to make sure that the right
                     +	// dstName is used internally.
                     +	err = apiClient.NetworkDisconnect(ctx, "bridge", ctrId, true)
                     +	assert.NilError(t, err)
                     +}
+                    +
                     +func TestCustomIfnameCollidesWithExistingIface(t *testing.T) {
                     +	skip.If(t, testEnv.DaemonInfo.OSType == "windows", "custom interface name is only supported by Linux netdrivers")
+                    +
                     +	ctx := setupTest(t)
+                    +
                     +	d := daemon.New(t)
                     +	defer d.Stop(t)
                     +	d.StartWithBusybox(ctx, t, "--live-restore=true")
+                    +
                     +	apiClient := d.NewClientT(t)
                     +	defer apiClient.Close()
+                    +
                     +	const testnet = "testnet"
                     +	network.CreateNoError(ctx, t, apiClient, testnet, network.WithDriver("bridge"))
+                    +
                     +	ctrId := container.Run(ctx, t, apiClient,
                     +		container.WithCmd("top"),
                     +		container.WithEndpointSettings("bridge", &networktypes.EndpointSettings{}))
                     +	defer container.Remove(ctx, t, apiClient, ctrId, containertypes.RemoveOptions{Force: true})
+                    +
                     +	err := apiClient.NetworkConnect(ctx, testnet, ctrId, &networktypes.EndpointSettings{DriverOpts: map[string]string{
                     +		netlabel.Ifname: "eth0",
                     +	}})
                     +	assert.ErrorContains(t, err, "error renaming interface")
                     +	assert.ErrorContains(t, err, "file exists")
                     +}

libnetwork/cnmallocator/manager.go

History View file @ 56a7817

@@ -55,7 +55,7 @@ func (d *manager) EndpointOperInfo(nid, eid string) (map[string]interface{}, err
 	return nil, types.NotImplementedErrorf("not implemented")
 }
 
-func (d *manager) Join(_ context.Context, nid, eid string, sboxKey string, jinfo driverapi.JoinInfo, options map[string]interface{}) error {
+func (d *manager) Join(_ context.Context, nid, eid string, sboxKey string, jinfo driverapi.JoinInfo, _, _ map[string]interface{}) error {
 	return types.NotImplementedErrorf("not implemented")
 }
 

libnetwork/driverapi/driverapi.go

History View file @ 56a7817

@@ -51,7 +51,7 @@ type Driver interface {
                      	EndpointOperInfo(nid, eid string) (map[string]interface{}, error)
                      	// Join method is invoked when a Sandbox is attached to an endpoint.
                     -	Join(ctx context.Context, nid, eid string, sboxKey string, jinfo JoinInfo, options map[string]interface{}) error
                     +	Join(ctx context.Context, nid, eid string, sboxKey string, jinfo JoinInfo, epOpts, sbOpts map[string]interface{}) error
                      	// Leave method is invoked when a Sandbox detaches from an endpoint.
                      	Leave(nid, eid string) error
@@ -140,8 +140,10 @@ type InterfaceInfo interface {
                      // InterfaceNameInfo provides a go interface for the drivers to assign names
                      // to interfaces.
                      type InterfaceNameInfo interface {
                     -	// SetNames method assigns the srcName and dstPrefix for the interface.
                     -	SetNames(srcName, dstPrefix string) error
                     +	// SetNames method assigns the srcName, dstPrefix, and dstName for the
                     +	// interface. If both dstName and dstPrefix are set, dstName takes
                     +	// precedence.
                     +	SetNames(srcName, dstPrefix, dstName string) error
+                     }
                      // JoinInfo represents a set of resources that the driver has the ability to provide during

libnetwork/drivers/bridge/bridge_linux.go

History View file @ 56a7817

@@ -1444,7 +1444,7 @@ func (d *driver) EndpointOperInfo(nid, eid string) (map[string]interface{}, erro
 }
 
 // Join method is invoked when a Sandbox is attached to an endpoint.
-func (d *driver) Join(ctx context.Context, nid, eid string, sboxKey string, jinfo driverapi.JoinInfo, options map[string]interface{}) error {
+func (d *driver) Join(ctx context.Context, nid, eid string, sboxKey string, jinfo driverapi.JoinInfo, epOpts, sbOpts map[string]interface{}) error {
 	ctx, span := otel.Tracer("").Start(ctx, "libnetwork.drivers.bridge.Join", trace.WithAttributes(
 		attribute.String("nid", nid),
 		attribute.String("eid", eid),
@@ -1465,7 +1465,7 @@ func (d *driver) Join(ctx context.Context, nid, eid string, sboxKey string, jinf
 		return endpointNotFoundError(eid)
 	}
 
-	endpoint.containerConfig, err = parseContainerOptions(options)
+	endpoint.containerConfig, err = parseContainerOptions(sbOpts)
 	if err != nil {
 		return err
 	}
@@ -1475,7 +1475,7 @@ func (d *driver) Join(ctx context.Context, nid, eid string, sboxKey string, jinf
 	if network.config.ContainerIfacePrefix != "" {
 		containerVethPrefix = network.config.ContainerIfacePrefix
 	}
-	if err := iNames.SetNames(endpoint.srcName, containerVethPrefix); err != nil {
+	if err := iNames.SetNames(endpoint.srcName, containerVethPrefix, netlabel.GetIfname(epOpts)); err != nil {
 		return err
 	}
 

libnetwork/drivers/bridge/bridge_linux_test.go

History View file @ 56a7817

@@ -642,6 +642,7 @@ type testInterface struct {
                      	addr               *net.IPNet
                      	addrv6             *net.IPNet
                      	srcName            string
                     +	dstPrefix          string
                      	dstName            string
                      	createdInContainer bool
                      	netnsPath          string
@@ -727,8 +728,9 @@ func (i *testInterface) SetCreatedInContainer(cic bool) {
                      	i.createdInContainer = cic
+                     }
                     -func (i *testInterface) SetNames(srcName string, dstName string) error {
                     +func (i *testInterface) SetNames(srcName, dstPrefix, dstName string) error {
                      	i.srcName = srcName
                     +	i.dstPrefix = dstPrefix
                      	i.dstName = dstName
                      	return nil
+                     }
@@ -818,7 +820,7 @@ func testQueryEndpointInfo(t *testing.T, ulPxyEnabled bool) {
                      		t.Fatalf("Failed to create an endpoint : %s", err.Error())
+                     	}
                     -	err = d.Join(context.Background(), "net1", "ep1", "sbox", te, sbOptions)
                     +	err = d.Join(context.Background(), "net1", "ep1", "sbox", te, nil, sbOptions)
                      	if err != nil {
                      		t.Fatalf("Failed to join the endpoint: %v", err)
+                     	}
@@ -922,7 +924,7 @@ func TestLinkContainers(t *testing.T) {
                      	sbOptions := make(map[string]interface{})
                      	sbOptions[netlabel.ExposedPorts] = exposedPorts
                     -	err = d.Join(context.Background(), "net1", "ep1", "sbox", te1, sbOptions)
                     +	err = d.Join(context.Background(), "net1", "ep1", "sbox", te1, nil, sbOptions)
                      	if err != nil {
                      		t.Fatalf("Failed to join the endpoint: %v", err)
+                     	}
@@ -953,7 +955,7 @@ func TestLinkContainers(t *testing.T) {
                      		"ChildEndpoints": []string{"ep1"},
+                     	}
                     -	err = d.Join(context.Background(), "net1", "ep2", "", te2, sbOptions)
                     +	err = d.Join(context.Background(), "net1", "ep2", "", te2, nil, sbOptions)
                      	if err != nil {
                      		t.Fatal("Failed to link ep1 and ep2")
+                     	}
@@ -1011,7 +1013,7 @@ func TestLinkContainers(t *testing.T) {
                      		"ChildEndpoints": []string{"ep1", "ep4"},
+                     	}
                     -	err = d.Join(context.Background(), "net1", "ep2", "", te2, sbOptions)
                     +	err = d.Join(context.Background(), "net1", "ep2", "", te2, nil, sbOptions)
                      	if err != nil {
                      		t.Fatal(err)
+                     	}
@@ -1228,7 +1230,7 @@ func TestSetDefaultGw(t *testing.T) {
                      		t.Fatalf("Failed to create endpoint: %v", err)
+                     	}
                     -	err = d.Join(context.Background(), "dummy", "ep", "sbox", te, nil)
                     +	err = d.Join(context.Background(), "dummy", "ep", "sbox", te, nil, nil)
                      	if err != nil {
                      		t.Fatalf("Failed to join endpoint: %v", err)
+                     	}

libnetwork/drivers/bridge/brmanager/brmanager.go

History View file @ 56a7817

@@ -55,7 +55,7 @@ func (d *driver) EndpointOperInfo(nid, eid string) (map[string]interface{}, erro
 	return nil, types.NotImplementedErrorf("not implemented")
 }
 
-func (d *driver) Join(_ context.Context, nid, eid string, sboxKey string, jinfo driverapi.JoinInfo, options map[string]interface{}) error {
+func (d *driver) Join(_ context.Context, nid, eid string, sboxKey string, jinfo driverapi.JoinInfo, _, _ map[string]interface{}) error {
 	return types.NotImplementedErrorf("not implemented")
 }
 

libnetwork/drivers/bridge/network_linux_test.go

History View file @ 56a7817

@@ -43,8 +43,9 @@ func TestLinkCreate(t *testing.T) {
                      	err = d.CreateEndpoint(context.Background(), "dummy", "ep", te.Interface(), nil)
                      	assert.NilError(t, err)
                     -	err = d.Join(context.Background(), "dummy", "ep", "sbox", te, nil)
                     +	err = d.Join(context.Background(), "dummy", "ep", "sbox", te, nil, nil)
                      	assert.NilError(t, err)
                     +	assert.Assert(t, te.iface.dstPrefix != "", "got: %q, want: %q", te.iface.dstPrefix, "")
                      	// Verify sbox endpoint interface inherited MTU value from bridge config
                      	sboxLnk, err := nlwrap.LinkByName(te.iface.srcName)
@@ -59,8 +60,6 @@ func TestLinkCreate(t *testing.T) {
                      	assert.Check(t, is.ErrorType(err, errdefs.IsForbidden))
                      	assert.Assert(t, is.Error(err, "Endpoint (ep) already exists (Only one endpoint allowed)"), "Failed to detect duplicate endpoint id on same network")
                     -	assert.Check(t, te.iface.dstName != "", "Invalid Dstname returned")
+                    -
                      	_, err = nlwrap.LinkByName(te.iface.srcName)
                      	assert.Check(t, err, "Could not find source link %s", te.iface.srcName)

libnetwork/drivers/bridge/port_mapping_linux_test.go

History View file @ 56a7817

@@ -67,7 +67,7 @@ func TestPortMappingConfig(t *testing.T) {
 		t.Fatalf("Failed to create the endpoint: %s", err.Error())
 	}
 
-	if err = d.Join(context.Background(), "dummy", "ep1", "sbox", te, sbOptions); err != nil {
+	if err = d.Join(context.Background(), "dummy", "ep1", "sbox", te, nil, sbOptions); err != nil {
 		t.Fatalf("Failed to join the endpoint: %v", err)
 	}
 
@@ -153,7 +153,7 @@ func TestPortMappingV6Config(t *testing.T) {
 		t.Fatalf("Failed to create the endpoint: %s", err.Error())
 	}
 
-	if err = d.Join(context.Background(), "dummy", "ep1", "sbox", te, sbOptions); err != nil {
+	if err = d.Join(context.Background(), "dummy", "ep1", "sbox", te, nil, sbOptions); err != nil {
 		t.Fatalf("Failed to join the endpoint: %v", err)
 	}
 

libnetwork/drivers/host/host.go

History View file @ 56a7817

@@ -68,7 +68,7 @@ func (d *driver) EndpointOperInfo(nid, eid string) (map[string]interface{}, erro
 }
 
 // Join method is invoked when a Sandbox is attached to an endpoint.
-func (d *driver) Join(_ context.Context, nid, eid string, sboxKey string, jinfo driverapi.JoinInfo, options map[string]interface{}) error {
+func (d *driver) Join(_ context.Context, nid, eid string, sboxKey string, jinfo driverapi.JoinInfo, _, _ map[string]interface{}) error {
 	return nil
 }
 

libnetwork/drivers/ipvlan/ipvlan_joinleave.go

History View file @ 56a7817

@@ -9,6 +9,7 @@ import (
                      	"github.com/containerd/log"
                      	"github.com/docker/docker/libnetwork/driverapi"
                     +	"github.com/docker/docker/libnetwork/netlabel"
                      	"github.com/docker/docker/libnetwork/netutils"
                      	"github.com/docker/docker/libnetwork/ns"
                      	"github.com/docker/docker/libnetwork/types"
@@ -29,7 +30,7 @@ const (
+                     )
                      // Join method is invoked when a Sandbox is attached to an endpoint.
                     -func (d *driver) Join(ctx context.Context, nid, eid string, sboxKey string, jinfo driverapi.JoinInfo, options map[string]interface{}) error {
                     +func (d *driver) Join(ctx context.Context, nid, eid string, sboxKey string, jinfo driverapi.JoinInfo, epOpts, _ map[string]interface{}) error {
                      	ctx, span := otel.Tracer("").Start(ctx, "libnetwork.drivers.ipvlan.Join", trace.WithAttributes(
                      		attribute.String("nid", nid),
                      		attribute.String("eid", eid),
@@ -143,7 +144,7 @@ func (d *driver) Join(ctx context.Context, nid, eid string, sboxKey string, jinf
                      		jinfo.DisableGatewayService()
+                     	}
                      	iNames := jinfo.InterfaceName()
                     -	err = iNames.SetNames(vethName, containerVethPrefix)
                     +	err = iNames.SetNames(vethName, containerVethPrefix, netlabel.GetIfname(epOpts))
                      	if err != nil {
                      		return err
+                     	}

libnetwork/drivers/ipvlan/ivmanager/ivmanager.go

History View file @ 56a7817

@@ -55,7 +55,7 @@ func (d *driver) EndpointOperInfo(nid, eid string) (map[string]interface{}, erro
 	return nil, types.NotImplementedErrorf("not implemented")
 }
 
-func (d *driver) Join(_ context.Context, nid, eid string, sboxKey string, jinfo driverapi.JoinInfo, options map[string]interface{}) error {
+func (d *driver) Join(_ context.Context, nid, eid string, sboxKey string, jinfo driverapi.JoinInfo, _, _ map[string]interface{}) error {
 	return types.NotImplementedErrorf("not implemented")
 }
 

libnetwork/drivers/macvlan/macvlan_joinleave.go

History View file @ 56a7817

@@ -9,6 +9,7 @@ import (
                      	"github.com/containerd/log"
                      	"github.com/docker/docker/libnetwork/driverapi"
                     +	"github.com/docker/docker/libnetwork/netlabel"
                      	"github.com/docker/docker/libnetwork/netutils"
                      	"github.com/docker/docker/libnetwork/ns"
                      	"go.opentelemetry.io/otel"
@@ -17,7 +18,7 @@ import (
+                     )
                      // Join method is invoked when a Sandbox is attached to an endpoint.
                     -func (d *driver) Join(ctx context.Context, nid, eid string, sboxKey string, jinfo driverapi.JoinInfo, options map[string]interface{}) error {
                     +func (d *driver) Join(ctx context.Context, nid, eid string, sboxKey string, jinfo driverapi.JoinInfo, epOpts, _ map[string]interface{}) error {
                      	ctx, span := otel.Tracer("").Start(ctx, "libnetwork.drivers.macvlan.Join", trace.WithAttributes(
                      		attribute.String("nid", nid),
                      		attribute.String("eid", eid),
@@ -102,7 +103,7 @@ func (d *driver) Join(ctx context.Context, nid, eid string, sboxKey string, jinf
                      		jinfo.DisableGatewayService()
+                     	}
                      	iNames := jinfo.InterfaceName()
                     -	err = iNames.SetNames(vethName, containerVethPrefix)
                     +	err = iNames.SetNames(vethName, containerVethPrefix, netlabel.GetIfname(epOpts))
                      	if err != nil {
                      		return err
+                     	}

libnetwork/drivers/macvlan/mvmanager/mvmanager.go

History View file @ 56a7817

@@ -55,7 +55,7 @@ func (d *driver) EndpointOperInfo(nid, eid string) (map[string]interface{}, erro
 	return nil, types.NotImplementedErrorf("not implemented")
 }
 
-func (d *driver) Join(_ context.Context, nid, eid string, sboxKey string, jinfo driverapi.JoinInfo, options map[string]interface{}) error {
+func (d *driver) Join(_ context.Context, nid, eid string, sboxKey string, jinfo driverapi.JoinInfo, _, _ map[string]interface{}) error {
 	return types.NotImplementedErrorf("not implemented")
 }
 

libnetwork/drivers/null/null.go

History View file @ 56a7817

@@ -68,7 +68,7 @@ func (d *driver) EndpointOperInfo(nid, eid string) (map[string]interface{}, erro
 }
 
 // Join method is invoked when a Sandbox is attached to an endpoint.
-func (d *driver) Join(_ context.Context, nid, eid string, sboxKey string, jinfo driverapi.JoinInfo, options map[string]interface{}) error {
+func (d *driver) Join(_ context.Context, nid, eid string, sboxKey string, jinfo driverapi.JoinInfo, _, _ map[string]interface{}) error {
 	return nil
 }
 

libnetwork/drivers/overlay/joinleave.go

History View file @ 56a7817

@@ -10,6 +10,7 @@ import (
                      	"github.com/containerd/log"
                      	"github.com/docker/docker/libnetwork/driverapi"
                     +	"github.com/docker/docker/libnetwork/netlabel"
                      	"github.com/docker/docker/libnetwork/ns"
                      	"github.com/docker/docker/libnetwork/osl"
                      	"github.com/docker/docker/libnetwork/types"
@@ -20,7 +21,7 @@ import (
+                     )
                      // Join method is invoked when a Sandbox is attached to an endpoint.
                     -func (d *driver) Join(ctx context.Context, nid, eid string, sboxKey string, jinfo driverapi.JoinInfo, options map[string]interface{}) error {
                     +func (d *driver) Join(ctx context.Context, nid, eid string, sboxKey string, jinfo driverapi.JoinInfo, epOpts, _ map[string]interface{}) error {
                      	ctx, span := otel.Tracer("").Start(ctx, "libnetwork.drivers.overlay.Join", trace.WithAttributes(
                      		attribute.String("nid", nid),
                      		attribute.String("eid", eid),
@@ -83,7 +84,7 @@ func (d *driver) Join(ctx context.Context, nid, eid string, sboxKey string, jinf
                      		return err
+                     	}
                     -	if err = sbox.AddInterface(ctx, overlayIfName, "veth", osl.WithMaster(s.brName)); err != nil {
                     +	if err = sbox.AddInterface(ctx, overlayIfName, "veth", "", osl.WithMaster(s.brName)); err != nil {
                      		return fmt.Errorf("could not add veth pair inside the network sandbox: %v", err)
+                     	}
@@ -110,7 +111,7 @@ func (d *driver) Join(ctx context.Context, nid, eid string, sboxKey string, jinf
+                     	}
                      	if iNames := jinfo.InterfaceName(); iNames != nil {
                     -		err = iNames.SetNames(containerIfName, "eth")
                     +		err = iNames.SetNames(containerIfName, "eth", netlabel.GetIfname(epOpts))
                      		if err != nil {
                      			return err
+                     		}

libnetwork/drivers/overlay/ov_network.go

History View file @ 56a7817

@@ -427,7 +427,7 @@ func (n *network) setupSubnetSandbox(s *subnet, brName, vxlanName string) error
                      	// create a bridge and vxlan device for this subnet and move it to the sandbox
                      	sbox := n.sbox
                     -	if err := sbox.AddInterface(context.TODO(), brName, "br", osl.WithIPv4Address(s.gwIP), osl.WithIsBridge(true)); err != nil {
                     +	if err := sbox.AddInterface(context.TODO(), brName, "br", "", osl.WithIPv4Address(s.gwIP), osl.WithIsBridge(true)); err != nil {
                      		return fmt.Errorf("bridge creation in sandbox failed for subnet %q: %v", s.subnetIP.String(), err)
+                     	}
@@ -439,7 +439,7 @@ func (n *network) setupSubnetSandbox(s *subnet, brName, vxlanName string) error
                      		return err
+                     	}
                     -	if err := sbox.AddInterface(context.TODO(), vxlanName, "vxlan", osl.WithMaster(brName)); err != nil {
                     +	if err := sbox.AddInterface(context.TODO(), vxlanName, "vxlan", "", osl.WithMaster(brName)); err != nil {
                      		// If adding vxlan device to the overlay namespace fails, remove the bridge interface we
                      		// already added to the namespace. This allows the caller to try the setup again.
                      		for _, iface := range sbox.Interfaces() {

libnetwork/drivers/overlay/ovmanager/ovmanager.go

History View file @ 56a7817

@@ -190,7 +190,7 @@ func (d *driver) EndpointOperInfo(nid, eid string) (map[string]interface{}, erro
 }
 
 // Join method is invoked when a Sandbox is attached to an endpoint.
-func (d *driver) Join(_ context.Context, nid, eid string, sboxKey string, jinfo driverapi.JoinInfo, options map[string]interface{}) error {
+func (d *driver) Join(_ context.Context, nid, eid string, sboxKey string, jinfo driverapi.JoinInfo, _, _ map[string]interface{}) error {
 	return types.NotImplementedErrorf("not implemented")
 }
 

libnetwork/drivers/remote/driver.go

History View file @ 56a7817

@@ -273,7 +273,7 @@ func (d *driver) EndpointOperInfo(nid, eid string) (map[string]interface{}, erro
+                     }
                      // Join method is invoked when a Sandbox is attached to an endpoint.
                     -func (d *driver) Join(_ context.Context, nid, eid string, sboxKey string, jinfo driverapi.JoinInfo, options map[string]interface{}) (retErr error) {
                     +func (d *driver) Join(_ context.Context, nid, eid string, sboxKey string, jinfo driverapi.JoinInfo, _, options map[string]interface{}) (retErr error) {
                      	join := &api.JoinRequest{
                      		NetworkID:  nid,
                      		EndpointID: eid,
@@ -300,7 +300,7 @@ func (d *driver) Join(_ context.Context, nid, eid string, sboxKey string, jinfo
                      	ifaceName := res.InterfaceName
                      	if iface := jinfo.InterfaceName(); iface != nil && ifaceName != nil {
                     -		if err := iface.SetNames(ifaceName.SrcName, ifaceName.DstPrefix); err != nil {
                     +		if err := iface.SetNames(ifaceName.SrcName, ifaceName.DstPrefix, ""); err != nil {
                      			return fmt.Errorf("failed to set interface name: %s", err)
+                     		}
+                     	}

libnetwork/drivers/remote/driver_test.go

History View file @ 56a7817

@@ -21,6 +21,7 @@ import (
                      	"github.com/docker/docker/libnetwork/scope"
                      	"github.com/docker/docker/libnetwork/types"
                      	"github.com/docker/docker/pkg/plugins"
                     +	"gotest.tools/v3/assert"
+                     )
                      func decodeToMap(r *http.Request) (res map[string]interface{}, err error) {
@@ -82,8 +83,9 @@ func setupPlugin(t *testing.T, name string, mux *http.ServeMux) func() {
                      type testEndpoint struct {
                      	t                     *testing.T
                     -	src                   string
                     -	dst                   string
                     +	srcName               string
                     +	dstPrefix             string
                     +	dstName               string
                      	address               string
                      	addressIPv6           string
                      	macAddress            string
@@ -188,13 +190,10 @@ func (test *testEndpoint) NetnsPath() string { return "" }
                      func (test *testEndpoint) SetCreatedInContainer(bool) {}
                     -func (test *testEndpoint) SetNames(src string, dst string) error {
                     -	if test.src != src {
                     -		test.t.Fatalf(`Wrong SrcName; expected "%s", got "%s"`, test.src, src)
                     -	}
                     -	if test.dst != dst {
                     -		test.t.Fatalf(`Wrong DstPrefix; expected "%s", got "%s"`, test.dst, dst)
                     -	}
                     +func (test *testEndpoint) SetNames(srcName, dstPrefix, dstName string) error {
                     +	assert.Equal(test.t, test.srcName, srcName)
                     +	assert.Equal(test.t, test.dstPrefix, dstPrefix)
                     +	assert.Equal(test.t, test.dstName, dstName)
                      	return nil
+                     }
@@ -322,8 +321,8 @@ func TestRemoteDriver(t *testing.T) {
                      	ep := &testEndpoint{
                      		t:              t,
                     -		src:            "vethsrc",
                     -		dst:            "vethdst",
                     +		srcName:        "vethsrc",
                     +		dstPrefix:      "vethdst",
                      		address:        "192.168.5.7/16",
                      		addressIPv6:    "2001:DB8::5:7/48",
                      		macAddress:     "ab:cd:ef:ee:ee:ee",
@@ -390,8 +389,9 @@ func TestRemoteDriver(t *testing.T) {
                      			"HostsPath":      ep.hostsPath,
                      			"ResolvConfPath": ep.resolvConfPath,
                      			"InterfaceName": map[string]interface{}{
                     -				"SrcName":   ep.src,
                     -				"DstPrefix": ep.dst,
                     +				"SrcName":   ep.srcName,
                     +				"DstPrefix": ep.dstPrefix,
                     +				"DstName":   ep.dstName,
                      			},
                      			"StaticRoutes": []map[string]interface{}{
+                     				{
@@ -478,7 +478,7 @@ func TestRemoteDriver(t *testing.T) {
+                     	}
                      	joinOpts := map[string]interface{}{"foo": "fooValue"}
                     -	err = d.Join(context.Background(), netID, endID, "sandbox-key", ep, joinOpts)
                     +	err = d.Join(context.Background(), netID, endID, "sandbox-key", ep, nil, joinOpts)
                      	if err != nil {
                      		t.Fatal(err)
+                     	}

libnetwork/drivers/windows/overlay/joinleave_windows.go

History View file @ 56a7817

@@ -15,7 +15,7 @@ import (
+                     )
                      // Join method is invoked when a Sandbox is attached to an endpoint.
                     -func (d *driver) Join(ctx context.Context, nid, eid string, sboxKey string, jinfo driverapi.JoinInfo, options map[string]interface{}) error {
                     +func (d *driver) Join(ctx context.Context, nid, eid string, sboxKey string, jinfo driverapi.JoinInfo, _, options map[string]interface{}) error {
                      	ctx, span := otel.Tracer("").Start(ctx, "libnetwork.drivers.windows_overlay.Join", trace.WithAttributes(
                      		attribute.String("nid", nid),
                      		attribute.String("eid", eid),

libnetwork/drivers/windows/windows.go

History View file @ 56a7817

@@ -846,7 +846,7 @@ func (d *driver) EndpointOperInfo(nid, eid string) (map[string]interface{}, erro
+                     }
                      // Join method is invoked when a Sandbox is attached to an endpoint.
                     -func (d *driver) Join(ctx context.Context, nid, eid string, sboxKey string, jinfo driverapi.JoinInfo, options map[string]interface{}) error {
                     +func (d *driver) Join(ctx context.Context, nid, eid string, sboxKey string, jinfo driverapi.JoinInfo, _, options map[string]interface{}) error {
                      	ctx, span := otel.Tracer("").Start(ctx, fmt.Sprintf("libnetwork.drivers.windows_%s.Join", d.name), trace.WithAttributes(
                      		attribute.String("nid", nid),
                      		attribute.String("eid", eid),

libnetwork/drivers/windows/windows_test.go

History View file @ 56a7817

@@ -134,7 +134,7 @@ func (test *testEndpoint) SetGatewayIPv6(ipv6 net.IP) error {
 	return nil
 }
 
-func (test *testEndpoint) SetNames(src string, dst string) error {
+func (test *testEndpoint) SetNames(_, _, _ string) error {
 	return nil
 }
 

libnetwork/endpoint.go

History View file @ 56a7817

@@ -536,7 +536,7 @@ func (ep *Endpoint) sbJoin(ctx context.Context, sb *Sandbox, options ...Endpoint
 		return fmt.Errorf("failed to get driver during join: %v", err)
 	}
 
-	if err := d.Join(ctx, nid, epid, sb.Key(), ep, sb.Labels()); err != nil {
+	if err := d.Join(ctx, nid, epid, sb.Key(), ep, ep.generic, sb.Labels()); err != nil {
 		return err
 	}
 	defer func() {

libnetwork/endpoint_info.go

History View file @ 56a7817

@@ -43,6 +43,7 @@ type EndpointInterface struct {
                      	llAddrs            []*net.IPNet
                      	srcName            string
                      	dstPrefix          string
                     +	dstName            string // dstName is the name of the interface in the container namespace. It takes precedence over dstPrefix.
                      	routes             []*net.IPNet
                      	v4PoolID           string
                      	v6PoolID           string
@@ -70,6 +71,7 @@ func (epi *EndpointInterface) MarshalJSON() ([]byte, error) {
+                     	}
                      	epMap["srcName"] = epi.srcName
                      	epMap["dstPrefix"] = epi.dstPrefix
                     +	epMap["dstName"] = epi.dstName
                      	var routes []string
                      	for _, route := range epi.routes {
                      		routes = append(routes, route.String())
@@ -147,6 +149,7 @@ func (epi *EndpointInterface) CopyTo(dstEpi *EndpointInterface) error {
                      	dstEpi.addrv6 = types.GetIPNetCopy(epi.addrv6)
                      	dstEpi.srcName = epi.srcName
                      	dstEpi.dstPrefix = epi.dstPrefix
                     +	dstEpi.dstName = epi.dstName
                      	dstEpi.v4PoolID = epi.v4PoolID
                      	dstEpi.v6PoolID = epi.v6PoolID
                      	dstEpi.createdInContainer = epi.createdInContainer
@@ -269,10 +272,12 @@ func (epi *EndpointInterface) SrcName() string {
                      	return epi.srcName
+                     }
                     -// SetNames method assigns the srcName and dstPrefix for the interface.
                     -func (epi *EndpointInterface) SetNames(srcName string, dstPrefix string) error {
                     +// SetNames method assigns the srcName, dstName, and dstPrefix for the
                     +// interface. If both dstName and dstPrefix are set, dstName takes precedence.
                     +func (epi *EndpointInterface) SetNames(srcName, dstPrefix, dstName string) error {
                      	epi.srcName = srcName
                      	epi.dstPrefix = dstPrefix
                     +	epi.dstName = dstName
                      	return nil
+                     }

libnetwork/libnetwork_internal_test.go

History View file @ 56a7817

@@ -239,7 +239,7 @@ func compareEndpointInterface(a, b *EndpointInterface) bool {
 	if a == nil || b == nil {
 		return false
 	}
-	return a.srcName == b.srcName && a.dstPrefix == b.dstPrefix && a.v4PoolID == b.v4PoolID && a.v6PoolID == b.v6PoolID &&
+	return a.srcName == b.srcName && a.dstPrefix == b.dstPrefix && a.dstName == b.dstName && a.v4PoolID == b.v4PoolID && a.v6PoolID == b.v6PoolID &&
 		types.CompareIPNet(a.addr, b.addr) && types.CompareIPNet(a.addrv6, b.addrv6) && compareNwLists(a.llAddrs, b.llAddrs)
 }
 
@@ -807,7 +807,7 @@ func (b *badDriver) EndpointOperInfo(nid, eid string) (map[string]interface{}, e
 	return nil, nil
 }
 
-func (b *badDriver) Join(_ context.Context, nid, eid string, sboxKey string, jinfo driverapi.JoinInfo, options map[string]interface{}) error {
+func (b *badDriver) Join(_ context.Context, nid, eid string, sboxKey string, jinfo driverapi.JoinInfo, _, _ map[string]interface{}) error {
 	return fmt.Errorf("I will not allow any join")
 }
 

libnetwork/netlabel/labels.go

History View file @ 56a7817

@@ -30,6 +30,9 @@ const (
                      	// where the interface name is represented by the string "IFNAME".
                      	EndpointSysctls = Prefix + ".endpoint.sysctls"
                     +	// Ifname can be used to set the interface name used inside the container. It takes precedence over ContainerIfacePrefix.
                     +	Ifname = Prefix + ".endpoint.ifname"
+                    +
                      	// EnableIPv4 constant represents enabling IPV4 at network level
                      	EnableIPv4 = Prefix + ".enable_ipv4"
@@ -70,3 +73,11 @@ const (
                      	// is intended for internal use, it may be removed in a future release.
                      	NoProxy6To4 = DriverPrivatePrefix + ".no_proxy_6to4"
+                     )
+                    +
                     +// GetIfname returns the value associated to the Ifname netlabel from the
                     +// provided options. If there's no Ifname netlabel, or if the value isn't a
                     +// string, it returns an empty string.
                     +func GetIfname(opts map[string]interface{}) string {
                     +	ifname, _ := opts[Ifname].(string)
                     +	return ifname
                     +}

libnetwork/netlabel/labels_test.go

History View file @ 56a7817

                     new file mode 100644
@@ -0,0 +1,60 @@
                     +package netlabel
+                    +
                     +import (
                     +	"testing"
+                    +
                     +	"gotest.tools/v3/assert"
                     +)
+                    +
                     +func TestGetIfname(t *testing.T) {
                     +	testcases := []struct {
                     +		name      string
                     +		opts      map[string]interface{}
                     +		expIfname string
                     +	}{
                     +		{
                     +			name:      "nil opts",
                     +			opts:      nil,
                     +			expIfname: "",
                     +		},
                     +		{
                     +			name:      "no ifname",
                     +			opts:      map[string]interface{}{},
                     +			expIfname: "",
                     +		},
                     +		{
                     +			name: "ifname set",
                     +			opts: map[string]interface{}{
                     +				Ifname: "foobar",
                     +			},
                     +			expIfname: "foobar",
                     +		},
                     +		{
                     +			name: "ifname set to empty string",
                     +			opts: map[string]interface{}{
                     +				Ifname: "",
                     +			},
                     +			expIfname: "",
                     +		},
                     +		{
                     +			name: "ifname set to nil",
                     +			opts: map[string]interface{}{
                     +				Ifname: nil,
                     +			},
                     +			expIfname: "",
                     +		},
                     +		{
                     +			name: "ifname set to int",
                     +			opts: map[string]interface{}{
                     +				Ifname: 42,
                     +			},
                     +			expIfname: "",
                     +		},
                     +	}
+                    +
                     +	for _, tc := range testcases {
                     +		t.Run(tc.name, func(t *testing.T) {
                     +			assert.Equal(t, tc.expIfname, GetIfname(tc.opts))
                     +		})
                     +	}
                     +}

libnetwork/osl/interface_linux.go

History View file @ 56a7817

@@ -56,11 +56,12 @@ const (
                      // newInterface creates a new interface in the given namespace using the
                      // provided options.
                     -func newInterface(ns *Namespace, srcName, dstPrefix string, options ...IfaceOption) (*Interface, error) {
                     +func newInterface(ns *Namespace, srcName, dstPrefix, dstName string, options ...IfaceOption) (*Interface, error) {
                      	i := &Interface{
                      		stopCh:                make(chan struct{}),
                      		srcName:               srcName,
                      		dstPrefix:             dstPrefix,
                     +		dstName:               dstName,
                      		advertiseAddrNMsgs:    advertiseAddrNMsgsDefault,
                      		advertiseAddrInterval: advertiseAddrIntervalDefault,
                      		ns:                    ns,
@@ -116,10 +117,8 @@ func (i *Interface) SrcName() string {
                      	return i.srcName
+                     }
                     -// DstName returns the name that will be assigned to the interface once
                     -// moved inside a network namespace. When the caller passes in a DstName,
                     -// it is only expected to pass a prefix. The name will be modified with an
                     -// auto-generated suffix.
                     +// DstName returns the final interface name in the target network namespace.
                     +// It's generated based on the prefix passed to [Namespace.AddInterface].
                      func (i *Interface) DstName() string {
                      	return i.dstName
+                     }
@@ -218,18 +217,19 @@ func moveLink(ctx context.Context, nlhHost nlwrap.Handle, iface netlink.Link, i
                      	return nil
+                     }
                     -// AddInterface adds an existing Interface to the sandbox. The operation will rename
                     -// from the Interface SrcName to DstName as it moves, and reconfigure the
                     -// interface according to the specified settings. The caller is expected
                     -// to only provide a prefix for DstName. The AddInterface api will auto-generate
                     -// an appropriate suffix for the DstName to disambiguate.
                     -func (n *Namespace) AddInterface(ctx context.Context, srcName, dstPrefix string, options ...IfaceOption) error {
                     +// AddInterface creates an Interface that represents an existing network
                     +// interface (except for bridge interfaces, which are created here).
                     +//
                     +// The network interface will be reconfigured according the options passed, and
                     +// it'll be renamed from srcName into an auto-generated 'dest name' that
                     +// combines the provided dstPrefix and a numeric suffix.
                     +func (n *Namespace) AddInterface(ctx context.Context, srcName, dstPrefix, dstName string, options ...IfaceOption) error {
                      	ctx, span := otel.Tracer("").Start(ctx, "libnetwork.osl.AddInterface", trace.WithAttributes(
                      		attribute.String("srcName", srcName),
                      		attribute.String("dstPrefix", dstPrefix)))
                      	defer span.End()
                     -	i, err := newInterface(n, srcName, dstPrefix, options...)
                     +	i, err := newInterface(n, srcName, dstPrefix, dstName, options...)
                      	if err != nil {
                      		return err
+                     	}
@@ -237,7 +237,7 @@ func (n *Namespace) AddInterface(ctx context.Context, srcName, dstPrefix string,
                      	n.mu.Lock()
                      	if n.isDefault {
                      		i.dstName = i.srcName
                     -	} else {
                     +	} else if i.dstName == "" {
                      		i.dstName = fmt.Sprintf("%s%d", dstPrefix, n.nextIfIndex[dstPrefix])
                      		n.nextIfIndex[dstPrefix]++
+                     	}

libnetwork/osl/namespace_linux.go

History View file @ 56a7817

@@ -402,7 +402,7 @@ func (n *Namespace) Destroy() error {
                      func (n *Namespace) RestoreInterfaces(interfaces map[Iface][]IfaceOption) error {
                      	// restore interfaces
                      	for iface, opts := range interfaces {
                     -		i, err := newInterface(n, iface.SrcName, iface.DstPrefix, opts...)
                     +		i, err := newInterface(n, iface.SrcName, iface.DstPrefix, iface.DstName, opts...)
                      		if err != nil {
                      			return err
+                     		}

libnetwork/osl/sandbox.go

History View file @ 56a7817

@@ -12,7 +12,7 @@ const (
 )
 
 type Iface struct {
-	SrcName, DstPrefix string
+	SrcName, DstPrefix, DstName string
 }
 
 // IfaceOption is a function option type to set interface options.

libnetwork/osl/sandbox_linux_test.go

History View file @ 56a7817

@@ -22,11 +22,11 @@ import (
+                     )
                      const (
                     -	vethName1     = "wierdlongname1"
                     -	vethName2     = "wierdlongname2"
                     -	vethName3     = "wierdlongname3"
                     -	vethName4     = "wierdlongname4"
                     -	sboxIfaceName = "containername"
                     +	vethName1       = "wierdlongname1"
                     +	vethName2       = "wierdlongname2"
                     +	vethName3       = "wierdlongname3"
                     +	vethName4       = "wierdlongname4"
                     +	sboxIfacePrefix = "containername"
+                     )
                      func generateRandomName(prefix string, size int) (string, error) {
@@ -85,16 +85,16 @@ func newInfo(t *testing.T, hnd nlwrap.Handle) (*Namespace, error) {
                      	// This is needed for cleanup on DeleteEndpoint()
                      	intf1 := &Interface{
                      		srcName:     vethName2,
                     -		dstName:     sboxIfaceName,
                     +		dstPrefix:   sboxIfacePrefix,
                      		address:     addr,
                      		addressIPv6: addrv6,
                      		routes:      []*net.IPNet{route},
+                     	}
                      	intf2 := &Interface{
                     -		srcName: "testbridge",
                     -		dstName: sboxIfaceName,
                     -		bridge:  true,
                     +		srcName:   "testbridge",
                     +		dstPrefix: sboxIfacePrefix,
                     +		bridge:    true,
+                     	}
                      	err = hnd.LinkAdd(&netlink.Veth{
@@ -106,9 +106,9 @@ func newInfo(t *testing.T, hnd nlwrap.Handle) (*Namespace, error) {
+                     	}
                      	intf3 := &Interface{
                     -		srcName: vethName4,
                     -		dstName: sboxIfaceName,
                     -		master:  "testbridge",
                     +		srcName:   vethName4,
                     +		dstPrefix: sboxIfacePrefix,
                     +		master:    "testbridge",
+                     	}
                      	return &Namespace{
@@ -132,10 +132,10 @@ func verifySandbox(t *testing.T, ns *Namespace, ifaceSuffixes []string) {
                      	defer nh.Close()
                      	for _, suffix := range ifaceSuffixes {
                     -		_, err = nh.LinkByName(sboxIfaceName + suffix)
                     +		_, err = nh.LinkByName(sboxIfacePrefix + suffix)
                      		if err != nil {
                      			t.Fatalf("Could not find the interface %s inside the sandbox: %v",
                     -				sboxIfaceName+suffix, err)
                     +				sboxIfacePrefix+suffix, err)
+                     		}
+                     	}
+                     }
@@ -381,7 +381,7 @@ func TestSandboxCreate(t *testing.T) {
+                     	}
                      	for _, i := range tbox.Interfaces() {
                     -		err = s.AddInterface(context.Background(), i.SrcName(), i.DstName(),
                     +		err = s.AddInterface(context.Background(), i.SrcName(), i.dstPrefix, i.DstName(),
                      			WithIsBridge(i.Bridge()),
                      			WithIPv4Address(i.Address()),
                      			WithIPv6Address(i.AddressIPv6()),
@@ -480,7 +480,7 @@ func TestAddRemoveInterface(t *testing.T) {
+                     	}
                      	for _, i := range tbox.Interfaces() {
                     -		err = s.AddInterface(context.Background(), i.SrcName(), i.DstName(),
                     +		err = s.AddInterface(context.Background(), i.SrcName(), i.dstPrefix, i.DstName(),
                      			WithIsBridge(i.Bridge()),
                      			WithIPv4Address(i.Address()),
                      			WithIPv6Address(i.AddressIPv6()),
@@ -501,7 +501,7 @@ func TestAddRemoveInterface(t *testing.T) {
                      	verifySandbox(t, s, []string{"1", "2"})
                      	i := tbox.Interfaces()[0]
                     -	err = s.AddInterface(context.Background(), i.SrcName(), i.DstName(),
                     +	err = s.AddInterface(context.Background(), i.SrcName(), i.dstPrefix, i.DstName(),
                      		WithIsBridge(i.Bridge()),
                      		WithIPv4Address(i.Address()),
                      		WithIPv6Address(i.AddressIPv6()),

libnetwork/sandbox_linux.go

History View file @ 56a7817

@@ -286,7 +286,8 @@ func (sb *Sandbox) restoreOslSandbox() error {
 		if len(i.llAddrs) != 0 {
 			ifaceOptions = append(ifaceOptions, osl.WithLinkLocalAddresses(i.llAddrs))
 		}
-		interfaces[osl.Iface{SrcName: i.srcName, DstPrefix: i.dstPrefix}] = ifaceOptions
+		iface := osl.Iface{SrcName: i.srcName, DstPrefix: i.dstPrefix, DstName: i.dstName}
+		interfaces[iface] = ifaceOptions
 		if joinInfo != nil {
 			routes = append(routes, joinInfo.StaticRoutes...)
 		}
@@ -362,7 +363,7 @@ func (sb *Sandbox) populateNetworkResources(ctx context.Context, ep *Endpoint) e
 		}
 		ifaceOptions = append(ifaceOptions, osl.WithCreatedInContainer(i.createdInContainer))
 
-		if err := sb.osSbox.AddInterface(ctx, i.srcName, i.dstPrefix, ifaceOptions...); err != nil {
+		if err := sb.osSbox.AddInterface(ctx, i.srcName, i.dstPrefix, i.dstName, ifaceOptions...); err != nil {
 			return fmt.Errorf("failed to add interface %s to sandbox: %v", i.srcName, err)
 		}
 

...	...	@@ -1444,7 +1444,7 @@ func (d *driver) EndpointOperInfo(nid, eid string) (map[string]interface{}, erro
1444	1444	}
1445	1445
1446	1446	// Join method is invoked when a Sandbox is attached to an endpoint.
1447		-func (d *driver) Join(ctx context.Context, nid, eid string, sboxKey string, jinfo driverapi.JoinInfo, options map[string]interface{}) error {
	1447	+func (d *driver) Join(ctx context.Context, nid, eid string, sboxKey string, jinfo driverapi.JoinInfo, epOpts, sbOpts map[string]interface{}) error {
1448	1448	ctx, span := otel.Tracer("").Start(ctx, "libnetwork.drivers.bridge.Join", trace.WithAttributes(
1449	1449	attribute.String("nid", nid),
1450	1450	attribute.String("eid", eid),
...	...	@@ -1465,7 +1465,7 @@ func (d *driver) Join(ctx context.Context, nid, eid string, sboxKey string, jinf
1465	1465	return endpointNotFoundError(eid)
1466	1466	}
1467	1467
1468		- endpoint.containerConfig, err = parseContainerOptions(options)
	1468	+ endpoint.containerConfig, err = parseContainerOptions(sbOpts)
1469	1469	if err != nil {
1470	1470	return err
1471	1471	}
...	...	@@ -1475,7 +1475,7 @@ func (d *driver) Join(ctx context.Context, nid, eid string, sboxKey string, jinf
1475	1475	if network.config.ContainerIfacePrefix != "" {
1476	1476	containerVethPrefix = network.config.ContainerIfacePrefix
1477	1477	}
1478		- if err := iNames.SetNames(endpoint.srcName, containerVethPrefix); err != nil {
	1478	+ if err := iNames.SetNames(endpoint.srcName, containerVethPrefix, netlabel.GetIfname(epOpts)); err != nil {
1479	1479	return err
1480	1480	}
1481	1481

...	...	@@ -536,7 +536,7 @@ func (ep Endpoint) sbJoin(ctx context.Context, sb Sandbox, options ...Endpoint
536	536	return fmt.Errorf("failed to get driver during join: %v", err)
537	537	}
538	538
539		- if err := d.Join(ctx, nid, epid, sb.Key(), ep, sb.Labels()); err != nil {
	539	+ if err := d.Join(ctx, nid, epid, sb.Key(), ep, ep.generic, sb.Labels()); err != nil {
540	540	return err
541	541	}
542	542	defer func() {

...	...	@@ -239,7 +239,7 @@ func compareEndpointInterface(a, b *EndpointInterface) bool {
239	239	if a == nil \|\| b == nil {
240	240	return false
241	241	}
242		- return a.srcName == b.srcName && a.dstPrefix == b.dstPrefix && a.v4PoolID == b.v4PoolID && a.v6PoolID == b.v6PoolID &&
	242	+ return a.srcName == b.srcName && a.dstPrefix == b.dstPrefix && a.dstName == b.dstName && a.v4PoolID == b.v4PoolID && a.v6PoolID == b.v6PoolID &&
243	243	types.CompareIPNet(a.addr, b.addr) && types.CompareIPNet(a.addrv6, b.addrv6) && compareNwLists(a.llAddrs, b.llAddrs)
244	244	}
245	245
...	...	@@ -807,7 +807,7 @@ func (b *badDriver) EndpointOperInfo(nid, eid string) (map[string]interface{}, e
807	807	return nil, nil
808	808	}
809	809
810		-func (b *badDriver) Join(_ context.Context, nid, eid string, sboxKey string, jinfo driverapi.JoinInfo, options map[string]interface{}) error {
	810	+func (b *badDriver) Join(_ context.Context, nid, eid string, sboxKey string, jinfo driverapi.JoinInfo, _, _ map[string]interface{}) error {
811	811	return fmt.Errorf("I will not allow any join")
812	812	}
813	813

...	...	@@ -55,7 +55,7 @@ func (d *manager) EndpointOperInfo(nid, eid string) (map[string]interface{}, err
55	55	return nil, types.NotImplementedErrorf("not implemented")
56	56	}
57	57
58		-func (d *manager) Join(_ context.Context, nid, eid string, sboxKey string, jinfo driverapi.JoinInfo, options map[string]interface{}) error {
	58	+func (d *manager) Join(_ context.Context, nid, eid string, sboxKey string, jinfo driverapi.JoinInfo, _, _ map[string]interface{}) error {
59	59	return types.NotImplementedErrorf("not implemented")
60	60	}
61	61

...	...	@@ -55,7 +55,7 @@ func (d *driver) EndpointOperInfo(nid, eid string) (map[string]interface{}, erro
55	55	return nil, types.NotImplementedErrorf("not implemented")
56	56	}
57	57
58		-func (d *driver) Join(_ context.Context, nid, eid string, sboxKey string, jinfo driverapi.JoinInfo, options map[string]interface{}) error {
	58	+func (d *driver) Join(_ context.Context, nid, eid string, sboxKey string, jinfo driverapi.JoinInfo, _, _ map[string]interface{}) error {
59	59	return types.NotImplementedErrorf("not implemented")
60	60	}
61	61

...	...	@@ -67,7 +67,7 @@ func TestPortMappingConfig(t *testing.T) {
67	67	t.Fatalf("Failed to create the endpoint: %s", err.Error())
68	68	}
69	69
70		- if err = d.Join(context.Background(), "dummy", "ep1", "sbox", te, sbOptions); err != nil {
	70	+ if err = d.Join(context.Background(), "dummy", "ep1", "sbox", te, nil, sbOptions); err != nil {
71	71	t.Fatalf("Failed to join the endpoint: %v", err)
72	72	}
73	73
...	...	@@ -153,7 +153,7 @@ func TestPortMappingV6Config(t *testing.T) {
153	153	t.Fatalf("Failed to create the endpoint: %s", err.Error())
154	154	}
155	155
156		- if err = d.Join(context.Background(), "dummy", "ep1", "sbox", te, sbOptions); err != nil {
	156	+ if err = d.Join(context.Background(), "dummy", "ep1", "sbox", te, nil, sbOptions); err != nil {
157	157	t.Fatalf("Failed to join the endpoint: %v", err)
158	158	}
159	159

...	...	@@ -68,7 +68,7 @@ func (d *driver) EndpointOperInfo(nid, eid string) (map[string]interface{}, erro
68	68	}
69	69
70	70	// Join method is invoked when a Sandbox is attached to an endpoint.
71		-func (d *driver) Join(_ context.Context, nid, eid string, sboxKey string, jinfo driverapi.JoinInfo, options map[string]interface{}) error {
	71	+func (d *driver) Join(_ context.Context, nid, eid string, sboxKey string, jinfo driverapi.JoinInfo, _, _ map[string]interface{}) error {
72	72	return nil
73	73	}
74	74

...	...	@@ -190,7 +190,7 @@ func (d *driver) EndpointOperInfo(nid, eid string) (map[string]interface{}, erro
190	190	}
191	191
192	192	// Join method is invoked when a Sandbox is attached to an endpoint.
193		-func (d *driver) Join(_ context.Context, nid, eid string, sboxKey string, jinfo driverapi.JoinInfo, options map[string]interface{}) error {
	193	+func (d *driver) Join(_ context.Context, nid, eid string, sboxKey string, jinfo driverapi.JoinInfo, _, _ map[string]interface{}) error {
194	194	return types.NotImplementedErrorf("not implemented")
195	195	}
196	196

...	...	@@ -134,7 +134,7 @@ func (test *testEndpoint) SetGatewayIPv6(ipv6 net.IP) error {
134	134	return nil
135	135	}
136	136
137		-func (test *testEndpoint) SetNames(src string, dst string) error {
	137	+func (test *testEndpoint) SetNames(_, _, _ string) error {
138	138	return nil
139	139	}
140	140

...	...	@@ -12,7 +12,7 @@ const (
12	12	)
13	13
14	14	type Iface struct {
15		- SrcName, DstPrefix string
	15	+ SrcName, DstPrefix, DstName string
16	16	}
17	17
18	18	// IfaceOption is a function option type to set interface options.

...	...	@@ -286,7 +286,8 @@ func (sb *Sandbox) restoreOslSandbox() error {
286	286	if len(i.llAddrs) != 0 {
287	287	ifaceOptions = append(ifaceOptions, osl.WithLinkLocalAddresses(i.llAddrs))
288	288	}
289		- interfaces[osl.Iface{SrcName: i.srcName, DstPrefix: i.dstPrefix}] = ifaceOptions
	289	+ iface := osl.Iface{SrcName: i.srcName, DstPrefix: i.dstPrefix, DstName: i.dstName}
	290	+ interfaces[iface] = ifaceOptions
290	291	if joinInfo != nil {
291	292	routes = append(routes, joinInfo.StaticRoutes...)
292	293	}
...	...	@@ -362,7 +363,7 @@ func (sb Sandbox) populateNetworkResources(ctx context.Context, ep Endpoint) e
362	362	}
363	363	ifaceOptions = append(ifaceOptions, osl.WithCreatedInContainer(i.createdInContainer))
364	364
365		- if err := sb.osSbox.AddInterface(ctx, i.srcName, i.dstPrefix, ifaceOptions...); err != nil {
	365	+ if err := sb.osSbox.AddInterface(ctx, i.srcName, i.dstPrefix, i.dstName, ifaceOptions...); err != nil {
366	366	return fmt.Errorf("failed to add interface %s to sandbox: %v", i.srcName, err)
367	367	}
368	368

libnet: add support for custom interface names