tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Network label mismatch now prints a warning instead of raising an error 

Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
Joffrey F 2017-05-22 14:52:57 -07:00
parent 972fe65830
commit 2ba9cd73d1
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
compose/network.py
View File

@ -188,10 +188,13 @@ def check_remote_network_config(remote, local):
local_labels = local.labels or {} local_labels = local.labels or {}
remote_labels = remote.get('Labels', {}) remote_labels = remote.get('Labels', {})
for k in set.union(set(remote_labels.keys()), set(local_labels.keys())): for k in set.union(set(remote_labels.keys()), set(local_labels.keys())):
if k.startswith('com.docker.compose.'): # We are only interested in user-specified labels if k.startswith('com.docker.'): # We are only interested in user-specified labels
continue continue
if remote_labels.get(k) != local_labels.get(k): if remote_labels.get(k) != local_labels.get(k):
raise NetworkConfigChangedError(local.full_name, 'label "{}"'.format(k)) log.warn(
'Network {}: label "{}" has changed. It may need to be'
' recreated.'.format(local.full_name, k)
)
def build_networks(name, config_data, client): def build_networks(name, config_data, client):

7
tests/unit/network_test.py
View File

@ -3,6 +3,7 @@ from __future__ import unicode_literals
import pytest import pytest
from .. import mock
from .. import unittest from .. import unittest
from compose.network import check_remote_network_config from compose.network import check_remote_network_config
from compose.network import Network from compose.network import Network
@ -152,7 +153,9 @@ class NetworkTest(unittest.TestCase):
'com.project.touhou.character': 'marisa.kirisame', 'com.project.touhou.character': 'marisa.kirisame',
} }
} }
with pytest.raises(NetworkConfigChangedError) as e: with mock.patch('compose.network.log') as mock_log:
check_remote_network_config(remote, net) check_remote_network_config(remote, net)
assert 'label "com.project.touhou.character" has changed' in str(e.value) mock_log.warn.assert_called_once_with(mock.ANY)
_, args, kwargs = mock_log.warn.mock_calls[0]
assert 'label "com.project.touhou.character" has changed' in args[0]