tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-22 21:24:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4727 from shin-/4722-port_spec_fix

Browse Source 
Fix ServicePort.legacy_repr bug for `ext_ip::target` notation
This commit is contained in:
Joffrey F 2017-04-12 14:21:30 -07:00 committed by GitHub
commit 9036c8f85a
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compose/config/types.py
View File

@ -267,7 +267,7 @@ class ServicePort(namedtuple('_ServicePort', 'target published protocol mode ext
@classmethod @classmethod
def parse(cls, spec): def parse(cls, spec):
if isinstance(spec, cls): if isinstance(spec, cls):
# WHen extending a service with ports, the port definitions have already been parsed # When extending a service with ports, the port definitions have already been parsed
return [spec] return [spec]
if not isinstance(spec, dict): if not isinstance(spec, dict):
@ -316,7 +316,7 @@ class ServicePort(namedtuple('_ServicePort', 'target published protocol mode ext
def normalize_port_dict(port): def normalize_port_dict(port):
return '{external_ip}{has_ext_ip}{published}{is_pub}{target}/{protocol}'.format( return '{external_ip}{has_ext_ip}{published}{is_pub}{target}/{protocol}'.format(
published=port.get('published', ''), published=port.get('published', ''),
is_pub=(':' if port.get('published') else ''), is_pub=(':' if port.get('published') or port.get('external_ip') else ''),
target=port.get('target'), target=port.get('target'),
protocol=port.get('protocol', 'tcp'), protocol=port.get('protocol', 'tcp'),
external_ip=port.get('external_ip', ''), external_ip=port.get('external_ip', ''),

10
tests/unit/config/types_test.py
View File

@ -71,6 +71,16 @@ class TestServicePort(object):
} }
assert ports[0].legacy_repr() == port_def assert ports[0].legacy_repr() == port_def
def test_parse_ext_ip_no_published_port(self):
port_def = '1.1.1.1::3000'
ports = ServicePort.parse(port_def)
assert len(ports) == 1
assert ports[0].legacy_repr() == port_def + '/tcp'
assert ports[0].repr() == {
'target': '3000',
'external_ip': '1.1.1.1',
}
def test_parse_port_range(self): def test_parse_port_range(self):
ports = ServicePort.parse('25000-25001:4000-4001') ports = ServicePort.parse('25000-25001:4000-4001')
assert len(ports) == 2 assert len(ports) == 2