Skip to content

parse port ranges#544

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shin- merged 5 commits into from
Apr 22, 2015
Merged

parse port ranges #544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
278e801
Adding port utils to split port ranges
yuval-k Apr 3, 2015
8028c98
added ports to setup.py
yuval-k Apr 8, 2015
b33052b
python 2.6 compatible
yuval-k Apr 11, 2015
605fc7e
line length
yuval-k Apr 11, 2015
baadad0
removed unneeded imports
yuval-k Apr 17, 2015
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
4 changes: 4 additions & 0 deletions docker/utils/ports/__init__.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
from .ports import (
split_port,
build_port_bindings

@aanandaanandApr 17, 2015

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think to_port_range and add_port_mapping should be imported here - they're only used within ports.py, and I can't see them being useful outside it

) # flake8: noqa
84 changes: 84 additions & 0 deletions docker/utils/ports/ports.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@


def add_port_mapping(port_bindings, internal_port, external):
if internal_port in port_bindings:
port_bindings[internal_port].append(external)
else:
port_bindings[internal_port] = [external]


def add_port(port_bindings, internal_port_range, external_range):
if external_range is None:
for internal_port in internal_port_range:
add_port_mapping(port_bindings, internal_port, None)
else:
ports = zip(internal_port_range, external_range)
for internal_port, external_port in ports:
add_port_mapping(port_bindings, internal_port, external_port)


def build_port_bindings(ports):
port_bindings = {}
for port in ports:
internal_port_range, external_range = split_port(port)
add_port(port_bindings, internal_port_range, external_range)
return port_bindings


def to_port_range(port):
if not port:
return None

protocol = ""
if "/" in port:
parts = port.split("/")
if len(parts) != 2:
raise ValueError('Invalid port "%s", should be '
'[[remote_ip:]remote_port[-remote_port]:]'
'port[/protocol]' % port)
port, protocol = parts
protocol = "/" + protocol

parts = str(port).split('-')

if len(parts) == 1:
return ["%s%s" % (port, protocol)]

if len(parts) == 2:
full_port_range = range(int(parts[0]), int(parts[1]) + 1)
return ["%s%s" % (p, protocol) for p in full_port_range]

raise ValueError('Invalid port range "%s", should be '
'port or startport-endport' % port)


def split_port(port):
parts = str(port).split(':')
if not 1 <= len(parts) <= 3:
raise ValueError('Invalid port "%s", should be '
'[[remote_ip:]remote_port:]port[/protocol]' % port)

if len(parts) == 1:
internal_port, = parts
return to_port_range(internal_port), None
if len(parts) == 2:
external_port, internal_port = parts

internal_range = to_port_range(internal_port)
external_range = to_port_range(external_port)
if len(internal_range) != len(external_range):
raise ValueError('Port ranges don\'t match in length')

return internal_range, external_range

external_ip, external_port, internal_port = parts
internal_range = to_port_range(internal_port)
external_range = to_port_range(external_port)
if not external_range:
external_range = [None] * len(internal_range)

if len(internal_range) != len(external_range):
raise ValueError('Port ranges don\'t match in length')

return internal_range, [(external_ip, ex_port or None)
for ex_port in external_range]
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@
name="docker-py",
version=version,
description="Python client for Docker.",
packages=['docker', 'docker.auth', 'docker.unixconn', 'docker.utils',
packages=['docker', 'docker.auth', 'docker.unixconn', 'docker.utils', 'docker.utils.ports',
'docker.ssladapter'],
install_requires=requirements,
tests_require=test_requirements,
Expand Down
97 changes: 97 additions & 0 deletions tests/utils_test.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
parse_repository_tag, parse_host, convert_filters, kwargs_from_env,
create_host_config
)
from docker.utils.ports import build_port_bindings, split_port
from docker.auth import resolve_authconfig


Expand DownExpand Up@@ -165,6 +166,102 @@ def test_resolve_authconfig(self):
resolve_authconfig(auth_config, 'does.not.exist') is None
)

def test_split_port_with_host_ip(self):
internal_port, external_port = split_port("127.0.0.1:1000:2000")
self.assertEqual(internal_port, ["2000"])
self.assertEqual(external_port, [("127.0.0.1", "1000")])

def test_split_port_with_protocol(self):
internal_port, external_port = split_port("127.0.0.1:1000:2000/udp")
self.assertEqual(internal_port, ["2000/udp"])
self.assertEqual(external_port, [("127.0.0.1", "1000")])

def test_split_port_with_host_ip_no_port(self):
internal_port, external_port = split_port("127.0.0.1::2000")
self.assertEqual(internal_port, ["2000"])
self.assertEqual(external_port, [("127.0.0.1", None)])

def test_split_port_range_with_host_ip_no_port(self):
internal_port, external_port = split_port("127.0.0.1::2000-2001")
self.assertEqual(internal_port, ["2000", "2001"])
self.assertEqual(external_port,
[("127.0.0.1", None), ("127.0.0.1", None)])

def test_split_port_with_host_port(self):
internal_port, external_port = split_port("1000:2000")
self.assertEqual(internal_port, ["2000"])
self.assertEqual(external_port, ["1000"])

def test_split_port_range_with_host_port(self):
internal_port, external_port = split_port("1000-1001:2000-2001")
self.assertEqual(internal_port, ["2000", "2001"])
self.assertEqual(external_port, ["1000", "1001"])

def test_split_port_no_host_port(self):
internal_port, external_port = split_port("2000")
self.assertEqual(internal_port, ["2000"])
self.assertEqual(external_port, None)

def test_split_port_range_no_host_port(self):
internal_port, external_port = split_port("2000-2001")
self.assertEqual(internal_port, ["2000", "2001"])
self.assertEqual(external_port, None)

def test_split_port_range_with_protocol(self):
internal_port, external_port = split_port(
"127.0.0.1:1000-1001:2000-2001/udp")
self.assertEqual(internal_port, ["2000/udp", "2001/udp"])
self.assertEqual(external_port,
[("127.0.0.1", "1000"), ("127.0.0.1", "1001")])

def test_split_port_invalid(self):
self.assertRaises(ValueError,
lambda: split_port("0.0.0.0:1000:2000:tcp"))

def test_non_matching_length_port_ranges(self):
self.assertRaises(
ValueError,
lambda: split_port("0.0.0.0:1000-1010:2000-2002/tcp")
)

def test_port_and_range_invalid(self):
self.assertRaises(ValueError,
lambda: split_port("0.0.0.0:1000:2000-2002/tcp"))

def test_build_port_bindings_with_one_port(self):
port_bindings = build_port_bindings(["127.0.0.1:1000:1000"])
self.assertEqual(port_bindings["1000"], [("127.0.0.1", "1000")])

def test_build_port_bindings_with_matching_internal_ports(self):
port_bindings = build_port_bindings(
["127.0.0.1:1000:1000", "127.0.0.1:2000:1000"])
self.assertEqual(port_bindings["1000"],
[("127.0.0.1", "1000"), ("127.0.0.1", "2000")])

def test_build_port_bindings_with_nonmatching_internal_ports(self):
port_bindings = build_port_bindings(
["127.0.0.1:1000:1000", "127.0.0.1:2000:2000"])
self.assertEqual(port_bindings["1000"], [("127.0.0.1", "1000")])
self.assertEqual(port_bindings["2000"], [("127.0.0.1", "2000")])

def test_build_port_bindings_with_port_range(self):
port_bindings = build_port_bindings(["127.0.0.1:1000-1001:1000-1001"])
self.assertEqual(port_bindings["1000"], [("127.0.0.1", "1000")])
self.assertEqual(port_bindings["1001"], [("127.0.0.1", "1001")])

def test_build_port_bindings_with_matching_internal_port_ranges(self):
port_bindings = build_port_bindings(
["127.0.0.1:1000-1001:1000-1001", "127.0.0.1:2000-2001:1000-1001"])
self.assertEqual(port_bindings["1000"],
[("127.0.0.1", "1000"), ("127.0.0.1", "2000")])
self.assertEqual(port_bindings["1001"],
[("127.0.0.1", "1001"), ("127.0.0.1", "2001")])

def test_build_port_bindings_with_nonmatching_internal_port_ranges(self):
port_bindings = build_port_bindings(
["127.0.0.1:1000:1000", "127.0.0.1:2000:2000"])
self.assertEqual(port_bindings["1000"], [("127.0.0.1", "1000")])
self.assertEqual(port_bindings["2000"], [("127.0.0.1", "2000")])

if __name__ == '__main__':
unittest.main()
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
parse port ranges by yuval-k · Pull Request #544 · docker/docker-py · GitHub
Skip to content
parse port ranges#544

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

shin-
merged 5 commits into

from

Apr 22, 2015
 Merged


parse port ranges
#544
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
278e801

Adding port utils to split port ranges


yuval-k Apr 3, 2015
8028c98

added ports to setup.py


yuval-k Apr 8, 2015
b33052b

python 2.6 compatible


yuval-k Apr 11, 2015
605fc7e

