octavia 14.0.0__py3-none-any.whl → 15.0.0.0rc1__py3-none-any.whl

octavia/tests/unit/amphorae/backends/agent/api_server/test_loadbalancer.py

@@ -56,6 +56,8 @@ class ListenerTestCase(base.TestCase):
             consts.OFFLINE,
             self.test_loadbalancer._check_haproxy_status(LISTENER_ID1))
 
+    @mock.patch('time.sleep')
+    @mock.patch('octavia.amphorae.backends.agent.api_server.loadbalancer.LOG')
     @mock.patch('octavia.amphorae.backends.agent.api_server.loadbalancer.'
                 'Loadbalancer._check_haproxy_status')
     @mock.patch('octavia.amphorae.backends.agent.api_server.util.'
@@ -67,7 +69,7 @@ class ListenerTestCase(base.TestCase):
     @mock.patch('octavia.amphorae.backends.utils.haproxy_query.HAProxyQuery')
     def test_start_stop_lb(self, mock_haproxy_query, mock_check_output,
                            mock_lb_exists, mock_path_exists, mock_vrrp_update,
-                           mock_check_status):
+                           mock_check_status, mock_LOG, mock_time_sleep):
         listener_id = uuidutils.generate_uuid()
 
         conf = self.useFixture(oslo_fixture.Config(cfg.CONF))
@@ -76,21 +78,21 @@ class ListenerTestCase(base.TestCase):
         mock_check_status.side_effect = ['bogus', consts.OFFLINE]
 
         # Happy path - No VRRP
-        ref_command_split = ['/usr/sbin/service']
-        ref_command_split.append('haproxy-{}'.format(listener_id))
-        ref_command_split.append(consts.AMP_ACTION_START)
+        cmd = "systemctl {action} haproxy-{listener_id}.service".format(
+            action=consts.AMP_ACTION_START, listener_id=listener_id)
 
         result = self.test_loadbalancer.start_stop_lb(
             listener_id, consts.AMP_ACTION_START)
 
-        mock_check_output.assert_called_once_with(ref_command_split,
-                                                  stderr=subprocess.STDOUT)
+        mock_check_output.assert_called_once_with(cmd.split(),
+                                                  stderr=subprocess.STDOUT,
+                                                  encoding='utf-8')
         mock_lb_exists.assert_called_once_with(listener_id)
         mock_vrrp_update.assert_not_called()
         self.assertEqual(202, result.status_code)
         self.assertEqual('OK', result.json['message'])
         ref_details = ('Configuration file is valid\n'
-                       'haproxy daemon for {0} started'.format(listener_id))
+                       'haproxy daemon for {} started'.format(listener_id))
         self.assertEqual(ref_details, result.json['details'])
 
         # Happy path - VRRP - RELOAD
@@ -101,22 +103,21 @@ class ListenerTestCase(base.TestCase):
         mock_vrrp_update.reset_mock()
         mock_check_output.reset_mock()
 
-        ref_command_split = ['/usr/sbin/service']
-        ref_command_split.append('haproxy-{}'.format(listener_id))
-        ref_command_split.append(consts.AMP_ACTION_RELOAD)
+        cmd = "systemctl {action} haproxy-{listener_id}.service".format(
+            action=consts.AMP_ACTION_RELOAD, listener_id=listener_id)
 
         result = self.test_loadbalancer.start_stop_lb(
             listener_id, consts.AMP_ACTION_RELOAD)
 
-        mock_check_output.assert_called_once_with(ref_command_split,
-                                                  stderr=subprocess.STDOUT)
+        mock_check_output.assert_called_once_with(cmd.split(),
+                                                  stderr=subprocess.STDOUT,
+                                                  encoding='utf-8')
         mock_lb_exists.assert_called_once_with(listener_id)
         mock_vrrp_update.assert_called_once_with(listener_id,
                                                  consts.AMP_ACTION_RELOAD)
         self.assertEqual(202, result.status_code)
         self.assertEqual('OK', result.json['message'])
