Skip to content

Commit

Permalink
Remove external_name from serialized config output
Browse files Browse the repository at this point in the history
Signed-off-by: Joffrey F <joffrey@docker.com>
  • Loading branch information
shin- committed Jun 3, 2016
1 parent ca3aef0 commit ea640f3
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 1 deletion.
6 changes: 5 additions & 1 deletion compose/config/serialize.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,15 @@ def serialize_config(config):
service_dict.pop('name'): service_dict
for service_dict in denormalized_services
}
networks = config.networks.copy()
for net_name, net_conf in networks.items():
if 'external_name' in net_conf:
del net_conf['external_name']

output = {
'version': V2_0,
'services': services,
'networks': config.networks,
'networks': networks,
'volumes': config.volumes,
}

Expand Down
14 changes: 14 additions & 0 deletions tests/acceptance/cli_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,20 @@ def test_config_restart(self):
'volumes': {},
}

def test_config_external_network(self):
self.base_dir = 'tests/fixtures/networks'
result = self.dispatch(['-f', 'external-networks.yml', 'config'])
json_result = yaml.load(result.stdout)
assert 'networks' in json_result
assert json_result['networks'] == {
'networks_foo': {
'external': True # {'name': 'networks_foo'}
},
'bar': {
'external': {'name': 'networks_bar'}
}
}

def test_config_v1(self):
self.base_dir = 'tests/fixtures/v1-config'
result = self.dispatch(['config'])
Expand Down

0 comments on commit ea640f3

Please sign in to comment.