line length


yuval-k Apr 11, 2015
baadad0

removed unneeded imports


yuval-k Apr 17, 2015

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


4 changes: 4 additions & 0 deletions
docker/utils/ports/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
from .ports import (
 split_port,
 build_port_bindings
@aanandaanandApr 17, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think to_port_range and add_port_mapping should be imported here - they're only used within ports.py, and I can't see them being useful outside it
) # flake8: noqa

84 changes: 84 additions & 0 deletions
docker/utils/ports/ports.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@


def add_port_mapping(port_bindings, internal_port, external):
 if internal_port in port_bindings:
 port_bindings[internal_port].append(external)
 else:
 port_bindings[internal_port] = [external]


def add_port(port_bindings, internal_port_range, external_range):
 if external_range is None:
 for internal_port in internal_port_range:
 add_port_mapping(port_bindings, internal_port, None)
 else:
 ports = zip(internal_port_range, external_range)
 for internal_port, external_port in ports:
 add_port_mapping(port_bindings, internal_port, external_port)


def build_port_bindings(ports):
 port_bindings = {}
 for port in ports:
 internal_port_range, external_range = split_port(port)
 add_port(port_bindings, internal_port_range, external_range)
 return port_bindings


def to_port_range(port):
 if not port:
 return None

 protocol = ""
 if "/" in port:
 parts = port.split("/")
 if len(parts) != 2:
 raise ValueError('Invalid port "%s", should be '
 '[[remote_ip:]remote_port[-remote_port]:]'
 'port[/protocol]' % port)
 port, protocol = parts
 protocol = "/" + protocol

 parts = str(port).split('-')

 if len(parts) == 1:
 return ["%s%s" % (port, protocol)]

 if len(parts) == 2:
 full_port_range = range(int(parts[0]), int(parts[1]) + 1)
 return ["%s%s" % (p, protocol) for p in full_port_range]

 raise ValueError('Invalid port range "%s", should be '
 'port or startport-endport' % port)


def split_port(port):
 parts = str(port).split(':')
 if not 1 <= len(parts) <= 3:
 raise ValueError('Invalid port "%s", should be '
 '[[remote_ip:]remote_port:]port[/protocol]' % port)

 if len(parts) == 1:
 internal_port, = parts
 return to_port_range(internal_port), None
 if len(parts) == 2:
 external_port, internal_port = parts

 internal_range = to_port_range(internal_port)
 external_range = to_port_range(external_port)
 if len(internal_range) != len(external_range):
 raise ValueError('Port ranges don\'t match in length')

 return internal_range, external_range

 external_ip, external_port, internal_port = parts
 internal_range = to_port_range(internal_port)
 external_range = to_port_range(external_port)
 if not external_range:
 external_range = [None] * len(internal_range)

 if len(internal_range) != len(external_range):
 raise ValueError('Port ranges don\'t match in length')

 return internal_range, [(external_ip, ex_port or None)
 for ex_port in external_range]

2 changes: 1 addition & 1 deletion
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@
 name="docker-py",
 version=version,
 description="Python client for Docker.",
 packages=['docker', 'docker.auth', 'docker.unixconn', 'docker.utils',
 packages=['docker', 'docker.auth', 'docker.unixconn', 'docker.utils', 'docker.utils.ports',
 'docker.ssladapter'],
 install_requires=requirements,
 tests_require=test_requirements,
Expand Down

97 changes: 97 additions & 0 deletions
tests/utils_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
 parse_repository_tag, parse_host, convert_filters, kwargs_from_env,
 create_host_config
)
from docker.utils.ports import build_port_bindings, split_port
from docker.auth import resolve_authconfig


Expand DownExpand Up@@ -165,6 +166,102 @@ def test_resolve_authconfig(self):
 resolve_authconfig(auth_config, 'does.not.exist') is None
 )

 def test_split_port_with_host_ip(self):
 internal_port, external_port = split_port("127.0.0.1:1000:2000")
 self.assertEqual(internal_port, ["2000"])
 self.assertEqual(external_port, [("127.0.0.1", "1000")])

 def test_split_port_with_protocol(self):
 internal_port, external_port = split_port("127.0.0.1:1000:2000/udp")
 self.assertEqual(internal_port, ["2000/udp"])
 self.assertEqual(external_port, [("127.0.0.1", "1000")])

 def test_split_port_with_host_ip_no_port(self):
 internal_port, external_port = split_port("127.0.0.1::2000")
 self.assertEqual(internal_port, ["2000"])
 self.assertEqual(external_port, [("127.0.0.1", None)])

 def test_split_port_range_with_host_ip_no_port(self):
 internal_port, external_port = split_port("127.0.0.1::2000-2001")
 self.assertEqual(internal_port, ["2000", "2001"])
 self.assertEqual(external_port,
 [("127.0.0.1", None), ("127.0.0.1", None)])

 def test_split_port_with_host_port(self):
 internal_port, external_port = split_port("1000:2000")
 self.assertEqual(internal_port, ["2000"])
 self.assertEqual(external_port, ["1000"])

 def test_split_port_range_with_host_port(self):
 internal_port, external_port = split_port("1000-1001:2000-2001")
 self.assertEqual(internal_port, ["2000", "2001"])
 self.assertEqual(external_port, ["1000", "1001"])

 def test_split_port_no_host_port(self):
 internal_port, external_port = split_port("2000")
 self.assertEqual(internal_port, ["2000"])
 self.assertEqual(external_port, None)

 def test_split_port_range_no_host_port(self):
 internal_port, external_port = split_port("2000-2001")
 self.assertEqual(internal_port, ["2000", "2001"])
 self.assertEqual(external_port, None)

 def test_split_port_range_with_protocol(self):
 internal_port, external_port = split_port(
 "127.0.0.1:1000-1001:2000-2001/udp")
 self.assertEqual(internal_port, ["2000/udp", "2001/udp"])
 self.assertEqual(external_port,
 [("127.0.0.1", "1000"), ("127.0.0.1", "1001")])

 def test_split_port_invalid(self):
 self.assertRaises(ValueError,
 lambda: split_port("0.0.0.0:1000:2000:tcp"))

 def test_non_matching_length_port_ranges(self):
 self.assertRaises(
 ValueError,
 lambda: split_port("0.0.0.0:1000-1010:2000-2002/tcp")
 )

 def test_port_and_range_invalid(self):
 self.assertRaises(ValueError,
 lambda: split_port("0.0.0.0:1000:2000-2002/tcp"))

 def test_build_port_bindings_with_one_port(self):
 port_bindings = build_port_bindings(["127.0.0.1:1000:1000"])
 self.assertEqual(port_bindings["1000"], [("127.0.0.1", "1000")])

 def test_build_port_bindings_with_matching_internal_ports(self):
 port_bindings = build_port_bindings(
 ["127.0.0.1:1000:1000", "127.0.0.1:2000:1000"])
 self.assertEqual(port_bindings["1000"],
 [("127.0.0.1", "1000"), ("127.0.0.1", "2000")])

 def test_build_port_bindings_with_nonmatching_internal_ports(self):
 port_bindings = build_port_bindings(
 ["127.0.0.1:1000:1000", "127.0.0.1:2000:2000"])
 self.assertEqual(port_bindings["1000"], [("127.0.0.1", "1000")])
 self.assertEqual(port_bindings["2000"], [("127.0.0.1", "2000")])

 def test_build_port_bindings_with_port_range(self):
 port_bindings = build_port_bindings(["127.0.0.1:1000-1001:1000-1001"])
 self.assertEqual(port_bindings["1000"], [("127.0.0.1", "1000")])
 self.assertEqual(port_bindings["1001"], [("127.0.0.1", "1001")])

 def test_build_port_bindings_with_matching_internal_port_ranges(self):
 port_bindings = build_port_bindings(
 ["127.0.0.1:1000-1001:1000-1001", "127.0.0.1:2000-2001:1000-1001"])
 self.assertEqual(port_bindings["1000"],
 [("127.0.0.1", "1000"), ("127.0.0.1", "2000")])
 self.assertEqual(port_bindings["1001"],
 [("127.0.0.1", "1001"), ("127.0.0.1", "2001")])

 def test_build_port_bindings_with_nonmatching_internal_port_ranges(self):
 port_bindings = build_port_bindings(
 ["127.0.0.1:1000:1000", "127.0.0.1:2000:2000"])
 self.assertEqual(port_bindings["1000"], [("127.0.0.1", "1000")])
 self.assertEqual(port_bindings["2000"], [("127.0.0.1", "2000")])

if __name__ == '__main__':
 unittest.main()

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
parse port ranges by yuval-k · Pull Request #544 · docker/docker-py · GitHub
Skip to content
parse port ranges#544

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

shin-
merged 5 commits into

from

Apr 22, 2015
 Merged


parse port ranges
#544
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
278e801

Adding port utils to split port ranges


yuval-k Apr 3, 2015
8028c98

added ports to setup.py


yuval-k Apr 8, 2015
b33052b