-        ref_details = ('Listener {0} {1}ed'.format(listener_id,
-                                                   consts.AMP_ACTION_RELOAD))
+        ref_details = f'Listener {listener_id} {consts.AMP_ACTION_RELOAD}ed'
         self.assertEqual(ref_details, result.json['details'])
 
         # Happy path - VRRP - RELOAD - OFFLINE
@@ -124,22 +125,22 @@ class ListenerTestCase(base.TestCase):
         mock_vrrp_update.reset_mock()
         mock_check_output.reset_mock()
 
-        ref_command_split = ['/usr/sbin/service']
-        ref_command_split.append('haproxy-{}'.format(listener_id))
-        ref_command_split.append(consts.AMP_ACTION_START)
+        cmd = "systemctl {action} haproxy-{listener_id}.service".format(
+            action=consts.AMP_ACTION_START, listener_id=listener_id)
 
         result = self.test_loadbalancer.start_stop_lb(
             listener_id, consts.AMP_ACTION_RELOAD)
 
-        mock_check_output.assert_called_once_with(ref_command_split,
-                                                  stderr=subprocess.STDOUT)
+        mock_check_output.assert_called_once_with(cmd.split(),
+                                                  stderr=subprocess.STDOUT,
+                                                  encoding='utf-8')
         mock_lb_exists.assert_called_once_with(listener_id)
         mock_vrrp_update.assert_called_once_with(listener_id,
                                                  consts.AMP_ACTION_RELOAD)
         self.assertEqual(202, result.status_code)
         self.assertEqual('OK', result.json['message'])
         ref_details = ('Configuration file is valid\n'
-                       'haproxy daemon for {0} started'.format(listener_id))
+                       'haproxy daemon for {} started'.format(listener_id))
         self.assertEqual(ref_details, result.json['details'])
 
         # Unhappy path - Not already running
@@ -150,22 +151,22 @@ class ListenerTestCase(base.TestCase):
         mock_vrrp_update.reset_mock()
         mock_check_output.reset_mock()
 
-        ref_command_split = ['/usr/sbin/service']
-        ref_command_split.append('haproxy-{}'.format(listener_id))
-        ref_command_split.append(consts.AMP_ACTION_START)
+        cmd = "systemctl {action} haproxy-{listener_id}.service".format(
+            action=consts.AMP_ACTION_START, listener_id=listener_id)
 
         mock_check_output.side_effect = subprocess.CalledProcessError(
-            output=b'bogus', returncode=-2, cmd='sit')
+            output='bogus', returncode=-2, cmd='sit')
 
         result = self.test_loadbalancer.start_stop_lb(
             listener_id, consts.AMP_ACTION_START)
 
-        mock_check_output.assert_called_once_with(ref_command_split,
-                                                  stderr=subprocess.STDOUT)
+        mock_check_output.assert_called_once_with(cmd.split(),
+                                                  stderr=subprocess.STDOUT,
+                                                  encoding='utf-8')
         mock_lb_exists.assert_called_once_with(listener_id)
         mock_vrrp_update.assert_not_called()
         self.assertEqual(500, result.status_code)
-        self.assertEqual('Error {}ing haproxy'.format(consts.AMP_ACTION_START),
+        self.assertEqual(f'Error {consts.AMP_ACTION_START}ing haproxy',
                          result.json['message'])
         self.assertEqual('bogus', result.json['details'])
 
@@ -174,24 +175,24 @@ class ListenerTestCase(base.TestCase):
         mock_vrrp_update.reset_mock()
         mock_check_output.reset_mock()
 
-        ref_command_split = ['/usr/sbin/service']
-        ref_command_split.append('haproxy-{}'.format(listener_id))
-        ref_command_split.append(consts.AMP_ACTION_START)
+        cmd = "systemctl {action} haproxy-{listener_id}.service".format(
+            action=consts.AMP_ACTION_START, listener_id=listener_id)
 
         mock_check_output.side_effect = subprocess.CalledProcessError(
-            output=b'Job is already running', returncode=-2, cmd='sit')
+            output='Job is already running', returncode=-2, cmd='sit')
 
         result = self.test_loadbalancer.start_stop_lb(
             listener_id, consts.AMP_ACTION_START)
 
