From f3d09df19b04b80ebffa8072cb9da5383d8fb497 Mon Sep 17 00:00:00 2001 From: Michael Friis Date: Thu, 4 May 2017 18:08:33 -0700 Subject: [PATCH 1/2] add exception for windows networking Signed-off-by: Michael Friis --- compose/network.py | 1 + 1 file changed, 1 insertion(+) diff --git a/compose/network.py b/compose/network.py index ea6f49631..532686d76 100644 --- a/compose/network.py +++ b/compose/network.py @@ -18,6 +18,7 @@ log = logging.getLogger(__name__) OPTS_EXCEPTIONS = [ 'com.docker.network.driver.overlay.vxlanid_list', + 'com.docker.network.windowsshim.hnsid' ] From babd7530c31d28394943a4e82b8acca29b9058ff Mon Sep 17 00:00:00 2001 From: Joffrey F Date: Fri, 5 May 2017 11:40:50 -0700 Subject: [PATCH 2/2] New network config whitelist option in unit test Signed-off-by: Joffrey F --- tests/unit/network_test.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/unit/network_test.py b/tests/unit/network_test.py index d1cf2ccf9..4b40ea884 100644 --- a/tests/unit/network_test.py +++ b/tests/unit/network_test.py @@ -66,7 +66,8 @@ class NetworkTest(unittest.TestCase): options = {'com.docker.network.driver.foo': 'bar'} remote_options = { 'com.docker.network.driver.overlay.vxlanid_list': '257', - 'com.docker.network.driver.foo': 'bar' + 'com.docker.network.driver.foo': 'bar', + 'com.docker.network.windowsshim.hnsid': 'aac3fd4887daaec1e3b', } net = Network( None, 'compose_test', 'net1', 'overlay',