python 2.6 compatible


yuval-k Apr 11, 2015
605fc7e

line length


yuval-k Apr 11, 2015
baadad0

removed unneeded imports


yuval-k Apr 17, 2015

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


4 changes: 4 additions & 0 deletions
docker/utils/ports/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
from .ports import (
 split_port,
 build_port_bindings
@aanandaanandApr 17, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think to_port_range and add_port_mapping should be imported here - they're only used within ports.py, and I can't see them being useful outside it
) # flake8: noqa

84 changes: 84 additions & 0 deletions
docker/utils/ports/ports.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@


def add_port_mapping(port_bindings, internal_port, external):
 if internal_port in port_bindings:
 port_bindings[internal_port].append(external)
 else:
 port_bindings[internal_port] = [external]


def add_port(port_bindings, internal_port_range, external_range):
 if external_range is None:
 for internal_port in internal_port_range:
 add_port_mapping(port_bindings, internal_port, None)
 else:
 ports = zip(internal_port_range, external_range)
 for internal_port, external_port in ports:
 add_port_mapping(port_bindings, internal_port, external_port)


def build_port_bindings(ports):
 port_bindings = {}
 for port in ports:
 internal_port_range, external_range = split_port(port)
 add_port(port_bindings, internal_port_range, external_range)
 return port_bindings


def to_port_range(port):
 if not port:
 return None

 protocol = ""
 if "/" in port:
 parts = port.split("/")
 if len(parts) != 2:
 raise ValueError('Invalid port "%s", should be '
 '[[remote_ip:]remote_port[-remote_port]:]'
 'port[/protocol]' % port)
 port, protocol = parts
 protocol = "/" + protocol

 parts = str(port).split('-')

 if len(parts) == 1:
 return ["%s%s" % (port, protocol)]

 if len(parts) == 2:
 full_port_range = range(int(parts[0]), int(parts[1]) + 1)
 return ["%s%s" % (p, protocol) for p in full_port_range]

 raise ValueError('Invalid port range "%s", should be '
 'port or startport-endport' % port)


def split_port(port):
 parts = str(port).split(':')
 if not 1 <= len(parts) <= 3:
 raise ValueError('Invalid port "%s", should be '
 '[[remote_ip:]remote_port:]port[/protocol]' % port)

 if len(parts) == 1:
 internal_port, = parts
 return to_port_range(internal_port), None
 if len(parts) == 2:
 external_port, internal_port = parts

 internal_range = to_port_range(internal_port)
 external_range = to_port_range(external_port)
 if len(internal_range) != len(external_range):
 raise ValueError('Port ranges don\'t match in length')

 return internal_range, external_range

 external_ip, external_port, internal_port = parts
 internal_range = to_port_range(internal_port)
 external_range = to_port_range(external_port)
 if not external_range:
 external_range = [None] * len(internal_range)

 if len(internal_range) != len(external_range):
 raise ValueError('Port ranges don\'t match in length')

 return internal_range, [(external_ip, ex_port or None)
 for ex_port in external_range]

2 changes: 1 addition & 1 deletion
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@
 name="docker-py",
 version=version,
 description="Python client for Docker.",
 packages=['docker', 'docker.auth', 'docker.unixconn', 'docker.utils',
 packages=['docker', 'docker.auth', 'docker.unixconn', 'docker.utils', 'docker.utils.ports',
 'docker.ssladapter'],
 install_requires=requirements,
 tests_require=test_requirements,
Expand Down

97 changes: 97 additions & 0 deletions
tests/utils_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
 parse_repository_tag, parse_host, convert_filters, kwargs_from_env,
 create_host_config
)
from docker.utils.ports import build_port_bindings, split_port
from docker.auth import resolve_authconfig


Expand DownExpand Up@@ -165,6 +166,102 @@ def test_resolve_authconfig(self):
 resolve_authconfig(auth_config, 'does.not.exist') is None
 )

 def test_split_port_with_host_ip(self):
 internal_port, external_port = split_port("127.0.0.1:1000:2000")
 self.assertEqual(internal_port, ["2000"])
 self.assertEqual(external_port, [("127.0.0.1", "1000")])

 def test_split_port_with_protocol(self):
 internal_port, external_port = split_port("127.0.0.1:1000:2000/udp")
 self.assertEqual(internal_port, ["2000/udp"])
 self.assertEqual(external_port, [("127.0.0.1", "1000")])

 def test_split_port_with_host_ip_no_port(self):
 internal_port, external_port = split_port("127.0.0.1::2000")
 self.assertEqual(internal_port, ["2000"])
 self.assertEqual(external_port, [("127.0.0.1", None)])

 def test_split_port_range_with_host_ip_no_port(self):
 internal_port, external_port = split_port("127.0.0.1::2000-2001")
 self.assertEqual(internal_port, ["2000", "2001"])
 self.assertEqual(external_port,
 [("127.0.0.1", None), ("127.0.0.1", None)])

 def test_split_port_with_host_port(self):
 internal_port, external_port = split_port("1000:2000")
 self.assertEqual(internal_port, ["2000"])
 self.assertEqual(external_port, ["1000"])

 def test_split_port_range_with_host_port(self):
 internal_port, external_port = split_port("1000-1001:2000-2001")
 self.assertEqual(internal_port, ["2000", "2001"])
 self.assertEqual(external_port, ["1000", "1001"])

 def test_split_port_no_host_port(self):
 internal_port, external_port = split_port("2000")
 self.assertEqual(internal_port, ["2000"])
 self.assertEqual(external_port, None)

 def test_split_port_range_no_host_port(self):
 internal_port, external_port = split_port("2000-2001")
 self.assertEqual(internal_port, ["2000", "2001"])
 self.assertEqual(external_port, None)

 def test_split_port_range_with_protocol(self):
 internal_port, external_port = split_port(
 "127.0.0.1:1000-1001:2000-2001/udp")
 self.assertEqual(internal_port, ["2000/udp", "2001/udp"])
 self.assertEqual(external_port,
 [("127.0.0.1", "1000"), ("127.0.0.1", "1001")])

 def test_split_port_invalid(self):
 self.assertRaises(ValueError,
 lambda: split_port("0.0.0.0:1000:2000:tcp"))

 def test_non_matching_length_port_ranges(self):
 self.assertRaises(
 ValueError,
 lambda: split_port("0.0.0.0:1000-1010:2000-2002/tcp")
 )

 def test_port_and_range_invalid(self):
 self.assertRaises(ValueError,
 lambda: split_port("0.0.0.0:1000:2000-2002/tcp"))

 def test_build_port_bindings_with_one_port(self):
 port_bindings = build_port_bindings(["127.0.0.1:1000:1000"])
 self.assertEqual(port_bindings["1000"], [("127.0.0.1", "1000")])

 def test_build_port_bindings_with_matching_internal_ports(self):
 port_bindings = build_port_bindings(
 ["127.0.0.1:1000:1000", "127.0.0.1:2000:1000"])
 self.assertEqual(port_bindings["1000"],
 [("127.0.0.1", "1000"), ("127.0.0.1", "2000")])

 def test_build_port_bindings_with_nonmatching_internal_ports(self):
 port_bindings = build_port_bindings(
 ["127.0.0.1:1000:1000", "127.0.0.1:2000:2000"])
 self.assertEqual(port_bindings["1000"], [("127.0.0.1", "1000")])
 self.assertEqual(port_bindings["2000"], [("127.0.0.1", "2000")])

 def test_build_port_bindings_with_port_range(self):
 port_bindings = build_port_bindings(["127.0.0.1:1000-1001:1000-1001"])
 self.assertEqual(port_bindings["1000"], [("127.0.0.1", "1000")])
 self.assertEqual(port_bindings["1001"], [("127.0.0.1", "1001")])

 def test_build_port_bindings_with_matching_internal_port_ranges(self):
 port_bindings = build_port_bindings(
 ["127.0.0.1:1000-1001:1000-1001", "127.0.0.1:2000-2001:1000-1001"])
 self.assertEqual(port_bindings["1000"],
 [("127.0.0.1", "1000"), ("127.0.0.1", "2000")])
 self.assertEqual(port_bindings["1001"],
 [("127.0.0.1", "1001"), ("127.0.0.1", "2001")])

 def test_build_port_bindings_with_nonmatching_internal_port_ranges(self):
 port_bindings = build_port_bindings(
 ["127.0.0.1:1000:1000", "127.0.0.1:2000:2000"])
 self.assertEqual(port_bindings["1000"], [("127.0.0.1", "1000")])
 self.assertEqual(port_bindings["2000"], [("127.0.0.1", "2000")])

if __name__ == '__main__':
 unittest.main()

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
parse port ranges by yuval-k · Pull Request #544 · docker/docker-py · GitHub
Skip to content
parse port ranges#544

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

shin-
merged 5 commits into

from

Apr 22, 2015
 Merged


parse port ranges
#544
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
278e801

Adding port utils to split port ranges


yuval-k Apr 3, 2015
8028c98