-        mock_check_output.assert_called_once_with(ref_command_split,
-                                                  stderr=subprocess.STDOUT)
+        mock_check_output.assert_called_once_with(cmd.split(),
+                                                  stderr=subprocess.STDOUT,
+                                                  encoding='utf-8')
         mock_lb_exists.assert_called_once_with(listener_id)
         mock_vrrp_update.assert_not_called()
         self.assertEqual(202, result.status_code)
         self.assertEqual('OK', result.json['message'])
         ref_details = ('Configuration file is valid\n'
-                       'haproxy daemon for {0} started'.format(listener_id))
+                       'haproxy daemon for {} started'.format(listener_id))
         self.assertEqual(ref_details, result.json['details'])
 
         # Invalid action
@@ -208,6 +209,65 @@ class ListenerTestCase(base.TestCase):
         mock_vrrp_update.assert_not_called()
         mock_check_output.assert_not_called()
 
+        # haproxy error on reload
+        mock_check_output.reset_mock()
+        mock_lb_exists.reset_mock()
+        mock_path_exists.reset_mock()
+        mock_vrrp_update.reset_mock()
+        mock_check_status.reset_mock()
+        mock_LOG.reset_mock()
+
+        mock_check_output.side_effect = [
+            subprocess.CalledProcessError(
+                output='haproxy.service is not active, cannot reload.',
+                returncode=-2, cmd='service'),
+            None]
+        mock_check_status.return_value = 'ACTIVE'
+        mock_check_status.side_effect = None
+
+        mock_query = mock.Mock()
+        mock_haproxy_query.return_value = mock_query
+        mock_query.show_info.side_effect = [Exception("error"),
+                                            {'Uptime_sec': 5}]
+
+        result = self.test_loadbalancer.start_stop_lb(listener_id, 'reload')
+        self.assertEqual(202, result.status_code)
+
+        LOG_last_call = mock_LOG.mock_calls[-1]
+        self.assertIn('An error occured with haproxy', LOG_last_call[1][0])
+
+        # haproxy error on reload - retry limit
+        print("--")
+        mock_check_output.reset_mock()
+        mock_lb_exists.reset_mock()
+        mock_path_exists.reset_mock()
+        mock_vrrp_update.reset_mock()
+        mock_check_status.reset_mock()
+        mock_LOG.reset_mock()
+
+        mock_check_output.side_effect = [
+            subprocess.CalledProcessError(
+                output='haproxy.service is not active, cannot reload.',
+                returncode=-2, cmd='service'),
+            subprocess.CalledProcessError(
+                output='haproxy.service is not active, cannot reload.',
+                returncode=-2, cmd='service'),
+            subprocess.CalledProcessError(
+                output='haproxy.service is not active, cannot reload.',
+                returncode=-2, cmd='service')]
+        mock_check_status.return_value = 'ACTIVE'
+        mock_check_status.side_effect = None
+
+        mock_query = mock.Mock()
+        mock_haproxy_query.return_value = mock_query
+        mock_query.show_info.side_effect = Exception("error")
+
+        result = self.test_loadbalancer.start_stop_lb(listener_id, 'reload')
+        self.assertEqual(500, result.status_code)
+        self.assertEqual('Error reloading haproxy', result.json['message'])
+        self.assertEqual('haproxy.service is not active, cannot reload.',
+                         result.json['details'])
+
     @mock.patch('octavia.amphorae.backends.agent.api_server.util.'
                 'config_path')
     @mock.patch('octavia.amphorae.backends.agent.api_server.util.'

octavia/tests/unit/amphorae/backends/agent/api_server/test_osutils.py

@@ -67,10 +67,8 @@ class TestOSUtils(base.TestCase):
 
     def test_cmd_get_version_of_installed_package(self):
         package_name = 'foo'
-        ubuntu_cmd = "dpkg-query -W -f=${{Version}} {name}".format(
-            name=package_name)
-        rh_cmd = "rpm -q --queryformat %{{VERSION}} {name}".format(
-            name=package_name)
+        ubuntu_cmd = f"dpkg-query -W -f=${{Version}} {package_name}"
+        rh_cmd = f"rpm -q --queryformat %{{VERSION}} {package_name}"
 
         returned_ubuntu_cmd = (
             self.ubuntu_os_util.cmd_get_version_of_installed_package(
@@ -113,19 +111,19 @@ class TestOSUtils(base.TestCase):
     @mock.patch('octavia.amphorae.backends.utils.interface_file.'
                 'VIPInterfaceFile')
     def test_write_vip_interface_file(self, mock_vip_interface_file):
-        netns_interface = u'eth1234'
-        FIXED_IP = u'192.0.2.2'
-        SUBNET_CIDR = u'192.0.2.0/24'
-        GATEWAY = u'192.51.100.1'
-        DEST1 = u'198.51.100.0/24'
-        DEST2 = u'203.0.113.0/24'
-        NEXTHOP = u'192.0.2.1'
+        netns_interface = 'eth1234'
+        FIXED_IP = '192.0.2.2'
+        SUBNET_CIDR = '192.0.2.0/24'
+        GATEWAY = '192.51.100.1'
+        DEST1 = '198.51.100.0/24'
+        DEST2 = '203.0.113.0/24'
+        NEXTHOP = '192.0.2.1'
         MTU = 1450
-        FIXED_IP_IPV6 = u'2001:0db8:0000:0000:0000:0000:0000:000a'
+        FIXED_IP_IPV6 = '2001:0db8:0000:0000:0000:0000:0000:000a'
         # Subnet prefix is purposefully not 32, because that coincidentally
         # matches the result of any arbitrary IPv4->prefixlen conversion
-        SUBNET_CIDR_IPV6 = u'2001:db8::/70'
-        GATEWAY_IPV6 = u'2001:0db8:0000:0000:0000:0000:0000:0001'
+        SUBNET_CIDR_IPV6 = '2001:db8::/70'
+        GATEWAY_IPV6 = '2001:0db8:0000:0000:0000:0000:0000:0001'
 
         ip = ipaddress.ip_address(FIXED_IP)
         network = ipaddress.ip_network(SUBNET_CIDR)
@@ -200,15 +198,15 @@ class TestOSUtils(base.TestCase):
     @mock.patch('octavia.amphorae.backends.utils.interface_file.'
                 'PortInterfaceFile')
     def test_write_port_interface_file(self, mock_port_interface_file):
-        FIXED_IP = u'192.0.2.2'
-        NEXTHOP = u'192.0.2.1'
-        DEST = u'198.51.100.0/24'
+        FIXED_IP = '192.0.2.2'
+        NEXTHOP = '192.0.2.1'
+        DEST = '198.51.100.0/24'
         host_routes = [
             {'nexthop': NEXTHOP, 'destination': ipaddress.ip_network(DEST)}
         ]
-        FIXED_IP_IPV6 = u'2001:db8::2'
-        NEXTHOP_IPV6 = u'2001:db8::1'
-        DEST_IPV6 = u'2001:db8:51:100::/64'
+        FIXED_IP_IPV6 = '2001:db8::2'
+        NEXTHOP_IPV6 = '2001:db8::1'
+        DEST_IPV6 = '2001:db8:51:100::/64'
         host_routes_ipv6 = [
             {'nexthop': NEXTHOP_IPV6,
              'destination': ipaddress.ip_network(DEST_IPV6)}
@@ -229,5 +227,5 @@ class TestOSUtils(base.TestCase):
         mock_port_interface_file.assert_called_once_with(
             name=netns_interface,
             fixed_ips=fixed_ips,
-            mtu=MTU)
+            mtu=MTU, is_sriov=False)
         mock_port_interface_file.return_value.write.assert_called_once()

octavia/tests/unit/amphorae/backends/agent/api_server/test_plug.py

@@ -111,8 +111,7 @@ class TestPlug(base.TestCase):
             )
         mock_webob.Response.assert_any_call(json={
             'message': 'OK',
-            'details': 'VIPs plugged on interface {interface}: {vips}'.format(
-                vips=FAKE_IP_IPV4, interface='eth1')
+            'details': f'VIPs plugged on interface eth1: {FAKE_IP_IPV4}'
         }, status=202)
 
     @mock.patch('octavia.amphorae.backends.agent.api_server.plug.Plug.'
@@ -140,8 +139,8 @@ class TestPlug(base.TestCase):
             )
         mock_webob.Response.assert_any_call(json={
             'message': 'OK',
-            'details': 'VIPs plugged on interface {interface}: {vips}'.format(
-                vips=FAKE_IP_IPV6_EXPANDED, interface='eth1')
+            'details': f'VIPs plugged on interface eth1: '
+                       f'{FAKE_IP_IPV6_EXPANDED}'
         }, status=202)
 
     @mock.patch('octavia.amphorae.backends.agent.api_server.plug.Plug.'
@@ -285,7 +284,7 @@ class TestPlug(base.TestCase):
             self.test_plug.plug_network(FAKE_MAC_ADDRESS, fixed_ips, 1400)
 
         mock_write_port_interface.assert_called_once_with(
-            interface='eth2', fixed_ips=fixed_ips, mtu=mtu)
+            interface='eth2', fixed_ips=fixed_ips, mtu=mtu, is_sriov=False)
         mock_if_up.assert_called_once_with('eth2', 'network')
         mock_send_member_adv.assert_called_once_with(fixed_ips)
 
@@ -332,14 +331,14 @@ class TestPlug(base.TestCase):
             self.test_plug.plug_network(FAKE_MAC_ADDRESS, fixed_ips, 1400)
 
         mock_write_port_interface.assert_called_once_with(
-            interface=FAKE_INTERFACE, fixed_ips=fixed_ips, mtu=mtu)
+            interface=FAKE_INTERFACE, fixed_ips=fixed_ips, mtu=mtu,
+            is_sriov=False)
         mock_if_up.assert_called_once_with(FAKE_INTERFACE, 'network')
         mock_send_member_adv.assert_called_once_with(fixed_ips)
 
         mock_webob.Response.assert_any_call(
             json={'message': 'OK',
-                  'details': 'Updated existing interface {}'.format(
-                      FAKE_INTERFACE)},
+                  'details': f'Updated existing interface {FAKE_INTERFACE}'},
             status=202)
 
     @mock.patch.object(plug, "webob")
