diff options
| author | Joffrey F <joffrey@docker.com> | 2018-02-20 17:11:27 -0800 |
|---|---|---|
| committer | Joffrey F <joffrey@docker.com> | 2018-02-20 17:11:27 -0800 |
| commit | 8fd9d3c99e9314323228af4832054b22d2ac4966 (patch) | |
| tree | 527dbccf9105de8721c4a93d5f8d8ad9b336c37d | |
| parent | f40079d85dd05d150ab7e0670a60744e352e89ae (diff) | |
| download | docker-py-8fd9d3c99e9314323228af4832054b22d2ac4966.tar.gz | |
GenericResources was introduced in 1.32
Signed-off-by: Joffrey F <joffrey@docker.com>
| -rw-r--r-- | docker/api/service.py | 4 | ||||
| -rw-r--r-- | tests/integration/api_service_test.py | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/docker/api/service.py b/docker/api/service.py index 95fb07e..03b0ca6 100644 --- a/docker/api/service.py +++ b/docker/api/service.py @@ -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): diff --git a/tests/integration/api_service_test.py b/tests/integration/api_service_test.py index 9d91f9e..85f9dcc 100644 --- a/tests/integration/api_service_test.py +++ b/tests/integration/api_service_test.py @@ -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): |