added ports to setup.py


yuval-k Apr 8, 2015
b33052b

python 2.6 compatible


yuval-k Apr 11, 2015
605fc7e

line length


yuval-k Apr 11, 2015
baadad0

removed unneeded imports


yuval-k Apr 17, 2015

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


4 changes: 4 additions & 0 deletions
docker/utils/ports/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
from .ports import (
 split_port,
 build_port_bindings
@aanandaanandApr 17, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think to_port_range and add_port_mapping should be imported here - they're only used within ports.py, and I can't see them being useful outside it
) # flake8: noqa

84 changes: 84 additions & 0 deletions
docker/utils/ports/ports.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@


def add_port_mapping(port_bindings, internal_port, external):
 if internal_port in port_bindings:
 port_bindings[internal_port].append(external)
 else:
 port_bindings[internal_port] = [external]


def add_port(port_bindings, internal_port_range, external_range):
 if external_range is None:
 for internal_port in internal_port_range:
 add_port_mapping(port_bindings, internal_port, None)
 else:
 ports = zip(internal_port_range, external_range)
 for internal_port, external_port in ports:
 add_port_mapping(port_bindings, internal_port, external_port)


def build_port_bindings(ports):
 port_bindings = {}
 for port in ports:
 internal_port_range, external_range = split_port(port)
 add_port(port_bindings, internal_port_range, external_range)
 return port_bindings


def to_port_range(port):
 if not port:
 return None

 protocol = ""
 if "/" in port:
 parts = port.split("/")
 if len(parts) != 2:
 raise ValueError('Invalid port "%s", should be '
 '[[remote_ip:]remote_port[-remote_port]:]'
 'port[/protocol]' % port)
 port, protocol = parts
 protocol = "/" + protocol

 parts = str(port).split('-')

 if len(parts) == 1:
 return ["%s%s" % (port, protocol)]

 if len(parts) == 2:
 full_port_range = range(int(parts[0]), int(parts[1]) + 1)
 return ["%s%s" % (p, protocol) for p in full_port_range]

 raise ValueError('Invalid port range "%s", should be '
 'port or startport-endport' % port)


def split_port(port):
 parts = str(port).split(':')
 if not 1 <= len(parts) <= 3:
 raise ValueError('Invalid port "%s", should be '
 '[[remote_ip:]remote_port:]port[/protocol]' % port)

 if len(parts) == 1:
 internal_port, = parts
 return to_port_range(internal_port), None
 if len(parts) == 2:
 external_port, internal_port = parts

 internal_range = to_port_range(internal_port)
 external_range = to_port_range(external_port)
 if len(internal_range) != len(external_range):
 raise ValueError('Port ranges don\'t match in length')

 return internal_range, external_range

 external_ip, external_port, internal_port = parts
 internal_range = to_port_range(internal_port)
 external_range = to_port_range(external_port)
 if not external_range:
 external_range = [None] * len(internal_range)

 if len(internal_range) != len(external_range):
 raise ValueError('Port ranges don\'t match in length')

 return internal_range, [(external_ip, ex_port or None)
 for ex_port in external_range]

2 changes: 1 addition & 1 deletion
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@
 name="docker-py",
 version=version,
 description="Python client for Docker.",
 packages=['docker', 'docker.auth', 'docker.unixconn', 'docker.utils',
 packages=['docker', 'docker.auth', 'docker.unixconn', 'docker.utils', 'docker.utils.ports',
 'docker.ssladapter'],
 install_requires=requirements,
 tests_require=test_requirements,
Expand Down

97 changes: 97 additions & 0 deletions
tests/utils_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
 parse_repository_tag, parse_host, convert_filters, kwargs_from_env,
 create_host_config
)
from docker.utils.ports import build_port_bindings, split_port
from docker.auth import resolve_authconfig


Expand DownExpand Up@@ -165,6 +166,102 @@ def test_resolve_authconfig(self):
 resolve_authconfig(auth_config, 'does.not.exist') is None
 )

 def test_split_port_with_host_ip(self):
 internal_port, external_port = split_port("127.0.0.1:1000:2000")
 self.assertEqual(internal_port, ["2000"])
 self.assertEqual(external_port, [("127.0.0.1", "1000")])

 def test_split_port_with_protocol(self):
 internal_port, external_port = split_port("127.0.0.1:1000:2000/udp")
 self.assertEqual(internal_port, ["2000/udp"])
 self.assertEqual(external_port, [("127.0.0.1", "1000")])

 def test_split_port_with_host_ip_no_port(self):
 internal_port, external_port = split_port("127.0.0.1::2000")
 self.assertEqual(internal_port, ["2000"])
 self.assertEqual(external_port, [("127.0.0.1", None)])

 def test_split_port_range_with_host_ip_no_port(self):
 internal_port, external_port = split_port("127.0.0.1::2000-2001")
 self.assertEqual(internal_port, ["2000", "2001"])
 self.assertEqual(external_port,
 [("127.0.0.1", None), ("127.0.0.1", None)])

 def test_split_port_with_host_port(self):
 internal_port, external_port = split_port("1000:2000")
 self.assertEqual(internal_port, ["2000"])
 self.assertEqual(external_port, ["1000"])

 def test_split_port_range_with_host_port(self):
 internal_port, external_port = split_port("1000-1001:2000-2001")
 self.assertEqual(internal_port, ["2000", "2001"])
 self.assertEqual(external_port, ["1000", "1001"])

 def test_split_port_no_host_port(self):
 internal_port, external_port = split_port("2000")
 self.assertEqual(internal_port, ["2000"])
 self.assertEqual(external_port, None)

 def test_split_port_range_no_host_port(self):
 internal_port, external_port = split_port("2000-2001")
 self.assertEqual(internal_port, ["2000", "2001"])
 self.assertEqual(external_port, None)

 def test_split_port_range_with_protocol(self):
 internal_port, external_port = split_port(
 "127.0.0.1:1000-1001:2000-2001/udp")
 self.assertEqual(internal_port, ["2000/udp", "2001/udp"])
 self.assertEqual(external_port,
 [("127.0.0.1", "1000"), ("127.0.0.1", "1001")])

 def test_split_port_invalid(self):
 self.assertRaises(ValueError,
 lambda: split_port("0.0.0.0:1000:2000:tcp"))

 def test_non_matching_length_port_ranges(self):
 self.assertRaises(
 ValueError,
 lambda: split_port("0.0.0.0:1000-1010:2000-2002/tcp")
 )

 def test_port_and_range_invalid(self):
 self.assertRaises(ValueError,
 lambda: split_port("0.0.0.0:1000:2000-2002/tcp"))

 def test_build_port_bindings_with_one_port(self):
 port_bindings = build_port_bindings(["127.0.0.1:1000:1000"])
 self.assertEqual(port_bindings["1000"], [("127.0.0.1", "1000")])

 def test_build_port_bindings_with_matching_internal_ports(self):
 port_bindings = build_port_bindings(
 ["127.0.0.1:1000:1000", "127.0.0.1:2000:1000"])
 self.assertEqual(port_bindings["1000"],
 [("127.0.0.1", "1000"), ("127.0.0.1", "2000")])

 def test_build_port_bindings_with_nonmatching_internal_ports(self):
 port_bindings = build_port_bindings(
 ["127.0.0.1:1000:1000", "127.0.0.1:2000:2000"])
 self.assertEqual(port_bindings["1000"], [("127.0.0.1", "1000")])
 self.assertEqual(port_bindings["2000"], [("127.0.0.1", "2000")])

 def test_build_port_bindings_with_port_range(self):
 port_bindings = build_port_bindings(["127.0.0.1:1000-1001:1000-1001"])
 self.assertEqual(port_bindings["1000"], [("127.0.0.1", "1000")])
 self.assertEqual(port_bindings["1001"], [("127.0.0.1", "1001")])

 def test_build_port_bindings_with_matching_internal_port_ranges(self):
 port_bindings = build_port_bindings(
 ["127.0.0.1:1000-1001:1000-1001", "127.0.0.1:2000-2001:1000-1001"])
 self.assertEqual(port_bindings["1000"],
 [("127.0.0.1", "1000"), ("127.0.0.1", "2000")])
 self.assertEqual(port_bindings["1001"],
 [("127.0.0.1", "1001"), ("127.0.0.1", "2001")])

 def test_build_port_bindings_with_nonmatching_internal_port_ranges(self):
 port_bindings = build_port_bindings(
 ["127.0.0.1:1000:1000", "127.0.0.1:2000:2000"])
 self.assertEqual(port_bindings["1000"], [("127.0.0.1", "1000")])
 self.assertEqual(port_bindings["2000"], [("127.0.0.1", "2000")])

if __name__ == '__main__':
 unittest.main()

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
parse port ranges by yuval-k · Pull Request #544 · docker/docker-py · GitHub
Skip to content
parse port ranges#544

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

shin-
merged 5 commits into

from

Apr 22, 2015
 Merged


parse port ranges
#544
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
278e801