@@ -401,15 +400,14 @@ class TestPlug(base.TestCase):
                 'gateway': vip_net_info['gateway'],
                 'host_routes': [],
             },
-            fixed_ips=fixed_ips, mtu=mtu)
+            fixed_ips=fixed_ips, mtu=mtu, is_sriov=False)
 
         mock_if_up.assert_called_once_with(FAKE_INTERFACE, 'vip')
         mock_send_member_adv.assert_called_once_with(fixed_ips)
 
         mock_webob.Response.assert_any_call(
             json={'message': 'OK',
-                  'details': 'Updated existing interface {}'.format(
-                      FAKE_INTERFACE)},
+                  'details': f'Updated existing interface {FAKE_INTERFACE}'},
             status=202)
 
     @mock.patch('pyroute2.NetNS', create=True)

octavia/tests/unit/amphorae/backends/agent/api_server/test_util.py

@@ -51,31 +51,11 @@ class TestUtil(base.TestCase):
         self.assertEqual(fake_path, result)
 
     def test_keepalived_lvs_init_path(self):
-        # Test systemd
         ref_path = (consts.SYSTEMD_DIR + '/' +
-                    consts.KEEPALIVED_SYSTEMD_PREFIX % str(self.listener_id))
-        result = util.keepalived_lvs_init_path(consts.INIT_SYSTEMD,
-                                               self.listener_id)
+                    consts.KEEPALIVEDLVS_SYSTEMD % self.listener_id)
+        result = util.keepalived_lvs_init_path(self.listener_id)
         self.assertEqual(ref_path, result)
 
