octavia 14.0.0.0rc1__py3-none-any.whl → 15.0.0.0rc1__py3-none-any.whl

octavia/policies/quota.py

@@ -17,46 +17,40 @@ from octavia.common import constants
 
 rules = [
     policy.DocumentedRuleDefault(
-        '{rbac_obj}{action}'.format(rbac_obj=constants.RBAC_QUOTA,
-                                    action=constants.RBAC_GET_ALL),
+        f'{constants.RBAC_QUOTA}{constants.RBAC_GET_ALL}',
         constants.RULE_API_READ_QUOTA,
         "List Quotas",
         [{'method': 'GET', 'path': '/v2/lbaas/quotas'}]
     ),
     policy.DocumentedRuleDefault(
-        '{rbac_obj}{action}'.format(rbac_obj=constants.RBAC_QUOTA,
-                                    action=constants.RBAC_GET_ALL_GLOBAL),
+        f'{constants.RBAC_QUOTA}{constants.RBAC_GET_ALL_GLOBAL}',
         constants.RULE_API_READ_QUOTA_GLOBAL,
         "List Quotas including resources owned by others",
         [{'method': 'GET', 'path': '/v2/lbaas/quotas'}]
     ),
     policy.DocumentedRuleDefault(
-        '{rbac_obj}{action}'.format(rbac_obj=constants.RBAC_QUOTA,
-                                    action=constants.RBAC_GET_ONE),
+        f'{constants.RBAC_QUOTA}{constants.RBAC_GET_ONE}',
         constants.RULE_API_READ_QUOTA,
         "Show Quota details",
         [{'method': 'GET',
           'path': '/v2/lbaas/quotas/{project_id}'}]
     ),
     policy.DocumentedRuleDefault(
-        '{rbac_obj}{action}'.format(rbac_obj=constants.RBAC_QUOTA,
-                                    action=constants.RBAC_PUT),
+        f'{constants.RBAC_QUOTA}{constants.RBAC_PUT}',
         constants.RULE_API_WRITE_QUOTA,
         "Update a Quota",
         [{'method': 'PUT',
           'path': '/v2/lbaas/quotas/{project_id}'}]
     ),
     policy.DocumentedRuleDefault(
-        '{rbac_obj}{action}'.format(rbac_obj=constants.RBAC_QUOTA,
-                                    action=constants.RBAC_DELETE),
+        f'{constants.RBAC_QUOTA}{constants.RBAC_DELETE}',
         constants.RULE_API_WRITE_QUOTA,
         "Reset a Quota",
         [{'method': 'DELETE',
           'path': '/v2/lbaas/quotas/{project_id}'}]
     ),
     policy.DocumentedRuleDefault(
-        '{rbac_obj}{action}'.format(rbac_obj=constants.RBAC_QUOTA,
-                                    action=constants.RBAC_GET_DEFAULTS),
+        f'{constants.RBAC_QUOTA}{constants.RBAC_GET_DEFAULTS}',
         constants.RULE_API_READ_QUOTA,
         "Show Default Quota for a Project",
         [{'method': 'GET',

octavia/statistics/stats_base.py

@@ -48,7 +48,7 @@ def update_stats_via_driver(listener_stats, deltas=False):
     handlers.map_method('update_stats', listener_stats, deltas=deltas)
 
 
-class StatsDriverMixin(object, metaclass=abc.ABCMeta):
+class StatsDriverMixin(metaclass=abc.ABCMeta):
     @abc.abstractmethod
     def update_stats(self, listener_stats, deltas=False):
         """Return a stats object formatted for a generic backend

octavia/tests/common/constants.py

@@ -22,7 +22,7 @@ from openstack.network.v2.subnet import Subnet
 from octavia.common import constants
 
 
-class MockNovaInterface(object):
+class MockNovaInterface:
     net_id = None
     port_id = None
     fixed_ips = []

octavia/tests/common/data_model_helpers.py

@@ -35,10 +35,10 @@ def generate_load_balancer(vip=None, amphorae=None,
     additional_vips = additional_vips or []
     global LB_SEED
     LB_SEED += 1
-    lb = data_models.LoadBalancer(id='lb{0}-id'.format(LB_SEED),
+    lb = data_models.LoadBalancer(id=f'lb{LB_SEED}-id',
                                   project_id='2',
-                                  name='lb{0}'.format(LB_SEED),
-                                  description='lb{0}'.format(LB_SEED),
+                                  name=f'lb{LB_SEED}',
+                                  description=f'lb{LB_SEED}',
                                   vip=vip,
                                   topology=topology,
                                   amphorae=amphorae)
@@ -68,9 +68,9 @@ VIP_SEED = 0
 def generate_vip(load_balancer=None):
     global VIP_SEED
     VIP_SEED += 1
-    vip = data_models.Vip(ip_address='10.0.0.{0}'.format(VIP_SEED),
+    vip = data_models.Vip(ip_address=f'10.0.0.{VIP_SEED}',
                           subnet_id=ut_constants.MOCK_VIP_SUBNET_ID,
-                          port_id='vrrp-port-{0}'.format(VIP_SEED),
+                          port_id=f'vrrp-port-{VIP_SEED}',
                           load_balancer=load_balancer)
     if load_balancer:
         vip.load_balancer_id = load_balancer.id
@@ -83,12 +83,12 @@ AMP_SEED = 0
 def generate_amphora(load_balancer=None):
     global AMP_SEED
     AMP_SEED += 1
-    amp = data_models.Amphora(id='amp{0}-id'.format(AMP_SEED),
-                              compute_id='amp{0}-compute-id'.format(AMP_SEED),
+    amp = data_models.Amphora(id=f'amp{AMP_SEED}-id',
+                              compute_id=f'amp{AMP_SEED}-compute-id',
                               status='ACTIVE',
-                              lb_network_ip='99.99.99.{0}'.format(AMP_SEED),
-                              vrrp_ip='55.55.55.{0}'.format(AMP_SEED),
-                              vrrp_port_id='vrrp_port-{0}-id'.format(AMP_SEED),
+                              lb_network_ip=f'99.99.99.{AMP_SEED}',
+                              vrrp_ip=f'55.55.55.{AMP_SEED}',
+                              vrrp_port_id=f'vrrp_port-{AMP_SEED}-id',
                               load_balancer=load_balancer)
     if load_balancer:
         amp.load_balancer_id = load_balancer.id

octavia/tests/common/sample_data_models.py

@@ -23,7 +23,7 @@ from octavia.common import constants
 from octavia.common import data_models
 
 
-class SampleDriverDataModels(object):
+class SampleDriverDataModels:
 
     def __init__(self):
         self.project_id = uuidutils.generate_uuid()

octavia/tests/common/sample_haproxy_prometheus

@@ -94,9 +94,9 @@ haproxy_process_current_frontend_ssl_key_rate 0
 # HELP haproxy_process_max_frontend_ssl_key_rate Maximum observed frontend SSL Key computation per second.
 # TYPE haproxy_process_max_frontend_ssl_key_rate gauge
 haproxy_process_max_frontend_ssl_key_rate 0
-# HELP haproxy_process_frontent_ssl_reuse SSL session reuse ratio (percent).
-# TYPE haproxy_process_frontent_ssl_reuse gauge
-haproxy_process_frontent_ssl_reuse 0
+# HELP haproxy_process_frontend_ssl_reuse SSL session reuse ratio (percent).
+# TYPE haproxy_process_frontend_ssl_reuse gauge
+haproxy_process_frontend_ssl_reuse 0
 # HELP haproxy_process_current_backend_ssl_key_rate Current backend SSL Key computation per second over last elapsed second.
 # TYPE haproxy_process_current_backend_ssl_key_rate gauge
 haproxy_process_current_backend_ssl_key_rate 0
@@ -870,17 +870,17 @@ haproxy_server_http_responses_total{proxy="6034884d-ed47-49d5-ade7-8fa2c4501a74:
 haproxy_server_http_responses_total{proxy="6034884d-ed47-49d5-ade7-8fa2c4501a74:1a0c13c0-8e69-46c7-a68a-ca4937996d74",server="88ee5795-d594-478b-8591-455acf30164f",code="other"} 0
 haproxy_server_http_responses_total{proxy="6034884d-ed47-49d5-ade7-8fa2c4501a74:0b248d39-eb90-4180-91aa-5363be7df4db",server="edf6ca81-b5d5-4d94-a656-f6028d8bbb77",code="other"} 0
 haproxy_server_http_responses_total{proxy="6034884d-ed47-49d5-ade7-8fa2c4501a74:0b248d39-eb90-4180-91aa-5363be7df4db",server="88ee5795-d594-478b-8591-455acf30164f",code="other"} 0
-# HELP haproxy_server_server_idle_connections_current Current number of idle connections available for reuse
-# TYPE haproxy_server_server_idle_connections_current gauge
-haproxy_server_server_idle_connections_current{proxy="prometheus-exporter-internal",server="prometheus-internal"} 0
-haproxy_server_server_idle_connections_current{proxy="6034884d-ed47-49d5-ade7-8fa2c4501a74:1a0c13c0-8e69-46c7-a68a-ca4937996d74",server="edf6ca81-b5d5-4d94-a656-f6028d8bbb77"} 0
-haproxy_server_server_idle_connections_current{proxy="6034884d-ed47-49d5-ade7-8fa2c4501a74:1a0c13c0-8e69-46c7-a68a-ca4937996d74",server="88ee5795-d594-478b-8591-455acf30164f"} 0
-haproxy_server_server_idle_connections_current{proxy="6034884d-ed47-49d5-ade7-8fa2c4501a74:0b248d39-eb90-4180-91aa-5363be7df4db",server="edf6ca81-b5d5-4d94-a656-f6028d8bbb77"} 0
-haproxy_server_server_idle_connections_current{proxy="6034884d-ed47-49d5-ade7-8fa2c4501a74:0b248d39-eb90-4180-91aa-5363be7df4db",server="88ee5795-d594-478b-8591-455acf30164f"} 0
-# HELP haproxy_server_server_idle_connections_limit Limit on the number of available idle connections
-# TYPE haproxy_server_server_idle_connections_limit gauge
-haproxy_server_server_idle_connections_limit{proxy="prometheus-exporter-internal",server="prometheus-internal"} 0
-haproxy_server_server_idle_connections_limit{proxy="6034884d-ed47-49d5-ade7-8fa2c4501a74:1a0c13c0-8e69-46c7-a68a-ca4937996d74",server="edf6ca81-b5d5-4d94-a656-f6028d8bbb77"} 0
-haproxy_server_server_idle_connections_limit{proxy="6034884d-ed47-49d5-ade7-8fa2c4501a74:1a0c13c0-8e69-46c7-a68a-ca4937996d74",server="88ee5795-d594-478b-8591-455acf30164f"} 0
-haproxy_server_server_idle_connections_limit{proxy="6034884d-ed47-49d5-ade7-8fa2c4501a74:0b248d39-eb90-4180-91aa-5363be7df4db",server="edf6ca81-b5d5-4d94-a656-f6028d8bbb77"} 0
-haproxy_server_server_idle_connections_limit{proxy="6034884d-ed47-49d5-ade7-8fa2c4501a74:0b248d39-eb90-4180-91aa-5363be7df4db",server="88ee5795-d594-478b-8591-455acf30164f"} 0
+# HELP haproxy_server_idle_connections_current Current number of idle connections available for reuse
+# TYPE haproxy_server_idle_connections_current gauge
+haproxy_server_idle_connections_current{proxy="prometheus-exporter-internal",server="prometheus-internal"} 0
+haproxy_server_idle_connections_current{proxy="6034884d-ed47-49d5-ade7-8fa2c4501a74:1a0c13c0-8e69-46c7-a68a-ca4937996d74",server="edf6ca81-b5d5-4d94-a656-f6028d8bbb77"} 0
+haproxy_server_idle_connections_current{proxy="6034884d-ed47-49d5-ade7-8fa2c4501a74:1a0c13c0-8e69-46c7-a68a-ca4937996d74",server="88ee5795-d594-478b-8591-455acf30164f"} 0
+haproxy_server_idle_connections_current{proxy="6034884d-ed47-49d5-ade7-8fa2c4501a74:0b248d39-eb90-4180-91aa-5363be7df4db",server="edf6ca81-b5d5-4d94-a656-f6028d8bbb77"} 0
+haproxy_server_idle_connections_current{proxy="6034884d-ed47-49d5-ade7-8fa2c4501a74:0b248d39-eb90-4180-91aa-5363be7df4db",server="88ee5795-d594-478b-8591-455acf30164f"} 0
+# HELP haproxy_server_idle_connections_limit Limit on the number of available idle connections
+# TYPE haproxy_server_idle_connections_limit gauge
+haproxy_server_idle_connections_limit{proxy="prometheus-exporter-internal",server="prometheus-internal"} 0
+haproxy_server_idle_connections_limit{proxy="6034884d-ed47-49d5-ade7-8fa2c4501a74:1a0c13c0-8e69-46c7-a68a-ca4937996d74",server="edf6ca81-b5d5-4d94-a656-f6028d8bbb77"} 0
+haproxy_server_idle_connections_limit{proxy="6034884d-ed47-49d5-ade7-8fa2c4501a74:1a0c13c0-8e69-46c7-a68a-ca4937996d74",server="88ee5795-d594-478b-8591-455acf30164f"} 0
+haproxy_server_idle_connections_limit{proxy="6034884d-ed47-49d5-ade7-8fa2c4501a74:0b248d39-eb90-4180-91aa-5363be7df4db",server="edf6ca81-b5d5-4d94-a656-f6028d8bbb77"} 0
+haproxy_server_idle_connections_limit{proxy="6034884d-ed47-49d5-ade7-8fa2c4501a74:0b248d39-eb90-4180-91aa-5363be7df4db",server="88ee5795-d594-478b-8591-455acf30164f"} 0

octavia/tests/common/sample_octavia_prometheus

@@ -67,9 +67,9 @@ octavia_loadbalancer_current_frontend_ssl_key_rate 0
 # HELP octavia_loadbalancer_max_frontend_ssl_key_rate Maximum observed frontend SSL Key computation per second.
 # TYPE octavia_loadbalancer_max_frontend_ssl_key_rate gauge
 octavia_loadbalancer_max_frontend_ssl_key_rate 0
-# HELP octavia_loadbalancer_frontent_ssl_reuse SSL session reuse ratio (percent).
-# TYPE octavia_loadbalancer_frontent_ssl_reuse gauge
-octavia_loadbalancer_frontent_ssl_reuse 0
+# HELP octavia_loadbalancer_frontend_ssl_reuse SSL session reuse ratio (percent).
+# TYPE octavia_loadbalancer_frontend_ssl_reuse gauge
+octavia_loadbalancer_frontend_ssl_reuse 0
 # HELP octavia_loadbalancer_current_backend_ssl_key_rate Current backend SSL Key computation per second over last elapsed second.
 # TYPE octavia_loadbalancer_current_backend_ssl_key_rate gauge
 octavia_loadbalancer_current_backend_ssl_key_rate 0
@@ -97,7 +97,7 @@ octavia_loadbalancer_listeners 6
 # HELP octavia_loadbalancer_dropped_logs_total Total number of dropped logs.
 # TYPE octavia_loadbalancer_dropped_logs_total counter
 octavia_loadbalancer_dropped_logs_total 0
-# HELP octavia_listener_status Current status of the listener. 0=OFFLINE, 1=ONLINE, 2=DEGRADED.
+# HELP octavia_listener_status Current status of the listener.
 # TYPE octavia_listener_status gauge
 octavia_listener_status{listener="1a0c13c0-8e69-46c7-a68a-ca4937996d74"} 1
 octavia_listener_status{listener="4919eeb2-b3ed-40c5-8200-057400b83bb7"} 1
@@ -247,7 +247,7 @@ octavia_listener_http_comp_bytes_bypassed_total{listener="0b248d39-eb90-4180-91a
 octavia_listener_http_comp_responses_total{listener="1a0c13c0-8e69-46c7-a68a-ca4937996d74"} 0
 octavia_listener_http_comp_responses_total{listener="4919eeb2-b3ed-40c5-8200-057400b83bb7"} 0
 octavia_listener_http_comp_responses_total{listener="0b248d39-eb90-4180-91aa-5363be7df4db"} 0
-# HELP octavia_pool_status Current status of the pool. 0=OFFLINE, 1=ONLINE.
+# HELP octavia_pool_status Current status of the pool.
 # TYPE octavia_pool_status gauge
 octavia_pool_status{pool="6034884d-ed47-49d5-ade7-8fa2c4501a74:1a0c13c0-8e69-46c7-a68a-ca4937996d74"} 0
 octavia_pool_status{pool="6034884d-ed47-49d5-ade7-8fa2c4501a74:0b248d39-eb90-4180-91aa-5363be7df4db"} 0
@@ -433,7 +433,7 @@ octavia_pool_http_comp_bytes_bypassed_total{pool="6034884d-ed47-49d5-ade7-8fa2c4
 # TYPE octavia_pool_http_comp_responses_total counter
 octavia_pool_http_comp_responses_total{pool="6034884d-ed47-49d5-ade7-8fa2c4501a74:1a0c13c0-8e69-46c7-a68a-ca4937996d74"} 0
 octavia_pool_http_comp_responses_total{pool="6034884d-ed47-49d5-ade7-8fa2c4501a74:0b248d39-eb90-4180-91aa-5363be7df4db"} 0
-# HELP octavia_member_status Current status of the member. 0=ERROR, 1=ONLINE, 2=OFFLINE, 3=DRAIN.
+# HELP octavia_member_status Current status of the member.
 # TYPE octavia_member_status gauge
 octavia_member_status{pool="6034884d-ed47-49d5-ade7-8fa2c4501a74:1a0c13c0-8e69-46c7-a68a-ca4937996d74",member="edf6ca81-b5d5-4d94-a656-f6028d8bbb77"} 0
 octavia_member_status{pool="6034884d-ed47-49d5-ade7-8fa2c4501a74:1a0c13c0-8e69-46c7-a68a-ca4937996d74",member="88ee5795-d594-478b-8591-455acf30164f"} 0

octavia/tests/common/utils.py

@@ -48,7 +48,7 @@ class OpenFixture(fixtures.Fixture):
 
 def assert_address_lists_equal(obj, l1, l2):
     obj.assertEqual(len(l1), len(l2),
-                    "Address lists don't match: {} vs {}".format(l1, l2))
+                    f"Address lists don't match: {l1} vs {l2}")
     for a1, a2 in zip(l1, l2):
         if consts.ADDRESS in a1 and consts.ADDRESS in a2:
             obj.assertEqual(
@@ -62,7 +62,7 @@ def assert_address_lists_equal(obj, l1, l2):
 
 def assert_route_lists_equal(obj, l1, l2):
     obj.assertEqual(len(l1), len(l2),
-                    "Routes don't match: {} vs {}".format(l1, l2))
+                    f"Routes don't match: {l1} vs {l2}")
     for r1, r2 in zip(l1, l2):
         obj.assertEqual(
             ipaddress.ip_network(r1[consts.DST]),

octavia/tests/functional/amphorae/backend/agent/api_server/test_keepalivedlvs.py

@@ -116,8 +116,6 @@ class KeepalivedLvsTestCase(base.TestCase):
                 'install_netns_systemd_service')
     @mock.patch('pyroute2.NetNS', create=True)
     @mock.patch('shutil.copy2')
-    @mock.patch('octavia.amphorae.backends.agent.api_server.util.'
-                'get_os_init_system', return_value=consts.INIT_SYSTEMD)
     @mock.patch('os.chmod')
     @mock.patch('os.path.exists')
     @mock.patch('os.makedirs')
@@ -125,8 +123,7 @@ class KeepalivedLvsTestCase(base.TestCase):
     @mock.patch('subprocess.check_output')
     def test_upload_lvs_listener_config_no_vrrp_check_dir(
             self, m_check_output, m_os_rm, m_os_mkdir, m_exists, m_os_chmod,
-            m_os_sysinit, m_copy2, mock_netns, mock_install_netns,
-            mock_systemctl):
+            m_copy2, mock_netns, mock_install_netns, mock_systemctl):
         m_exists.side_effect = [False, False, True, True, False, False]
         cfg_path = util.keepalived_lvs_cfg_path(self.FAKE_ID)
         m = self.useFixture(test_utils.OpenFixture(cfg_path)).mock_open
@@ -143,9 +140,10 @@ class KeepalivedLvsTestCase(base.TestCase):
             mock_install_netns.assert_called_once()
             systemctl_calls = [
                 mock.call(consts.ENABLE,
-                          consts.AMP_NETNS_SVC_PREFIX),
-                mock.call(consts.ENABLE,
-                          'octavia-keepalivedlvs-%s' % str(self.FAKE_ID)),
+                          consts.AMP_NETNS_SVC_PREFIX, False),
+                mock.call(
+                    consts.ENABLE,
+                    'octavia-keepalivedlvs-%s.service' % self.FAKE_ID),
             ]
             mock_systemctl.assert_has_calls(systemctl_calls)
             os_mkdir_calls = [
@@ -159,8 +157,7 @@ class KeepalivedLvsTestCase(base.TestCase):
 
             flags = os.O_WRONLY | os.O_CREAT | os.O_TRUNC
             mode = stat.S_IRUSR | stat.S_IWUSR | stat.S_IRGRP | stat.S_IROTH
-            systemd_cfg_path = util.keepalived_lvs_init_path(
-                consts.INIT_SYSTEMD, self.FAKE_ID)
+            systemd_cfg_path = util.keepalived_lvs_init_path(self.FAKE_ID)
 
             m_open_calls = [
                 mock.call(cfg_path, flags, mode),
@@ -181,8 +178,6 @@ class KeepalivedLvsTestCase(base.TestCase):
                 'install_netns_systemd_service')
     @mock.patch('pyroute2.NetNS', create=True)
     @mock.patch('shutil.copy2')
-    @mock.patch('octavia.amphorae.backends.agent.api_server.util.'
-                'get_os_init_system', return_value=consts.INIT_SYSTEMD)
     @mock.patch('os.chmod')
     @mock.patch('os.path.exists')
     @mock.patch('os.makedirs')
@@ -190,8 +185,8 @@ class KeepalivedLvsTestCase(base.TestCase):
     @mock.patch('subprocess.check_output')
     def test_upload_lvs_listener_config_with_vrrp_check_dir(
             self, m_check_output, m_os_rm, m_os_mkdir, m_exists, m_os_chmod,
-            m_os_sysinit, m_copy2, mock_netns, mock_install_netns,
-            mock_systemctl, mock_get_lbs, mock_get_lvs_listeners):
+            m_copy2, mock_netns, mock_install_netns, mock_systemctl,
+            mock_get_lbs, mock_get_lvs_listeners):
         m_exists.side_effect = [False, False, True, True, False, False, False]
         mock_get_lbs.return_value = []
         mock_get_lvs_listeners.return_value = [self.FAKE_ID]
@@ -219,9 +214,10 @@ class KeepalivedLvsTestCase(base.TestCase):
             mock_install_netns.assert_called_once()
             systemctl_calls = [
                 mock.call(consts.ENABLE,
-                          consts.AMP_NETNS_SVC_PREFIX),
-                mock.call(consts.ENABLE,
-                          'octavia-keepalivedlvs-%s' % str(self.FAKE_ID)),
+                          consts.AMP_NETNS_SVC_PREFIX, False),
+                mock.call(
+                    consts.ENABLE,
+                    'octavia-keepalivedlvs-%s.service' % self.FAKE_ID)
             ]
             mock_systemctl.assert_has_calls(systemctl_calls)
 
@@ -229,8 +225,7 @@ class KeepalivedLvsTestCase(base.TestCase):
                 util.keepalived_backend_check_script_path(), stat.S_IEXEC)
             flags = os.O_WRONLY | os.O_CREAT | os.O_TRUNC
             mode = stat.S_IRUSR | stat.S_IWUSR | stat.S_IRGRP | stat.S_IROTH
-            systemd_cfg_path = util.keepalived_lvs_init_path(
-                consts.INIT_SYSTEMD, self.FAKE_ID)
+            systemd_cfg_path = util.keepalived_lvs_init_path(self.FAKE_ID)
             script_path = os.path.join(
                 util.keepalived_check_scripts_dir(),
                 keepalivedlvs.KEEPALIVED_CHECK_SCRIPT_NAME)
@@ -252,8 +247,6 @@ class KeepalivedLvsTestCase(base.TestCase):
     @mock.patch('octavia.amphorae.backends.agent.api_server.util.'
                 'install_netns_systemd_service')
     @mock.patch('shutil.copy2')
-    @mock.patch('octavia.amphorae.backends.agent.api_server.util.'
-                'get_os_init_system', return_value=consts.INIT_SYSTEMD)
     @mock.patch('os.chmod')
     @mock.patch('os.path.exists')
     @mock.patch('os.makedirs')
@@ -261,7 +254,7 @@ class KeepalivedLvsTestCase(base.TestCase):
     @mock.patch('subprocess.check_output')
     def test_upload_lvs_listener_config_start_service_failure(
             self, m_check_output, m_os_rm, m_os_mkdir, m_exists, m_os_chmod,
-            m_os_sysinit, m_copy2, mock_install_netns, mock_systemctl):
+            m_copy2, mock_install_netns, mock_systemctl):
         m_exists.side_effect = [False, False, True, True, False]
         cfg_path = util.keepalived_lvs_cfg_path(self.FAKE_ID)
         m = self.useFixture(test_utils.OpenFixture(cfg_path)).mock_open
@@ -283,9 +276,10 @@ class KeepalivedLvsTestCase(base.TestCase):
             mock_install_netns.assert_called_once()
             systemctl_calls = [
                 mock.call(consts.ENABLE,
-                          consts.AMP_NETNS_SVC_PREFIX),
-                mock.call(consts.ENABLE,
-                          'octavia-keepalivedlvs-%s' % str(self.FAKE_ID)),
+                          consts.AMP_NETNS_SVC_PREFIX, False),
+                mock.call(
+                    consts.ENABLE,
+                    'octavia-keepalivedlvs-%s.service' % self.FAKE_ID)
             ]
             mock_systemctl.assert_has_calls(systemctl_calls)
 
@@ -293,8 +287,7 @@ class KeepalivedLvsTestCase(base.TestCase):
                 util.keepalived_backend_check_script_path(), stat.S_IEXEC)
             flags = os.O_WRONLY | os.O_CREAT | os.O_TRUNC
             mode = stat.S_IRUSR | stat.S_IWUSR | stat.S_IRGRP | stat.S_IROTH
-            systemd_cfg_path = util.keepalived_lvs_init_path(
-                consts.INIT_SYSTEMD, self.FAKE_ID)
+            systemd_cfg_path = util.keepalived_lvs_init_path(self.FAKE_ID)
             m_open_calls = [
                 mock.call(cfg_path, flags, mode),
                 mock.call(systemd_cfg_path, flags, mode)
@@ -311,10 +304,10 @@ class KeepalivedLvsTestCase(base.TestCase):
     def test_manage_lvs_listener(self, mock_lvs_exist, mock_check_output):
         res = self.test_keepalivedlvs.manage_lvs_listener(self.FAKE_ID,
                                                           'start')
-        cmd = ("/usr/sbin/service octavia-keepalivedlvs-{listener_id}"
-               " {action}".format(listener_id=self.FAKE_ID, action='start'))
+        cmd = f"systemctl start octavia-keepalivedlvs-{self.FAKE_ID}.service"
         mock_check_output.assert_called_once_with(cmd.split(),
-                                                  stderr=subprocess.STDOUT)
+                                                  stderr=subprocess.STDOUT,
+                                                  encoding='utf-8')
         self.assertEqual(202, res.status_code)
 
         res = self.test_keepalivedlvs.manage_lvs_listener(self.FAKE_ID,
@@ -330,25 +323,24 @@ class KeepalivedLvsTestCase(base.TestCase):
 
     @mock.patch('octavia.amphorae.backends.agent.api_server.util.'
                 'get_lvs_listeners', return_value=[LISTENER_ID])
-    @mock.patch('octavia.amphorae.backends.agent.api_server.util.'
-                'get_os_init_system', return_value=consts.INIT_SYSTEMD)
     @mock.patch('octavia.amphorae.backends.agent.api_server.util.'
                 'get_keepalivedlvs_pid', return_value="12345")
     @mock.patch('subprocess.check_output')
     @mock.patch('os.remove')
     @mock.patch('os.path.exists')
     def test_delete_lvs_listener(self, m_exist, m_remove, m_check_output,
-                                 mget_pid, m_init_sys, mget_lvs_listeners):
+                                 mget_pid, mget_lvs_listeners):
         m_exist.return_value = True
         res = self.test_keepalivedlvs.delete_lvs_listener(self.FAKE_ID)
 
-        cmd1 = ("/usr/sbin/service "
-                "octavia-keepalivedlvs-{0} stop".format(self.FAKE_ID))
+        cmd1 = f"systemctl stop octavia-keepalivedlvs-{self.FAKE_ID}.service"
         cmd2 = ("systemctl disable "
-                "octavia-keepalivedlvs-{list}".format(list=self.FAKE_ID))
+                f"octavia-keepalivedlvs-{self.FAKE_ID}.service")
         calls = [
-            mock.call(cmd1.split(), stderr=subprocess.STDOUT),
-            mock.call(cmd2.split(), stderr=subprocess.STDOUT)
+            mock.call(cmd1.split(), stderr=subprocess.STDOUT,
+                      encoding='utf-8'),
+            mock.call(cmd2.split(), stderr=subprocess.STDOUT,
+                      encoding='utf-8')
         ]
         m_check_output.assert_has_calls(calls)
         self.assertEqual(200, res.status_code)
@@ -360,9 +352,10 @@ class KeepalivedLvsTestCase(base.TestCase):
         self.test_keepalivedlvs.delete_lvs_listener(self.FAKE_ID)
         calls = [
             mock.call(
-                json=dict(message='UDP Listener Not Found',
-                          details="No UDP listener with UUID: "
-                                  "{0}".format(self.FAKE_ID)), status=404),
+                json=dict(
+                    message='UDP Listener Not Found',
+                    details=f"No UDP listener with UUID: {self.FAKE_ID}"
+                ), status=404),
             mock.call(json={'message': 'OK'})
         ]
         m_webob.Response.assert_has_calls(calls)
@@ -381,8 +374,6 @@ class KeepalivedLvsTestCase(base.TestCase):
         self.assertEqual({'message': 'Error stopping keepalivedlvs',
                           'details': None}, res.json)
 
-    @mock.patch('octavia.amphorae.backends.agent.api_server.util.'
-                'get_os_init_system', return_value=consts.INIT_SYSVINIT)
     @mock.patch('octavia.amphorae.backends.agent.api_server.util.'
                 'get_keepalivedlvs_pid', return_value="12345")
     @mock.patch('subprocess.check_output')
@@ -390,8 +381,7 @@ class KeepalivedLvsTestCase(base.TestCase):
     @mock.patch('os.path.exists')
     def test_delete_lvs_listener_disable_service_fail(self, m_exist, m_remove,
                                                       m_check_output,
-                                                      mget_pid,
-                                                      m_init_sys):
+                                                      mget_pid):
         m_exist.return_value = True
         m_check_output.side_effect = [True,
                                       subprocess.CalledProcessError(
@@ -399,22 +389,6 @@ class KeepalivedLvsTestCase(base.TestCase):
         res = self.test_keepalivedlvs.delete_lvs_listener(self.FAKE_ID)
         self.assertEqual(500, res.status_code)
         self.assertEqual({
-            'message': 'Error disabling '
-                       'octavia-keepalivedlvs-%s service' % self.FAKE_ID,
+            'message': f'Error disabling octavia-keepalivedlvs-{self.FAKE_ID} '
+                       f'service',
             'details': None}, res.json)
-
-    @mock.patch('octavia.amphorae.backends.agent.api_server.util.'
-                'get_os_init_system')
-    @mock.patch('octavia.amphorae.backends.agent.api_server.util.'
-                'get_keepalivedlvs_pid', return_value="12345")
-    @mock.patch('subprocess.check_output')
-    @mock.patch('os.remove')
-    @mock.patch('os.path.exists')
-    def test_delete_lvs_listener_unsupported_sysinit(self, m_exist, m_remove,
-                                                     m_check_output, mget_pid,
-                                                     m_init_sys):
-        m_exist.return_value = True
-        self.assertRaises(
-            util.UnknownInitError,
-            self.test_keepalivedlvs.delete_lvs_listener,
-            self.FAKE_ID)