Adding port utils to split port ranges


yuval-k Apr 3, 2015
8028c98

added ports to setup.py


yuval-k Apr 8, 2015
b33052b

python 2.6 compatible


yuval-k Apr 11, 2015
605fc7e

line length


yuval-k Apr 11, 2015
baadad0

removed unneeded imports


yuval-k Apr 17, 2015

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


4 changes: 4 additions & 0 deletions
docker/utils/ports/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
from .ports import (
 split_port,
 build_port_bindings
@aanandaanandApr 17, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think to_port_range and add_port_mapping should be imported here - they're only used within ports.py, and I can't see them being useful outside it
) # flake8: noqa

84 changes: 84 additions & 0 deletions
docker/utils/ports/ports.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@


def add_port_mapping(port_bindings, internal_port, external):
 if internal_port in port_bindings:
 port_bindings[internal_port].append(external)
 else:
 port_bindings[internal_port] = [external]


def add_port(port_bindings, internal_port_range, external_range):
 if external_range is None:
 for internal_port in internal_port_range:
 add_port_mapping(port_bindings, internal_port, None)
 else:
 ports = zip(internal_port_range, external_range)
 for internal_port, external_port in ports:
 add_port_mapping(port_bindings, internal_port, external_port)


def build_port_bindings(ports):
 port_bindings = {}
 for port in ports:
 internal_port_range, external_range = split_port(port)
 add_port(port_bindings, internal_port_range, external_range)
 return port_bindings


def to_port_range(port):
 if not port:
 return None

 protocol = ""
 if "/" in port:
 parts = port.split("/")
 if len(parts) != 2:
 raise ValueError('Invalid port "%s", should be '
 '[[remote_ip:]remote_port[-remote_port]:]'
 'port[/protocol]' % port)
 port, protocol = parts
 protocol = "/" + protocol

 parts = str(port).split('-')

 if len(parts) == 1:
 return ["%s%s" % (port, protocol)]

 if len(parts) == 2:
 full_port_range = range(int(parts[0]), int(parts[1]) + 1)
 return ["%s%s" % (p, protocol) for p in full_port_range]

 raise ValueError('Invalid port range "%s", should be '
 'port or startport-endport' % port)


def split_port(port):
 parts = str(port).split(':')
 if not 1 <= len(parts) <= 3:
 raise ValueError('Invalid port "%s", should be '
 '[[remote_ip:]remote_port:]port[/protocol]' % port)

 if len(parts) == 1:
 internal_port, = parts
 return to_port_range(internal_port), None
 if len(parts) == 2:
 external_port, internal_port = parts

 internal_range = to_port_range(internal_port)
 external_range = to_port_range(external_port)
 if len(internal_range) != len(external_range):
 raise ValueError('Port ranges don\'t match in length')

 return internal_range, external_range

 external_ip, external_port, internal_port = parts
 internal_range = to_port_range(internal_port)
 external_range = to_port_range(external_port)
 if not external_range:
 external_range = [None] * len(internal_range)

 if len(internal_range) != len(external_range):
 raise ValueError('Port ranges don\'t match in length')

 return internal_range, [(external_ip, ex_port or None)
 for ex_port in external_range]

2 changes: 1 addition & 1 deletion
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@
 name="docker-py",
 version=version,
 description="Python client for Docker.",
 packages=['docker', 'docker.auth', 'docker.unixconn', 'docker.utils',
 packages=['docker', 'docker.auth', 'docker.unixconn', 'docker.utils', 'docker.utils.ports',
 'docker.ssladapter'],
 install_requires=requirements,
 tests_require=test_requirements,
Expand Down

97 changes: 97 additions & 0 deletions
tests/utils_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
 parse_repository_tag, parse_host, convert_filters, kwargs_from_env,
 create_host_config
)
from docker.utils.ports import build_port_bindings, split_port
from docker.auth import resolve_authconfig


Expand DownExpand Up@@ -165,6 +166,102 @@ def test_resolve_authconfig(self):
 resolve_authconfig(auth_config, 'does.not.exist') is None
 )

 def test_split_port_with_host_ip(self):
 internal_port, external_port = split_port("127.0.0.1:1000:2000")
 self.assertEqual(internal_port, ["2000"])
 self.assertEqual(external_port, [("127.0.0.1", "1000")])

 def test_split_port_with_protocol(self):
 internal_port, external_port = split_port("127.0.0.1:1000:2000/udp")
 self.assertEqual(internal_port, ["2000/udp"])
 self.assertEqual(external_port, [("127.0.0.1", "1000")])

 def test_split_port_with_host_ip_no_port(self):
 internal_port, external_port = split_port("127.0.0.1::2000")
 self.assertEqual(internal_port, ["2000"])
 self.assertEqual(external_port, [("127.0.0.1", None)])

 def test_split_port_range_with_host_ip_no_port(self):
 internal_port, external_port = split_port("127.0.0.1::2000-2001")
 self.assertEqual(internal_port, ["2000", "2001"])
 self.assertEqual(external_port,
 [("127.0.0.1", None), ("127.0.0.1", None)])

 def test_split_port_with_host_port(self):
 internal_port, external_port = split_port("1000:2000")
 self.assertEqual(internal_port, ["2000"])
 self.assertEqual(external_port, ["1000"])

 def test_split_port_range_with_host_port(self):
 internal_port, external_port = split_port("1000-1001:2000-2001")
 self.assertEqual(internal_port, ["2000", "2001"])
 self.assertEqual(external_port, ["1000", "1001"])

 def test_split_port_no_host_port(self):
 internal_port, external_port = split_port("2000")
 self.assertEqual(internal_port, ["2000"])
 self.assertEqual(external_port, None)

 def test_split_port_range_no_host_port(self):
 internal_port, external_port = split_port("2000-2001")
 self.assertEqual(internal_port, ["2000", "2001"])
 self.assertEqual(external_port, None)

 def test_split_port_range_with_protocol(self):
 internal_port, external_port = split_port(
 "127.0.0.1:1000-1001:2000-2001/udp")
 self.assertEqual(internal_port, ["2000/udp", "2001/udp"])
 self.assertEqual(external_port,
 [("127.0.0.1", "1000"), ("127.0.0.1", "1001")])

 def test_split_port_invalid(self):
 self.assertRaises(ValueError,
 lambda: split_port("0.0.0.0:1000:2000:tcp"))

 def test_non_matching_length_port_ranges(self):
 self.assertRaises(
 ValueError,
 lambda: split_port("0.0.0.0:1000-1010:2000-2002/tcp")
 )

 def test_port_and_range_invalid(self):
 self.assertRaises(ValueError,
 lambda: split_port("0.0.0.0:1000:2000-2002/tcp"))

 def test_build_port_bindings_with_one_port(self):
 port_bindings = build_port_bindings(["127.0.0.1:1000:1000"])
 self.assertEqual(port_bindings["1000"], [("127.0.0.1", "1000")])

 def test_build_port_bindings_with_matching_internal_ports(self):
 port_bindings = build_port_bindings(
 ["127.0.0.1:1000:1000", "127.0.0.1:2000:1000"])
 self.assertEqual(port_bindings["1000"],
 [("127.0.0.1", "1000"), ("127.0.0.1", "2000")])

 def test_build_port_bindings_with_nonmatching_internal_ports(self):
 port_bindings = build_port_bindings(
 ["127.0.0.1:1000:1000", "127.0.0.1:2000:2000"])
 self.assertEqual(port_bindings["1000"], [("127.0.0.1", "1000")])
 self.assertEqual(port_bindings["2000"], [("127.0.0.1", "2000")])

 def test_build_port_bindings_with_port_range(self):
 port_bindings = build_port_bindings(["127.0.0.1:1000-1001:1000-1001"])
 self.assertEqual(port_bindings["1000"], [("127.0.0.1", "1000")])
 self.assertEqual(port_bindings["1001"], [("127.0.0.1", "1001")])

 def test_build_port_bindings_with_matching_internal_port_ranges(self):
 port_bindings = build_port_bindings(
 ["127.0.0.1:1000-1001:1000-1001", "127.0.0.1:2000-2001:1000-1001"])
 self.assertEqual(port_bindings["1000"],
 [("127.0.0.1", "1000"), ("127.0.0.1", "2000")])
 self.assertEqual(port_bindings["1001"],
 [("127.0.0.1", "1001"), ("127.0.0.1", "2001")])

 def test_build_port_bindings_with_nonmatching_internal_port_ranges(self):
 port_bindings = build_port_bindings(
 ["127.0.0.1:1000:1000", "127.0.0.1:2000:2000"])
 self.assertEqual(port_bindings["1000"], [("127.0.0.1", "1000")])
 self.assertEqual(port_bindings["2000"], [("127.0.0.1", "2000")])

if __name__ == '__main__':
 unittest.main()

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
parse port ranges by yuval-k · Pull Request #544 · docker/docker-py · GitHub
Skip to content
parse port ranges#544

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

shin-
merged 5 commits into

from

Apr 22, 2015
 Merged


