Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
46c9e95
Merge remote-tracking branch 'origin/release' into bump-1.21.1
shin- Apr 27, 2018
1315b51
Incorrect key name for IPAM options check
shin- Apr 24, 2018
385b650
Retrieve objects using legacy (< 1.21) project names
shin- Apr 23, 2018
d9a6d30
Improve legacy network and volume detection
shin- Apr 24, 2018
7341dba
Use true_name for remove operation
shin- Apr 24, 2018
398b13d
Clearly define IPAM config schema for validation
shin- Apr 24, 2018
41417aa
Bump SDK version to latest
shin- Apr 26, 2018
b1a1c6a
Prevent duplicate binds in generated container config
shin- Apr 26, 2018
192a665
"Bump 1.21.1"
shin- Apr 27, 2018
4691515
Inital pass on comprehensive automated release script
shin- Apr 18, 2018
e4c5b2a
Implement resuming a release
shin- Apr 18, 2018
0f4dbba
Temp test
shin- Apr 19, 2018
f083ef3
Added logging for asset removal
shin- Apr 19, 2018
fbbac04
Add images build step and finalize placeholder
shin- Apr 19, 2018
05afd5a
Add finalize step
shin- Apr 19, 2018
f248dbe
Avoid accidental prod push
shin- Apr 19, 2018
0621739
Early check for non-draft release in resume
shin- Apr 19, 2018
4fab78d
Default base is master
shin- Apr 19, 2018
b68811f
Add support for PR cherry picks
shin- Apr 20, 2018
87b8eaa
Cleanup
shin- Apr 20, 2018
28f7f79
Improve monitor function
shin- Apr 20, 2018
4faf7c1
Containerize release tool
shin- Apr 20, 2018
a50c056
Uncomment deploy steps
shin- Apr 21, 2018
7503a2e
Document new release process
shin- Apr 23, 2018
fe20526
Remove obsolete release scripts
shin- Apr 23, 2018
7db1358
Add support for features added in 1.21.0 to bash completion
albers Apr 12, 2018
5a3f1a3
Refactor bash completion for services
albers Apr 11, 2018
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
Prev Previous commit
Next Next commit
Incorrect key name for IPAM options check
Signed-off-by: Joffrey F <[email protected]>
  • Loading branch information
shin- committed Apr 27, 2018
commit 1315b51e447f2b15ee9273c0973f08f3c5f9e149
2 changes: 1 addition & 1 deletion compose/network.py
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ def check_remote_ipam_config(remote, local):
raise NetworkConfigChangedError(local.full_name, 'IPAM config aux_addresses')

remote_opts = remote_ipam.get('Options') or {}
local_opts = local.ipam.get('options') or {}
local_opts = local.ipam.get('Options') or {}
for k in set.union(set(remote_opts.keys()), set(local_opts.keys())):
if remote_opts.get(k) != local_opts.get(k):
raise NetworkConfigChangedError(local.full_name, 'IPAM option "{}"'.format(k))
Expand Down
8 changes: 7 additions & 1 deletion tests/unit/network_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,10 @@ def test_check_remote_network_config_success(self):
'aux_addresses': ['11.0.0.1', '24.25.26.27'],
'ip_range': '156.0.0.1-254'
}
]
],
'options': {
'iface': 'eth0',
}
}
labels = {
'com.project.tests.istest': 'true',
Expand Down Expand Up @@ -57,6 +60,9 @@ def test_check_remote_network_config_success(self):
'Subnet': '172.0.0.1/16',
'Gateway': '172.0.0.1'
}],
'Options': {
'iface': 'eth0',
},
},
'Labels': remote_labels
},
Expand Down