Skip to content

test/integration: don't check for deprecated Networks field #3362

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
merged 1 commit into from
Oct 17, 2025
Merged

test/integration: don't check for deprecated Networks field #3362

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
56 changes: 35 additions & 21 deletions tests/integration/api_service_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,16 +367,18 @@ def test_create_service_with_custom_networks(self):
)
self.tmp_networks.append(net2['Id'])
container_spec = docker.types.ContainerSpec(TEST_IMG, ['true'])
task_tmpl = docker.types.TaskTemplate(container_spec)
name = self.get_service_name()
svc_id = self.client.create_service(
task_tmpl, name=name, networks=[
task_tmpl = docker.types.TaskTemplate(
container_spec, networks=[
'dockerpytest_1', {'Target': 'dockerpytest_2'}
]
)
name = self.get_service_name()
svc_id = self.client.create_service(
task_tmpl, name=name
)
svc_info = self.client.inspect_service(svc_id)
assert 'Networks' in svc_info['Spec']
assert svc_info['Spec']['Networks'] == [
assert 'Networks' in svc_info['Spec']['TaskTemplate']
assert svc_info['Spec']['TaskTemplate']['Networks'] == [
{'Target': net1['Id']}, {'Target': net2['Id']}
]

Expand Down Expand Up @@ -1116,16 +1118,18 @@ def test_update_service_with_defaults_networks(self):
)
self.tmp_networks.append(net2['Id'])
container_spec = docker.types.ContainerSpec(TEST_IMG, ['true'])
task_tmpl = docker.types.TaskTemplate(container_spec)
name = self.get_service_name()
svc_id = self.client.create_service(
task_tmpl, name=name, networks=[
task_tmpl = docker.types.TaskTemplate(
container_spec, networks=[
'dockerpytest_1', {'Target': 'dockerpytest_2'}
]
)
name = self.get_service_name()
svc_id = self.client.create_service(
task_tmpl, name=name
)
svc_info = self.client.inspect_service(svc_id)
assert 'Networks' in svc_info['Spec']
assert svc_info['Spec']['Networks'] == [
assert 'Networks' in svc_info['Spec']['TaskTemplate']
assert svc_info['Spec']['TaskTemplate']['Networks'] == [
{'Target': net1['Id']}, {'Target': net2['Id']}
]

Expand All @@ -1143,8 +1147,11 @@ def test_update_service_with_defaults_networks(self):
{'Target': net1['Id']}, {'Target': net2['Id']}
]

task_tmpl = docker.types.TaskTemplate(
container_spec, networks=[net1['Id']]
)
self._update_service(
svc_id, name, new_index, networks=[net1['Id']],
svc_id, name, new_index, task_tmpl,
fetch_current_spec=True
)
svc_info = self.client.inspect_service(svc_id)
Expand Down Expand Up @@ -1313,7 +1320,6 @@ def test_update_service_with_network_change(self):
container_spec = docker.types.ContainerSpec(
'busybox', ['echo', 'hello']
)
task_tmpl = docker.types.TaskTemplate(container_spec)
net1 = self.client.create_network(
self.get_service_name(), driver='overlay',
ipam={'Driver': 'default'}
Expand All @@ -1324,22 +1330,27 @@ def test_update_service_with_network_change(self):
ipam={'Driver': 'default'}
)
self.tmp_networks.append(net2['Id'])
task_tmpl = docker.types.TaskTemplate(
container_spec, networks=[net1['Id']]
)
name = self.get_service_name()
svc_id = self.client.create_service(
task_tmpl, name=name, networks=[net1['Id']]
task_tmpl, name=name
)
svc_info = self.client.inspect_service(svc_id)
assert 'Networks' in svc_info['Spec']
assert len(svc_info['Spec']['Networks']) > 0
assert svc_info['Spec']['Networks'][0]['Target'] == net1['Id']
assert 'Networks' in svc_info['Spec']['TaskTemplate']
assert len(svc_info['Spec']['TaskTemplate']['Networks']) > 0
assert svc_info['Spec']['TaskTemplate']['Networks'][0]['Target'] == net1['Id']

svc_info = self.client.inspect_service(svc_id)
version_index = svc_info['Version']['Index']

task_tmpl = docker.types.TaskTemplate(container_spec)
task_tmpl = docker.types.TaskTemplate(
container_spec, networks=[net2['Id']]
)
self._update_service(
svc_id, name, version_index, task_tmpl, name=name,
networks=[net2['Id']], fetch_current_spec=True
fetch_current_spec=True
)
svc_info = self.client.inspect_service(svc_id)
task_template = svc_info['Spec']['TaskTemplate']
Expand All @@ -1351,8 +1362,11 @@ def test_update_service_with_network_change(self):
new_index = svc_info['Version']['Index']
assert new_index > version_index

task_tmpl = docker.types.TaskTemplate(
container_spec, networks=[net1['Id']]
)
self._update_service(
svc_id, name, new_index, name=name, networks=[net1['Id']],
svc_id, name, new_index, task_tmpl, name=name,
fetch_current_spec=True
)
svc_info = self.client.inspect_service(svc_id)
Expand Down