parse port ranges
#544
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
278e801

Adding port utils to split port ranges


yuval-k Apr 3, 2015
8028c98

added ports to setup.py


yuval-k Apr 8, 2015
b33052b

python 2.6 compatible


yuval-k Apr 11, 2015
605fc7e

line length


yuval-k Apr 11, 2015
baadad0

removed unneeded imports


yuval-k Apr 17, 2015

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


4 changes: 4 additions & 0 deletions
docker/utils/ports/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
from .ports import (
 split_port,
 build_port_bindings
@aanandaanandApr 17, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think to_port_range and add_port_mapping should be imported here - they're only used within ports.py, and I can't see them being useful outside it
) # flake8: noqa

84 changes: 84 additions & 0 deletions
docker/utils/ports/ports.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@


def add_port_mapping(port_bindings, internal_port, external):
 if internal_port in port_bindings:
 port_bindings[internal_port].append(external)
 else:
 port_bindings[internal_port] = [external]


def add_port(port_bindings, internal_port_range, external_range):
 if external_range is None:
 for internal_port in internal_port_range:
 add_port_mapping(port_bindings, internal_port, None)
 else:
 ports = zip(internal_port_range, external_range)
 for internal_port, external_port in ports:
 add_port_mapping(port_bindings, internal_port, external_port)


def build_port_bindings(ports):
 port_bindings = {}
 for port in ports:
 internal_port_range, external_range = split_port(port)
 add_port(port_bindings, internal_port_range, external_range)
 return port_bindings


def to_port_range(port):
 if not port:
 return None

 protocol = ""
 if "/" in port:
 parts = port.split("/")
 if len(parts) != 2:
 raise ValueError('Invalid port "%s", should be '
 '[[remote_ip:]remote_port[-remote_port]:]'
 'port[/protocol]' % port)
 port, protocol = parts
 protocol = "/" + protocol

 parts = str(port).split('-')

 if len(parts) == 1:
 return ["%s%s" % (port, protocol)]

 if len(parts) == 2:
 full_port_range = range(int(parts[0]), int(parts[1]) + 1)
 return ["%s%s" % (p, protocol) for p in full_port_range]

 raise ValueError('Invalid port range "%s", should be '
 'port or startport-endport' % port)


def split_port(port):
 parts = str(port).split(':')
 if not 1 <= len(parts) <= 3:
 raise ValueError('Invalid port "%s", should be '
 '[[remote_ip:]remote_port:]port[/protocol]' % port)

 if len(parts) == 1:
 internal_port, = parts
 return to_port_range(internal_port), None
 if len(parts) == 2:
 external_port, internal_port = parts

 internal_range = to_port_range(internal_port)
 external_range = to_port_range(external_port)
 if len(internal_range) != len(external_range):
 raise ValueError('Port ranges don\'t match in length')

 return internal_range, external_range

 external_ip, external_port, internal_port = parts
 internal_range = to_port_range(internal_port)
 external_range = to_port_range(external_port)
 if not external_range:
 external_range = [None] * len(internal_range)

 if len(internal_range) != len(external_range):
 raise ValueError('Port ranges don\'t match in length')

 return internal_range, [(external_ip, ex_port or None)
 for ex_port in external_range]

2 changes: 1 addition & 1 deletion
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@
 name="docker-py",
 version=version,
 description="Python client for Docker.",
 packages=['docker', 'docker.auth', 'docker.unixconn', 'docker.utils',
 packages=['docker', 'docker.auth', 'docker.unixconn', 'docker.utils', 'docker.utils.ports',
 'docker.ssladapter'],
 install_requires=requirements,
 tests_require=test_requirements,
Expand Down

97 changes: 97 additions & 0 deletions
tests/utils_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
 parse_repository_tag, parse_host, convert_filters, kwargs_from_env,
 create_host_config
)
from docker.utils.ports import build_port_bindings, split_port
from docker.auth import resolve_authconfig


Expand DownExpand Up@@ -165,6 +166,102 @@ def test_resolve_authconfig(self):
 resolve_authconfig(auth_config, 'does.not.exist') is None
 )

 def test_split_port_with_host_ip(self):
 internal_port, external_port = split_port("127.0.0.1:1000:2000")
 self.assertEqual(internal_port, ["2000"])
 self.assertEqual(external_port, [("127.0.0.1", "1000")])

 def test_split_port_with_protocol(self):
 internal_port, external_port = split_port("127.0.0.1:1000:2000/udp")
 self.assertEqual(internal_port, ["2000/udp"])
 self.assertEqual(external_port, [("127.0.0.1", "1000")])

 def test_split_port_with_host_ip_no_port(self):
 internal_port, external_port = split_port("127.0.0.1::2000")
 self.assertEqual(internal_port, ["2000"])
 self.assertEqual(external_port, [("127.0.0.1", None)])

 def test_split_port_range_with_host_ip_no_port(self):
 internal_port, external_port = split_port("127.0.0.1::2000-2001")
 self.assertEqual(internal_port, ["2000", "2001"])
 self.assertEqual(external_port,
 [("127.0.0.1", None), ("127.0.0.1", None)])

 def test_split_port_with_host_port(self):
 internal_port, external_port = split_port("1000:2000")
 self.assertEqual(internal_port, ["2000"])
 self.assertEqual(external_port, ["1000"])

 def test_split_port_range_with_host_port(self):
 internal_port, external_port = split_port("1000-1001:2000-2001")
 self.assertEqual(internal_port, ["2000", "2001"])
 self.assertEqual(external_port, ["1000", "1001"])

 def test_split_port_no_host_port(self):
 internal_port, external_port = split_port("2000")
 self.assertEqual(internal_port, ["2000"])
 self.assertEqual(external_port, None)

 def test_split_port_range_no_host_port(self):
 internal_port, external_port = split_port("2000-2001")
 self.assertEqual(internal_port, ["2000", "2001"])
 self.assertEqual(external_port, None)

 def test_split_port_range_with_protocol(self):
 internal_port, external_port = split_port(
 "127.0.0.1:1000-1001:2000-2001/udp")
 self.assertEqual(internal_port, ["2000/udp", "2001/udp"])
 self.assertEqual(external_port,
 [("127.0.0.1", "1000"), ("127.0.0.1", "1001")])

 def test_split_port_invalid(self):
 self.assertRaises(ValueError,
 lambda: split_port("0.0.0.0:1000:2000:tcp"))

 def test_non_matching_length_port_ranges(self):
 self.assertRaises(
 ValueError,
 lambda: split_port("0.0.0.0:1000-1010:2000-2002/tcp")
 )

 def test_port_and_range_invalid(self):
 self.assertRaises(ValueError,
 lambda: split_port("0.0.0.0:1000:2000-2002/tcp"))

 def test_build_port_bindings_with_one_port(self):
 port_bindings = build_port_bindings(["127.0.0.1:1000:1000"])
 self.assertEqual(port_bindings["1000"], [("127.0.0.1", "1000")])

 def test_build_port_bindings_with_matching_internal_ports(self):
 port_bindings = build_port_bindings(
 ["127.0.0.1:1000:1000", "127.0.0.1:2000:1000"])
 self.assertEqual(port_bindings["1000"],
 [("127.0.0.1", "1000"), ("127.0.0.1", "2000")])

 def test_build_port_bindings_with_nonmatching_internal_ports(self):
 port_bindings = build_port_bindings(
 ["127.0.0.1:1000:1000", "127.0.0.1:2000:2000"])
 self.assertEqual(port_bindings["1000"], [("127.0.0.1", "1000")])
 self.assertEqual(port_bindings["2000"], [("127.0.0.1", "2000")])

 def test_build_port_bindings_with_port_range(self):
 port_bindings = build_port_bindings(["127.0.0.1:1000-1001:1000-1001"])
 self.assertEqual(port_bindings["1000"], [("127.0.0.1", "1000")])
 self.assertEqual(port_bindings["1001"], [("127.0.0.1", "1001")])

 def test_build_port_bindings_with_matching_internal_port_ranges(self):
 port_bindings = build_port_bindings(
 ["127.0.0.1:1000-1001:1000-1001", "127.0.0.1:2000-2001:1000-1001"])
 self.assertEqual(port_bindings["1000"],
 [("127.0.0.1", "1000"), ("127.0.0.1", "2000")])
 self.assertEqual(port_bindings["1001"],
 [("127.0.0.1", "1001"), ("127.0.0.1", "2001")])

 def test_build_port_bindings_with_nonmatching_internal_port_ranges(self):
 port_bindings = build_port_bindings(
 ["127.0.0.1:1000:1000", "127.0.0.1:2000:2000"])
 self.assertEqual(port_bindings["1000"], [("127.0.0.1", "1000")])
 self.assertEqual(port_bindings["2000"], [("127.0.0.1", "2000")])

if __name__ == '__main__':
 unittest.main()

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
parse port ranges by yuval-k · Pull Request #544 · docker/docker-py · GitHub
Skip to content
parse port ranges#544

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

