T7382: fix unrelated formatting issues

1 files changed, 130 insertions, 18 deletions

diff --git a/smoketest/scripts/cli/test_container.py b/smoketest/scripts/cli/test_container.py
index a76748bae..daad3a909 100755
--- a/smoketest/scripts/cli/test_container.py
+++ b/smoketest/scripts/cli/test_container.py
@@ -33,11 +33,13 @@ PROCESS_PIDFILE = '/run/vyos-container-{0}.service.pid'
 busybox_image = 'busybox:stable'
 busybox_image_path = '/usr/share/vyos/busybox-stable.tar'
 
+
 def cmd_to_json(command):
     c = cmd(command + ' --format=json')
     data = json.loads(c)[0]
     return data
 
+
 class TestContainer(VyOSUnitTestSHIM.TestCase):
     @classmethod
     def setUpClass(cls):
@@ -73,13 +75,26 @@ class TestContainer(VyOSUnitTestSHIM.TestCase):
         cont_name = 'c1'
 
         self.cli_set(['interfaces', 'ethernet', 'eth0', 'address', '10.0.2.15/24'])
-        self.cli_set(['protocols', 'static', 'route', '0.0.0.0/0', 'next-hop', '10.0.2.2'])
+        self.cli_set(
+            ['protocols', 'static', 'route', '0.0.0.0/0', 'next-hop', '10.0.2.2']
+        )
         self.cli_set(['system', 'name-server', '1.1.1.1'])
         self.cli_set(['system', 'name-server', '8.8.8.8'])
 
         self.cli_set(base_path + ['name', cont_name, 'image', busybox_image])
         self.cli_set(base_path + ['name', cont_name, 'allow-host-networks'])
-        self.cli_set(base_path + ['name', cont_name, 'sysctl', 'parameter', 'kernel.msgmax', 'value', '4096'])
+        self.cli_set(
+            base_path
+            + [
+                'name',
+                cont_name,
+                'sysctl',
+                'parameter',
+                'kernel.msgmax',
+                'value',
+                '4096',
+            ]
+        )
 
         # commit changes
         self.cli_commit()
@@ -113,7 +128,17 @@ class TestContainer(VyOSUnitTestSHIM.TestCase):
 
         self.cli_set(base_path + ['name', cont_name, 'image', busybox_image])
         self.cli_set(base_path + ['name', cont_name, 'name-server', name_server])
-        self.cli_set(base_path + ['name', cont_name, 'network', net_name, 'address', str(ip_interface(prefix).ip + 2)])
+        self.cli_set(
+            base_path
+            + [
+                'name',
+                cont_name,
+                'network',
+                net_name,
+                'address',
+                str(ip_interface(prefix).ip + 2),
+            ]
+        )
 
         # verify() - name server has no effect when container network has dns enabled
         with self.assertRaises(ConfigSessionError):
@@ -154,7 +179,17 @@ class TestContainer(VyOSUnitTestSHIM.TestCase):
         for ii in range(1, 6):
             name = f'{base_name}-{ii}'
             self.cli_set(base_path + ['name', name, 'image', busybox_image])
-            self.cli_set(base_path + ['name', name, 'network', net_name, 'address', str(ip_interface(prefix).ip + ii)])
+            self.cli_set(
+                base_path
+                + [
+                    'name',
+                    name,
+                    'network',
+                    net_name,
+                    'address',
+                    str(ip_interface(prefix).ip + ii),
+                ]
+            )
 
         # verify() - first IP address of a prefix can not be used by a container
         with self.assertRaises(ConfigSessionError):
@@ -171,8 +206,14 @@ class TestContainer(VyOSUnitTestSHIM.TestCase):
         for ii in range(2, 6):
             name = f'{base_name}-{ii}'
             c = cmd_to_json(f'sudo podman container inspect {name}')
-            self.assertEqual(c['NetworkSettings']['Networks'][net_name]['Gateway']  , str(ip_interface(prefix).ip + 1))
-            self.assertEqual(c['NetworkSettings']['Networks'][net_name]['IPAddress'], str(ip_interface(prefix).ip + ii))
+            self.assertEqual(
+                c['NetworkSettings']['Networks'][net_name]['Gateway'],
+                str(ip_interface(prefix).ip + 1),
+            )
+            self.assertEqual(
+                c['NetworkSettings']['Networks'][net_name]['IPAddress'],
+                str(ip_interface(prefix).ip + ii),
+            )
 
     def test_ipv6_network(self):
         prefix = '2001:db8::/64'
@@ -184,7 +225,17 @@ class TestContainer(VyOSUnitTestSHIM.TestCase):
         for ii in range(1, 6):
             name = f'{base_name}-{ii}'
             self.cli_set(base_path + ['name', name, 'image', busybox_image])
-            self.cli_set(base_path + ['name', name, 'network', net_name, 'address', str(ip_interface(prefix).ip + ii)])
+            self.cli_set(
+                base_path
+                + [
+                    'name',
+                    name,
+                    'network',
+                    net_name,
+                    'address',
+                    str(ip_interface(prefix).ip + ii),
+                ]
+            )
 
         # verify() - first IP address of a prefix can not be used by a container
         with self.assertRaises(ConfigSessionError):
@@ -201,8 +252,14 @@ class TestContainer(VyOSUnitTestSHIM.TestCase):
         for ii in range(2, 6):
             name = f'{base_name}-{ii}'
             c = cmd_to_json(f'sudo podman container inspect {name}')
