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

GenericResources was introduced in 1.32 

Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
Joffrey F 2018-02-20 17:11:27 -08:00
parent f40079d85d
commit 8fd9d3c99e
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/api/service.py
View File

@ -74,9 +74,9 @@ def _check_api_features(version, task_template, update_config, endpoint_spec):
raise_version_error('ContainerSpec.isolation', '1.35')
if task_template.get('Resources'):
if utils.version_lt(version, '1.35'):
if utils.version_lt(version, '1.32'):
if task_template['Resources'].get('GenericResources'):
raise_version_error('Resources.generic_resources', '1.35')
raise_version_error('Resources.generic_resources', '1.32')
def _merge_task_template(current, override):

3
tests/integration/api_service_test.py
View File

@ -226,7 +226,7 @@ class ServiceTest(BaseAPIIntegrationTest):
svc_id = self.client.create_service(task_tmpl, name=name)
return resources, self.client.inspect_service(svc_id)
@requires_api_version('1.35')
@requires_api_version('1.32')
def test_create_service_with_generic_resources(self):
successful = [{
'input': [
@ -258,6 +258,7 @@ class ServiceTest(BaseAPIIntegrationTest):
expected = test.get('expected', test['input'])
assert sorted(actual, key=_key) == sorted(expected, key=_key)
@requires_api_version('1.32')
def test_create_service_with_invalid_generic_resources(self):
for test_input in ['1', 1.0, lambda: '1', {1, 2}]:
with pytest.raises(docker.errors.InvalidArgument):