WIP

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Author: thaJeztah

tests/integration/api_service_test.py

@@ -1122,13 +1122,15 @@ 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']['TaskTemplate']
         assert svc_info['Spec']['TaskTemplate']['Networks'] == [
@@ -1149,8 +1151,14 @@ def test_update_service_with_defaults_networks(self):
             {'Target': net1['Id']}, {'Target': net2['Id']}
         ]
 
+        # task_tmpl = docker.types.TaskTemplate(
+        #     container_spec, networks=[net1['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)
@@ -1319,7 +1327,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'}
@@ -1330,9 +1337,12 @@ 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']['TaskTemplate']
@@ -1342,10 +1352,12 @@ def test_update_service_with_network_change(self):
         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']
@@ -1357,8 +1369,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)