-
Notifications
You must be signed in to change notification settings - Fork 2.1k
network: add --mac-address support to docker network connect
#6728
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.
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
ahmedharabi
wants to merge
2
commits into
docker:master
Choose a base branch
from
ahmedharabi:51796-network-connect-mac-address
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+12
−0
Draft
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,7 +2,11 @@ package network | |
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
|
|
||
| "errors" | ||
|
|
||
|
|
||
| "net" | ||
| "net/netip" | ||
| "strings" | ||
|
|
@@ -21,6 +25,7 @@ type connectOptions struct { | |
| container string | ||
| ipaddress net.IP // TODO(thaJeztah): we need a flag-type to handle netip.Addr directly | ||
| ipv6address net.IP // TODO(thaJeztah): we need a flag-type to handle netip.Addr directly | ||
| macAddress net.HardwareAddr | ||
| links opts.ListOpts | ||
| aliases []string | ||
| linklocalips []net.IP // TODO(thaJeztah): we need a flag-type to handle []netip.Addr directly | ||
|
|
@@ -32,6 +37,7 @@ func newConnectCommand(dockerCLI command.Cli) *cobra.Command { | |
| options := connectOptions{ | ||
| links: opts.NewListOpts(opts.ValidateLink), | ||
| } | ||
| var macStr string | ||
|
|
||
| cmd := &cobra.Command{ | ||
| Use: "connect [OPTIONS] NETWORK CONTAINER", | ||
|
|
@@ -40,6 +46,15 @@ func newConnectCommand(dockerCLI command.Cli) *cobra.Command { | |
| RunE: func(cmd *cobra.Command, args []string) error { | ||
| options.network = args[0] | ||
| options.container = args[1] | ||
| // Validate MAC address if provided | ||
|
|
||
| if macStr != "" { | ||
| mac, err := net.ParseMAC(macStr) | ||
| if err != nil { | ||
| return fmt.Errorf("invalid MAC address: %q", macStr) | ||
| } | ||
| options.macAddress = mac | ||
|
||
| } | ||
| return runConnect(cmd.Context(), dockerCLI.Client(), options) | ||
| }, | ||
| ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) { | ||
|
|
@@ -60,26 +75,34 @@ func newConnectCommand(dockerCLI command.Cli) *cobra.Command { | |
| flags.IPSliceVar(&options.linklocalips, "link-local-ip", nil, "Add a link-local address for the container") | ||
| flags.StringSliceVar(&options.driverOpts, "driver-opt", []string{}, "driver options for the network") | ||
| flags.IntVar(&options.gwPriority, "gw-priority", 0, "Highest gw-priority provides the default gateway. Accepts positive and negative values.") | ||
| flags.StringVar(&macStr, "mac-address", "", "MAC address for the container on this network") | ||
| return cmd | ||
| } | ||
|
|
||
| func runConnect(ctx context.Context, apiClient client.NetworkAPIClient, options connectOptions) error { | ||
| driverOpts, err := convertDriverOpt(options.driverOpts) | ||
|
|
||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
|
|
||
|
|
||
|
|
||
| _, err = apiClient.NetworkConnect(ctx, options.network, client.NetworkConnectOptions{ | ||
| Container: options.container, | ||
| EndpointConfig: &network.EndpointSettings{ | ||
| IPAMConfig: &network.EndpointIPAMConfig{ | ||
| IPv4Address: toNetipAddr(options.ipaddress), | ||
| IPv6Address: toNetipAddr(options.ipv6address), | ||
| LinkLocalIPs: toNetipAddrSlice(options.linklocalips), | ||
|
|
||
| }, | ||
| Links: options.links.GetSlice(), | ||
| Aliases: options.aliases, | ||
| DriverOpts: driverOpts, | ||
| GwPriority: options.gwPriority, | ||
| MacAddress : network.HardwareAddr(options.macAddress), | ||
| }, | ||
| }) | ||
| return err | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looking at the type; we could probably use the
network.HardwareAddr'sUnmarshalTextmethod for this; that way we wouldn't have to cast it to the right type 🤔