-            self.assertEqual(c['NetworkSettings']['Networks'][net_name]['IPv6Gateway']      , str(ip_interface(prefix).ip + 1))
-            self.assertEqual(c['NetworkSettings']['Networks'][net_name]['GlobalIPv6Address'], str(ip_interface(prefix).ip + ii))
+            self.assertEqual(
+                c['NetworkSettings']['Networks'][net_name]['IPv6Gateway'],
+                str(ip_interface(prefix).ip + 1),
+            )
+            self.assertEqual(
+                c['NetworkSettings']['Networks'][net_name]['GlobalIPv6Address'],
+                str(ip_interface(prefix).ip + ii),
+            )
 
     def test_dual_stack_network(self):
         prefix4 = '192.0.2.0/24'
@@ -216,8 +273,28 @@ class TestContainer(VyOSUnitTestSHIM.TestCase):
         for ii in range(1, 6):
             name = f'{base_name}-{ii}'
             self.cli_set(base_path + ['name', name, 'image', busybox_image])
-            self.cli_set(base_path + ['name', name, 'network', net_name, 'address', str(ip_interface(prefix4).ip + ii)])
-            self.cli_set(base_path + ['name', name, 'network', net_name, 'address', str(ip_interface(prefix6).ip + ii)])
+            self.cli_set(
+                base_path
+                + [
+                    'name',
+                    name,
+                    'network',
+                    net_name,
+                    'address',
+                    str(ip_interface(prefix4).ip + ii),
+                ]
+            )
+            self.cli_set(
+                base_path
+                + [
+                    'name',
+                    name,
+                    'network',
+                    net_name,
+                    'address',
+                    str(ip_interface(prefix6).ip + ii),
+                ]
+            )
 
         # verify() - first IP address of a prefix can not be used by a container
         with self.assertRaises(ConfigSessionError):
@@ -235,10 +312,22 @@ class TestContainer(VyOSUnitTestSHIM.TestCase):
         for ii in range(2, 6):
             name = f'{base_name}-{ii}'
             c = cmd_to_json(f'sudo podman container inspect {name}')
-            self.assertEqual(c['NetworkSettings']['Networks'][net_name]['IPv6Gateway']      , str(ip_interface(prefix6).ip + 1))
-            self.assertEqual(c['NetworkSettings']['Networks'][net_name]['GlobalIPv6Address'], str(ip_interface(prefix6).ip + ii))
-            self.assertEqual(c['NetworkSettings']['Networks'][net_name]['Gateway']          , str(ip_interface(prefix4).ip + 1))
-            self.assertEqual(c['NetworkSettings']['Networks'][net_name]['IPAddress']        , str(ip_interface(prefix4).ip + ii))
+            self.assertEqual(
+                c['NetworkSettings']['Networks'][net_name]['IPv6Gateway'],
+                str(ip_interface(prefix6).ip + 1),
+            )
+            self.assertEqual(
+                c['NetworkSettings']['Networks'][net_name]['GlobalIPv6Address'],
+                str(ip_interface(prefix6).ip + ii),
+            )
+            self.assertEqual(
+                c['NetworkSettings']['Networks'][net_name]['Gateway'],
+                str(ip_interface(prefix4).ip + 1),
+            )
+            self.assertEqual(
+                c['NetworkSettings']['Networks'][net_name]['IPAddress'],
+                str(ip_interface(prefix4).ip + ii),
+            )
 
     def test_no_name_server(self):
         prefix = '192.0.2.0/24'
@@ -250,7 +339,17 @@ class TestContainer(VyOSUnitTestSHIM.TestCase):
 
         name = f'{base_name}-2'
         self.cli_set(base_path + ['name', name, 'image', busybox_image])
-        self.cli_set(base_path + ['name', name, 'network', net_name, 'address', str(ip_interface(prefix).ip + 2)])
+        self.cli_set(
+            base_path
+            + [
+                'name',
+                name,
+                'network',
+                net_name,
+                'address',
+                str(ip_interface(prefix).ip + 2),
+            ]
+        )
         self.cli_commit()
 
         n = cmd_to_json(f'sudo podman network inspect {net_name}')
@@ -266,7 +365,17 @@ class TestContainer(VyOSUnitTestSHIM.TestCase):
 
         name = f'{base_name}-2'
         self.cli_set(base_path + ['name', name, 'image', busybox_image])
-        self.cli_set(base_path + ['name', name, 'network', net_name, 'address', str(ip_interface(prefix).ip + 2)])
+        self.cli_set(
+            base_path
+            + [
+                'name',
+                name,
+                'network',
+                net_name,
+                'address',
+                str(ip_interface(prefix).ip + 2),
+            ]
+        )
         self.cli_commit()
 
         n = cmd_to_json(f'sudo podman network inspect {net_name}')
@@ -306,11 +415,14 @@ class TestContainer(VyOSUnitTestSHIM.TestCase):
         self.cli_commit()
 
         # Query API about running containers
-        tmp = cmd("sudo curl --unix-socket /run/podman/podman.sock -H 'content-type: application/json' -sf http://localhost/containers/json")
+        tmp = cmd(
+            "sudo curl --unix-socket /run/podman/podman.sock -H 'content-type: application/json' -sf http://localhost/containers/json"
+        )
         tmp = json.loads(tmp)
 
         # We expect the same amount of containers from the API that we started above
         self.assertEqual(len(container_list), len(tmp))
 
+
 if __name__ == '__main__':
     unittest.main(verbosity=2)