shin-
merged 5 commits into

from

Apr 22, 2015
 Merged


parse port ranges
#544
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
278e801

Adding port utils to split port ranges


yuval-k Apr 3, 2015
8028c98

added ports to setup.py


yuval-k Apr 8, 2015
b33052b

python 2.6 compatible


yuval-k Apr 11, 2015
605fc7e

line length


yuval-k Apr 11, 2015
baadad0

removed unneeded imports


yuval-k Apr 17, 2015

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


4 changes: 4 additions & 0 deletions
docker/utils/ports/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
from .ports import (
 split_port,
 build_port_bindings
@aanandaanandApr 17, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think to_port_range and add_port_mapping should be imported here - they're only used within ports.py, and I can't see them being useful outside it
) # flake8: noqa

84 changes: 84 additions & 0 deletions
docker/utils/ports/ports.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@


def add_port_mapping(port_bindings, internal_port, external):
 if internal_port in port_bindings:
 port_bindings[internal_port].append(external)
 else:
 port_bindings[internal_port] = [external]


def add_port(port_bindings, internal_port_range, external_range):
 if external_range is None:
 for internal_port in internal_port_range:
 add_port_mapping(port_bindings, internal_port, None)
 else:
 ports = zip(internal_port_range, external_range)
 for internal_port, external_port in ports:
 add_port_mapping(port_bindings, internal_port, external_port)


def build_port_bindings(ports):
 port_bindings = {}
 for port in ports:
 internal_port_range, external_range = split_port(port)
 add_port(port_bindings, internal_port_range, external_range)
 return port_bindings


def to_port_range(port):
 if not port:
 return None

 protocol = ""
 if "/" in port:
 parts = port.split("/")
 if len(parts) != 2:
 raise ValueError('Invalid port "%s", should be '
 '[[remote_ip:]remote_port[-remote_port]:]'
 'port[/protocol]' % port)
 port, protocol = parts
 protocol = "/" + protocol

 parts = str(port).split('-')

 if len(parts) == 1:
 return ["%s%s" % (port, protocol)]

 if len(parts) == 2:
 full_port_range = range(int(parts[0]), int(parts[1]) + 1)
 return ["%s%s" % (p, protocol) for p in full_port_range]

 raise ValueError('Invalid port range "%s", should be '
 'port or startport-endport' % port)


def split_port(port):
 parts = str(port).split(':')
 if not 1 <= len(parts) <= 3:
 raise ValueError('Invalid port "%s", should be '
 '[[remote_ip:]remote_port:]port[/protocol]' % port)

 if len(parts) == 1:
 internal_port, = parts
 return to_port_range(internal_port), None
 if len(parts) == 2:
 external_port, internal_port = parts

 internal_range = to_port_range(internal_port)
 external_range = to_port_range(external_port)
 if len(internal_range) != len(external_range):
 raise ValueError('Port ranges don\'t match in length')

 return internal_range, external_range

 external_ip, external_port, internal_port = parts
 internal_range = to_port_range(internal_port)
 external_range = to_port_range(external_port)
 if not external_range:
 external_range = [None] * len(internal_range)

 if len(internal_range) != len(external_range):
 raise ValueError('Port ranges don\'t match in length')

 return internal_range, [(external_ip, ex_port or None)
 for ex_port in external_range]

2 changes: 1 addition & 1 deletion
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@
 name="docker-py",
 version=version,
 description="Python client for Docker.",
 packages=['docker', 'docker.auth', 'docker.unixconn', 'docker.utils',
 packages=['docker', 'docker.auth', 'docker.unixconn', 'docker.utils', 'docker.utils.ports',
 'docker.ssladapter'],
 install_requires=requirements,
 tests_require=test_requirements,
Expand Down

97 changes: 97 additions & 0 deletions
tests/utils_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
 parse_repository_tag, parse_host, convert_filters, kwargs_from_env,
 create_host_config
)
from docker.utils.ports import build_port_bindings, split_port
from docker.auth import resolve_authconfig


Expand DownExpand Up@@ -165,6 +166,102 @@ def test_resolve_authconfig(self):
 resolve_authconfig(auth_config, 'does.not.exist') is None
 )

 def test_split_port_with_host_ip(self):
 internal_port, external_port = split_port("127.0.0.1:1000:2000")
 self.assertEqual(internal_port, ["2000"])
 self.assertEqual(external_port, [("127.0.0.1", "1000")])

 def test_split_port_with_protocol(self):
 internal_port, external_port = split_port("127.0.0.1:1000:2000/udp")
 self.assertEqual(internal_port, ["2000/udp"])
 self.assertEqual(external_port, [("127.0.0.1", "1000")])

 def test_split_port_with_host_ip_no_port(self):
 internal_port, external_port = split_port("127.0.0.1::2000")
 self.assertEqual(internal_port, ["2000"])
 self.assertEqual(external_port, [("127.0.0.1", None)])

 def test_split_port_range_with_host_ip_no_port(self):
 internal_port, external_port = split_port("127.0.0.1::2000-2001")
 self.assertEqual(internal_port, ["2000", "2001"])
 self.assertEqual(external_port,
 [("127.0.0.1", None), ("127.0.0.1", None)])

 def test_split_port_with_host_port(self):
 internal_port, external_port = split_port("1000:2000")
 self.assertEqual(internal_port, ["2000"])
 self.assertEqual(external_port, ["1000"])

 def test_split_port_range_with_host_port(self):
 internal_port, external_port = split_port("1000-1001:2000-2001")
 self.assertEqual(internal_port, ["2000", "2001"])
 self.assertEqual(external_port, ["1000", "1001"])

 def test_split_port_no_host_port(self):
 internal_port, external_port = split_port("2000")
 self.assertEqual(internal_port, ["2000"])
 self.assertEqual(external_port, None)

 def test_split_port_range_no_host_port(self):
 internal_port, external_port = split_port("2000-2001")
 self.assertEqual(internal_port, ["2000", "2001"])
 self.assertEqual(external_port, None)

 def test_split_port_range_with_protocol(self):
 internal_port, external_port = split_port(
 "127.0.0.1:1000-1001:2000-2001/udp")
 self.assertEqual(internal_port, ["2000/udp", "2001/udp"])
 self.assertEqual(external_port,
 [("127.0.0.1", "1000"), ("127.0.0.1", "1001")])

 def test_split_port_invalid(self):
 self.assertRaises(ValueError,
 lambda: split_port("0.0.0.0:1000:2000:tcp"))

 def test_non_matching_length_port_ranges(self):
 self.assertRaises(
 ValueError,
 lambda: split_port("0.0.0.0:1000-1010:2000-2002/tcp")
 )

 def test_port_and_range_invalid(self):
 self.assertRaises(ValueError,
 lambda: split_port("0.0.0.0:1000:2000-2002/tcp"))

 def test_build_port_bindings_with_one_port(self):
 port_bindings = build_port_bindings(["127.0.0.1:1000:1000"])
 self.assertEqual(port_bindings["1000"], [("127.0.0.1", "1000")])

 def test_build_port_bindings_with_matching_internal_ports(self):
 port_bindings = build_port_bindings(
 ["127.0.0.1:1000:1000", "127.0.0.1:2000:1000"])
 self.assertEqual(port_bindings["1000"],
 [("127.0.0.1", "1000"), ("127.0.0.1", "2000")])

 def test_build_port_bindings_with_nonmatching_internal_ports(self):
 port_bindings = build_port_bindings(
 ["127.0.0.1:1000:1000", "127.0.0.1:2000:2000"])
 self.assertEqual(port_bindings["1000"], [("127.0.0.1", "1000")])
 self.assertEqual(port_bindings["2000"], [("127.0.0.1", "2000")])

 def test_build_port_bindings_with_port_range(self):
 port_bindings = build_port_bindings(["127.0.0.1:1000-1001:1000-1001"])
 self.assertEqual(port_bindings["1000"], [("127.0.0.1", "1000")])
 self.assertEqual(port_bindings["1001"], [("127.0.0.1", "1001")])

 def test_build_port_bindings_with_matching_internal_port_ranges(self):
 port_bindings = build_port_bindings(
 ["127.0.0.1:1000-1001:1000-1001", "127.0.0.1:2000-2001:1000-1001"])
 self.assertEqual(port_bindings["1000"],
 [("127.0.0.1", "1000"), ("127.0.0.1", "2000")])
 self.assertEqual(port_bindings["1001"],
 [("127.0.0.1", "1001"), ("127.0.0.1", "2001")])

 def test_build_port_bindings_with_nonmatching_internal_port_ranges(self):
 port_bindings = build_port_bindings(
 ["127.0.0.1:1000:1000", "127.0.0.1:2000:2000"])
 self.assertEqual(port_bindings["1000"], [("127.0.0.1", "1000")])
 self.assertEqual(port_bindings["2000"], [("127.0.0.1", "2000")])

if __name__ == '__main__':
 unittest.main()

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
parse port ranges by yuval-k · Pull Request #544 · docker/docker-py · GitHub
Skip to content
parse port ranges#544

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