-        # Test upstart
-        ref_path = (consts.UPSTART_DIR + '/' +
-                    consts.KEEPALIVED_UPSTART_PREFIX % str(self.listener_id))
-        result = util.keepalived_lvs_init_path(consts.INIT_UPSTART,
-                                               self.listener_id)
-        self.assertEqual(ref_path, result)
-
-        # Test sysvinit
-        ref_path = (consts.SYSVINIT_DIR + '/' +
-                    consts.KEEPALIVED_SYSVINIT_PREFIX % str(self.listener_id))
-        result = util.keepalived_lvs_init_path(consts.INIT_SYSVINIT,
-                                               self.listener_id)
-        self.assertEqual(ref_path, result)
-
-        # Test bad init system
-        self.assertRaises(util.UnknownInitError, util.keepalived_lvs_init_path,
-                          'bogus_init', self.listener_id)
-
     def test_keepalived_lvs_pids_path(self):
         fake_path = '/fake/path'
         self.CONF.config(group="haproxy_amphora", base_path=fake_path)
@@ -162,11 +142,17 @@ class TestUtil(base.TestCase):
 
         util.run_systemctl_command('test', 'world')
         mock_check_output.assert_called_once_with(
-            ['systemctl', 'test', 'world'], stderr=subprocess.STDOUT)
+            ['systemctl', 'test', 'world'], stderr=subprocess.STDOUT,
+            encoding='utf-8')
 
         mock_check_output.side_effect = subprocess.CalledProcessError(1,
                                                                       'boom')
