Skip to content

Send LinkLocalIPs as part of IPAMConfig dictionary #1139

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

Merged
aanand merged 1 commit into from
Jul 26, 2016
Merged

Send LinkLocalIPs as part of IPAMConfig dictionary #1139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions docker/utils/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -894,15 +894,15 @@ def create_endpoint_config(version, aliases=None, links=None,
if ipv6_address:
ipam_config['IPv6Address'] = ipv6_address

if ipam_config:
endpoint_config['IPAMConfig'] = ipam_config

if link_local_ips is not None:
if version_lt(version, '1.24'):
raise errors.InvalidVersion(
'link_local_ips is not supported for API version < 1.24'
)
endpoint_config['LinkLocalIPs'] = link_local_ips
ipam_config['LinkLocalIPs'] = link_local_ips

if ipam_config:
endpoint_config['IPAMConfig'] = ipam_config

return endpoint_config

Expand Down
21 changes: 21 additions & 0 deletions tests/integration/network_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,27 @@ def test_create_with_ipv6_address(self):
'2001:389::f00d'
)

@requires_api_version('1.24')
def test_create_with_linklocal_ips(self):
container = self.client.create_container(
'busybox', 'top',
networking_config=self.client.create_networking_config(
{
'bridge': self.client.create_endpoint_config(
link_local_ips=['169.254.8.8']
)
}
),
host_config=self.client.create_host_config(network_mode='bridge')
)
self.tmp_containers.append(container)
self.client.start(container)
container_data = self.client.inspect_container(container)
net_cfg = container_data['NetworkSettings']['Networks']['bridge']
assert 'IPAMConfig' in net_cfg
assert 'LinkLocalIPs' in net_cfg['IPAMConfig']
assert net_cfg['IPAMConfig']['LinkLocalIPs'] == ['169.254.8.8']

@requires_api_version('1.22')
def test_create_with_links(self):
net_name, net_id = self.create_network()
Expand Down