shin-
merged 5 commits into

from

Apr 22, 2015
 Merged


parse port ranges
#544
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
278e801

Adding port utils to split port ranges


yuval-k Apr 3, 2015
8028c98

added ports to setup.py


yuval-k Apr 8, 2015
b33052b

python 2.6 compatible


yuval-k Apr 11, 2015
605fc7e

line length


yuval-k Apr 11, 2015
baadad0

removed unneeded imports


yuval-k Apr 17, 2015

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


4 changes: 4 additions & 0 deletions
docker/utils/ports/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
from .ports import (
 split_port,
 build_port_bindings
@aanandaanandApr 17, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think to_port_range and add_port_mapping should be imported here - they're only used within ports.py, and I can't see them being useful outside it
) # flake8: noqa

84 changes: 84 additions & 0 deletions
docker/utils/ports/ports.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@


def add_port_mapping(port_bindings, internal_port, external):
 if internal_port in port_bindings:
 port_bindings[internal_port].append(external)
 else:
 port_bindings[internal_port] = [external]


def add_port(port_bindings, internal_port_range, external_range):
 if external_range is None:
 for internal_port in internal_port_range:
 add_port_mapping(port_bindings, internal_port, None)
 else:
 ports = zip(internal_port_range, external_range)
 for internal_port, external_port in ports:
 add_port_mapping(port_bindings, internal_port, external_port)


def build_port_bindings(ports):
 port_bindings = {}
 for port in ports:
 internal_port_range, external_range = split_port(port)
 add_port(port_bindings, internal_port_range, external_range)
 return port_bindings


def to_port_range(port):
 if not port:
 return None

 protocol = ""
 if "/" in port:
 parts = port.split("/")
 if len(parts) != 2:
 raise ValueError('Invalid port "%s", should be '
 '[[remote_ip:]remote_port[-remote_port]:]'
 'port[/protocol]' % port)
 port, protocol = parts
 protocol = "/" + protocol

 parts = str(port).split('-')

 if len(parts) == 1:
 return ["%s%s" % (port, protocol)]

 if len(parts) == 2:
 full_port_range = range(int(parts[0]), int(parts[1]) + 1)
 return ["%s%s" % (p, protocol) for p in full_port_range]

 raise ValueError('Invalid port range "%s", should be '
 'port or startport-endport' % port)


def split_port(port):
 parts = str(port).split(':')
 if not 1 <= len(parts) <= 3:
 raise ValueError('Invalid port "%s", should be '
 '[[remote_ip:]remote_port:]port[/protocol]' % port)

 if len(parts) == 1:
 internal_port, = parts
 return to_port_range(internal_port), None
 if len(parts) == 2:
 external_port, internal_port = parts

 internal_range = to_port_range(internal_port)
 external_range = to_port_range(external_port)
 if len(internal_range) != len(external_range):
 raise ValueError('Port ranges don\'t match in length')

 return internal_range, external_range

 external_ip, external_port, internal_port = parts
 internal_range = to_port_range(internal_port)
 external_range = to_port_range(external_port)
 if not external_range:
 external_range = [None] * len(internal_range)

 if len(internal_range) != len(external_range):
 raise ValueError('Port ranges don\'t match in length')

 return internal_range, [(external_ip, ex_port or None)
 for ex_port in external_range]

2 changes: 1 addition & 1 deletion
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@
 name="docker-py",
 version=version,
 description="Python client for Docker.",
 packages=['docker', 'docker.auth', 'docker.unixconn', 'docker.utils',
 packages=['docker', 'docker.auth', 'docker.unixconn', 'docker.utils', 'docker.utils.ports',
 'docker.ssladapter'],
 install_requires=requirements,
 tests_require=test_requirements,
Expand Down

97 changes: 97 additions & 0 deletions
tests/utils_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
 parse_repository_tag, parse_host, convert_filters, kwargs_from_env,
 create_host_config
)
from docker.utils.ports import build_port_bindings, split_port
from docker.auth import resolve_authconfig


Expand DownExpand Up@@ -165,6 +166,102 @@ def test_resolve_authconfig(self):
 resolve_authconfig(auth_config, 'does.not.exist') is None
 )

 def test_split_port_with_host_ip(self):
 internal_port, external_port = split_port("127.0.0.1:1000:2000")
 self.assertEqual(internal_port, ["2000"])
 self.assertEqual(external_port, [("127.0.0.1", "1000")])

 def test_split_port_with_protocol(self):
 internal_port, external_port = split_port("127.0.0.1:1000:2000/udp")
 self.assertEqual(internal_port, ["2000/udp"])
 self.assertEqual(external_port, [("127.0.0.1", "1000")])

 def test_split_port_with_host_ip_no_port(self):
 internal_port, external_port = split_port("127.0.0.1::2000")
 self.assertEqual(internal_port, ["2000"])
 self.assertEqual(external_port, [("127.0.0.1", None)])

 def test_split_port_range_with_host_ip_no_port(self):
 internal_port, external_port = split_port("127.0.0.1::2000-2001")
 self.assertEqual(internal_port, ["2000", "2001"])
 self.assertEqual(external_port,
 [("127.0.0.1", None), ("127.0.0.1", None)])

 def test_split_port_with_host_port(self):
 internal_port, external_port = split_port("1000:2000")
 self.assertEqual(internal_port, ["2000"])
 self.assertEqual(external_port, ["1000"])

 def test_split_port_range_with_host_port(self):
 internal_port, external_port = split_port("1000-1001:2000-2001")
 self.assertEqual(internal_port, ["2000", "2001"])
 self.assertEqual(external_port, ["1000", "1001"])

 def test_split_port_no_host_port(self):
 internal_port, external_port = split_port("2000")
 self.assertEqual(internal_port, ["2000"])
 self.assertEqual(external_port, None)

 def test_split_port_range_no_host_port(self):
 internal_port, external_port = split_port("2000-2001")
 self.assertEqual(internal_port, ["2000", "2001"])
 self.assertEqual(external_port, None)

 def test_split_port_range_with_protocol(self):
 internal_port, external_port = split_port(
 "127.0.0.1:1000-1001:2000-2001/udp")
 self.assertEqual(internal_port, ["2000/udp", "2001/udp"])
 self.assertEqual(external_port,
 [("127.0.0.1", "1000"), ("127.0.0.1", "1001")])

 def test_split_port_invalid(self):
 self.assertRaises(ValueError,
 lambda: split_port("0.0.0.0:1000:2000:tcp"))

 def test_non_matching_length_port_ranges(self):
 self.assertRaises(
 ValueError,
 lambda: split_port("0.0.0.0:1000-1010:2000-2002/tcp")
 )

 def test_port_and_range_invalid(self):
 self.assertRaises(ValueError,
 lambda: split_port("0.0.0.0:1000:2000-2002/tcp"))

 def test_build_port_bindings_with_one_port(self):
 port_bindings = build_port_bindings(["127.0.0.1:1000:1000"])
 self.assertEqual(port_bindings["1000"], [("127.0.0.1", "1000")])

 def test_build_port_bindings_with_matching_internal_ports(self):
 port_bindings = build_port_bindings(
 ["127.0.0.1:1000:1000", "127.0.0.1:2000:1000"])
 self.assertEqual(port_bindings["1000"],
 [("127.0.0.1", "1000"), ("127.0.0.1", "2000")])

 def test_build_port_bindings_with_nonmatching_internal_ports(self):
 port_bindings = build_port_bindings(
 ["127.0.0.1:1000:1000", "127.0.0.1:2000:2000"])
 self.assertEqual(port_bindings["1000"], [("127.0.0.1", "1000")])
 self.assertEqual(port_bindings["2000"], [("127.0.0.1", "2000")])

 def test_build_port_bindings_with_port_range(self):
 port_bindings = build_port_bindings(["127.0.0.1:1000-1001:1000-1001"])
 self.assertEqual(port_bindings["1000"], [("127.0.0.1", "1000")])
 self.assertEqual(port_bindings["1001"], [("127.0.0.1", "1001")])

 def test_build_port_bindings_with_matching_internal_port_ranges(self):
 port_bindings = build_port_bindings(
 ["127.0.0.1:1000-1001:1000-1001", "127.0.0.1:2000-2001:1000-1001"])
 self.assertEqual(port_bindings["1000"],
 [("127.0.0.1", "1000"), ("127.0.0.1", "2000")])
 self.assertEqual(port_bindings["1001"],
 [("127.0.0.1", "1001"), ("127.0.0.1", "2001")])

 def test_build_port_bindings_with_nonmatching_internal_port_ranges(self):
 port_bindings = build_port_bindings(
 ["127.0.0.1:1000:1000", "127.0.0.1:2000:2000"])
 self.assertEqual(port_bindings["1000"], [("127.0.0.1", "1000")])
 self.assertEqual(port_bindings["2000"], [("127.0.0.1", "2000")])

if __name__ == '__main__':
 unittest.main()