-        util.run_systemctl_command('test', 'world')
+        self.assertRaises(subprocess.CalledProcessError,
+                          util.run_systemctl_command, 'test', 'world')
+
+        mock_check_output.side_effect = subprocess.CalledProcessError(1,
+                                                                      'boom')
+        util.run_systemctl_command('test', 'world', False)
 
     @mock.patch('octavia.amphorae.backends.agent.api_server.util.config_path')
     @mock.patch('octavia.amphorae.backends.agent.api_server.util.'
@@ -275,7 +261,7 @@ class TestUtil(base.TestCase):
             pass
 
         # Bad listener mode
-        fake_cfg = 'stats socket foo\nfrontend {}\nmode\n'.format(LISTENER_ID1)
+        fake_cfg = f'stats socket foo\nfrontend {LISTENER_ID1}\nmode\n'
         self.useFixture(test_utils.OpenFixture(path, fake_cfg))
         self.assertRaises(util.ParsingError, util.parse_haproxy_file,
                           LISTENER_ID1)

octavia/tests/unit/amphorae/backends/agent/test_agent_jinja_cfg.py

@@ -39,14 +39,11 @@ class AgentJinjaTestCase(base.TestCase):
                          amphora_udp_driver='keepalived_lvs'),
         self.conf.config(group="haproxy_amphora",
                          base_cert_dir='/var/lib/octavia/certs')
-        self.conf.config(group="haproxy_amphora", use_upstart='True')
         self.conf.config(group="haproxy_amphora", base_path='/var/lib/octavia')
         self.conf.config(group="haproxy_amphora", bind_host='0.0.0.0')
         self.conf.config(group="haproxy_amphora", bind_port=9443)
         self.conf.config(group="haproxy_amphora",
                          haproxy_cmd='/usr/sbin/haproxy')
-        self.conf.config(group="haproxy_amphora", respawn_count=2)
-        self.conf.config(group="haproxy_amphora", respawn_interval=2)
         self.conf.config(group="health_manager",
                          controller_ip_port_list=['192.0.2.10:5555'])
         self.conf.config(group="health_manager", heartbeat_interval=10)
@@ -68,9 +65,6 @@ class AgentJinjaTestCase(base.TestCase):
                            'bind_host = 0.0.0.0\n'
                            'bind_port = 9443\n'
                            'haproxy_cmd = /usr/sbin/haproxy\n'
-                           'respawn_count = 2\n'
-                           'respawn_interval = 2\n'
-                           'use_upstart = True\n'
                            'user_log_facility = 0\n'
                            'administrative_log_facility = 1\n\n'
                            '[health_manager]\n'
@@ -96,7 +90,6 @@ class AgentJinjaTestCase(base.TestCase):
 
     def test_build_agent_config_with_interfaces_file(self):
         ajc = agent_jinja_cfg.AgentJinjaTemplater()
-        self.conf.config(group="haproxy_amphora", use_upstart='False')
         self.conf.config(group="amphora_agent",
                          administrative_log_facility=1)
         self.conf.config(group="amphora_agent", user_log_facility=0)
@@ -110,9 +103,6 @@ class AgentJinjaTestCase(base.TestCase):
                            'bind_host = 0.0.0.0\n'
                            'bind_port = 9443\n'
                            'haproxy_cmd = /usr/sbin/haproxy\n'
-                           'respawn_count = 2\n'
-                           'respawn_interval = 2\n'
-                           'use_upstart = False\n'
                            'user_log_facility = 0\n'
                            'administrative_log_facility = 1\n\n'
                            '[health_manager]\n'
@@ -154,9 +144,6 @@ class AgentJinjaTestCase(base.TestCase):
                            'bind_host = 0.0.0.0\n'
                            'bind_port = 9443\n'
                            'haproxy_cmd = /usr/sbin/haproxy\n'
-                           'respawn_count = 2\n'
-                           'respawn_interval = 2\n'
-                           'use_upstart = True\n'
                            'user_log_facility = 0\n'
                            'administrative_log_facility = 1\n\n'
                            '[health_manager]\n'

octavia/tests/unit/amphorae/backends/health_daemon/test_health_daemon.py

@@ -12,6 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 #
+import json
 import os
 import queue
 from unittest import mock
@@ -19,7 +20,6 @@ from unittest import mock
 from oslo_config import cfg
 from oslo_config import fixture as oslo_fixture
 from oslo_utils import uuidutils
-import simplejson
 
 from octavia.amphorae.backends.health_daemon import health_daemon
 from octavia.common import constants
@@ -337,7 +337,7 @@ class TestHealthDaemon(base.TestCase):
                                  mock_get_stats, mock_is_running):
         health_daemon.COUNTERS = None
         health_daemon.COUNTERS_FILE = None
-        lb1_stats_socket = '/var/lib/octavia/{0}/haproxy.sock'.format(LB_ID1)
+        lb1_stats_socket = f'/var/lib/octavia/{LB_ID1}/haproxy.sock'
         mock_list_files.return_value = {LB_ID1: lb1_stats_socket}
 
         mock_is_running.return_value = True
@@ -345,7 +345,7 @@ class TestHealthDaemon(base.TestCase):
 
         with mock.patch('os.open'), mock.patch.object(
                 os, 'fdopen', self.mock_open) as mock_fdopen:
-            mock_fdopen().read.return_value = simplejson.dumps({
+            mock_fdopen().read.return_value = json.dumps({
                 LISTENER_ID1: {'bin': 1, 'bout': 2},
             })
             msg = health_daemon.build_stats_message()
@@ -353,7 +353,7 @@ class TestHealthDaemon(base.TestCase):
         self.assertEqual(SAMPLE_STATS_MSG, msg)
 
         mock_get_stats.assert_any_call(lb1_stats_socket)
-        mock_fdopen().write.assert_called_once_with(simplejson.dumps({
+        mock_fdopen().write.assert_called_once_with(json.dumps({
             LISTENER_ID1: {
                 'bin': int(FRONTEND_STATS['bin']),
                 'bout': int(FRONTEND_STATS['bout']),
@@ -374,7 +374,7 @@ class TestHealthDaemon(base.TestCase):
                                              mock_is_running):
         health_daemon.COUNTERS = None
         health_daemon.COUNTERS_FILE = None
-        lb1_stats_socket = '/var/lib/octavia/{0}/haproxy.sock'.format(LB_ID1)
+        lb1_stats_socket = f'/var/lib/octavia/{LB_ID1}/haproxy.sock'
         mock_list_files.return_value = {LB_ID1: lb1_stats_socket}
 
         mock_is_running.return_value = False
@@ -450,14 +450,14 @@ class TestHealthDaemon(base.TestCase):
 
         with mock.patch('os.open'), mock.patch.object(
                 os, 'fdopen', self.mock_open) as mock_fdopen:
-            mock_fdopen().read.return_value = simplejson.dumps({
+            mock_fdopen().read.return_value = json.dumps({
                 udp_listener_id1: {
                     'bin': 1, 'bout': 2, "ereq": 0, "stot": 0}
             })
             msg = health_daemon.build_stats_message()
 
         self.assertEqual(expected, msg)
-        mock_fdopen().write.assert_called_once_with(simplejson.dumps({
+        mock_fdopen().write.assert_called_once_with(json.dumps({
             udp_listener_id1: {'bin': 5, 'bout': 10, 'ereq': 0, 'stot': 5},
             udp_listener_id3: {'bin': 0, 'bout': 0, 'ereq': 0, 'stot': 0},
         }))
@@ -472,7 +472,7 @@ class TestHealthDaemon(base.TestCase):
                              mock_get_stats, mock_is_running):
         health_daemon.COUNTERS = None
         health_daemon.COUNTERS_FILE = None
-        lb1_stats_socket = '/var/lib/octavia/{0}/haproxy.sock'.format(LB_ID1)
+        lb1_stats_socket = f'/var/lib/octavia/{LB_ID1}/haproxy.sock'
         mock_list_files.return_value = {LB_ID1: lb1_stats_socket}
 
         mock_is_running.return_value = True
@@ -480,7 +480,7 @@ class TestHealthDaemon(base.TestCase):
 
         with mock.patch('os.open'), mock.patch.object(
                 os, 'fdopen', self.mock_open) as mock_fdopen:
-            mock_fdopen().read.return_value = simplejson.dumps({
+            mock_fdopen().read.return_value = json.dumps({
                 LISTENER_ID1: {'bin': 15, 'bout': 20},
             })
             msg = health_daemon.build_stats_message()
@@ -488,7 +488,7 @@ class TestHealthDaemon(base.TestCase):
         self.assertEqual(SAMPLE_MSG_HAPROXY_RESTART, msg)
 
         mock_get_stats.assert_any_call(lb1_stats_socket)
-        mock_fdopen().write.assert_called_once_with(simplejson.dumps({
+        mock_fdopen().write.assert_called_once_with(json.dumps({
             LISTENER_ID1: {
                 'bin': int(FRONTEND_STATS['bin']),
                 'bout': int(FRONTEND_STATS['bout']),

octavia/tests/unit/amphorae/backends/utils/test_haproxy_query.py

@@ -170,4 +170,4 @@ class QueryTestCase(base.TestCase):
         try:
             self.q.save_state(filename)
         except Exception as ex:
-            self.fail("save_state() raised %r unexpectedly!" % ex)
+            self.fail(f"save_state() raised {ex!r} unexpectedly!")