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

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

@@ -38,7 +38,7 @@ import octavia.tests.unit.base as base
 
 
 AMP_AGENT_CONF_PATH = '/etc/octavia/amphora-agent.conf'
-RANDOM_ERROR = b'random error'
+RANDOM_ERROR = 'random error'
 OK = dict(message='OK')
 FAKE_INTERFACE = 'eth33'
 
@@ -69,29 +69,11 @@ class TestServerTestCase(base.TestCase):
             self.centos_test_server = server.Server()
             self.centos_app = self.centos_test_server.app.test_client()
 
-    @mock.patch('octavia.amphorae.backends.agent.api_server.util.'
-                'get_os_init_system', return_value=consts.INIT_SYSTEMD)
-    def test_ubuntu_haproxy_systemd(self, mock_init_system):
-        self._test_haproxy(consts.INIT_SYSTEMD, consts.UBUNTU,
-                           mock_init_system)
+    def test_ubuntu_haproxy(self):
+        self._test_haproxy(consts.UBUNTU)
 
-    @mock.patch('octavia.amphorae.backends.agent.api_server.util.'
-                'get_os_init_system', return_value=consts.INIT_SYSTEMD)
-    def test_centos_haproxy_systemd(self, mock_init_system):
-        self._test_haproxy(consts.INIT_SYSTEMD, consts.CENTOS,
-                           mock_init_system)
-
-    @mock.patch('octavia.amphorae.backends.agent.api_server.util.'
-                'get_os_init_system', return_value=consts.INIT_SYSVINIT)
-    def test_ubuntu_haproxy_sysvinit(self, mock_init_system):
-        self._test_haproxy(consts.INIT_SYSVINIT, consts.UBUNTU,
-                           mock_init_system)
-
-    @mock.patch('octavia.amphorae.backends.agent.api_server.util.'
-                'get_os_init_system', return_value=consts.INIT_UPSTART)
-    def test_ubuntu_haproxy_upstart(self, mock_init_system):
-        self._test_haproxy(consts.INIT_UPSTART, consts.UBUNTU,
-                           mock_init_system)
+    def test_centos_haproxy(self):
+        self._test_haproxy(consts.CENTOS)
 
     @mock.patch('octavia.amphorae.backends.agent.api_server.'
                 'haproxy_compatibility.get_haproxy_versions')
@@ -99,7 +81,7 @@ class TestServerTestCase(base.TestCase):
     @mock.patch('os.makedirs')
     @mock.patch('os.rename')
     @mock.patch('subprocess.check_output')
-    def _test_haproxy(self, init_system, distro, mock_init_system,
+    def _test_haproxy(self, distro,
                       mock_subprocess, mock_rename,
                       mock_makedirs, mock_exists, mock_get_version):
 
@@ -137,21 +119,15 @@ class TestServerTestCase(base.TestCase):
                     haproxy_ug=consts.HAPROXY_USER_GROUP_CFG,
                     peer=(octavia_utils.
                           base64_sha1_string('amp_123').rstrip('='))).split(),
-                stderr=-2)
+                stderr=subprocess.STDOUT, encoding='utf-8')
             mock_rename.assert_called_with(
                 '/var/lib/octavia/123/haproxy.cfg.new',
                 '/var/lib/octavia/123/haproxy.cfg')
 
-        if init_system == consts.INIT_SYSTEMD:
-            mock_subprocess.assert_any_call(
-                "systemctl enable haproxy-123".split(),
-                stderr=subprocess.STDOUT)
-        elif init_system == consts.INIT_SYSVINIT:
-            mock_subprocess.assert_any_call(
-                "insserv /etc/init.d/haproxy-123".split(),
-                stderr=subprocess.STDOUT)
-        else:
-            self.assertIn(init_system, consts.VALID_INIT_SYSTEMS)
+        mock_subprocess.assert_any_call(
+            ['systemctl', 'enable', 'haproxy-123.service'],
+            stderr=subprocess.STDOUT,
+            encoding='utf-8')
 
         # exception writing
         m = self.useFixture(test_utils.OpenFixture(file_name)).mock_open
@@ -171,14 +147,7 @@ class TestServerTestCase(base.TestCase):
 
         # check if files get created
         mock_exists.return_value = False
-        if init_system == consts.INIT_SYSTEMD:
-            init_path = consts.SYSTEMD_DIR + '/haproxy-123.service'
-        elif init_system == consts.INIT_UPSTART:
-            init_path = consts.UPSTART_DIR + '/haproxy-123.conf'
-        elif init_system == consts.INIT_SYSVINIT:
-            init_path = consts.SYSVINIT_DIR + '/haproxy-123'
-        else:
-            self.assertIn(init_system, consts.VALID_INIT_SYSTEMS)
+        init_path = consts.SYSTEMD_DIR + '/haproxy-123.service'
 
         m = self.useFixture(test_utils.OpenFixture(init_path)).mock_open
         # happy case upstart file exists
@@ -198,12 +167,8 @@ class TestServerTestCase(base.TestCase):
                                          data='test')
 
             self.assertEqual(202, rv.status_code)
-            if init_system == consts.INIT_SYSTEMD:
-                mode = (stat.S_IRUSR | stat.S_IWUSR | stat.S_IRGRP |
-                        stat.S_IROTH)
-            else:
-                mode = (stat.S_IRWXU | stat.S_IRGRP | stat.S_IXGRP |
-                        stat.S_IROTH | stat.S_IXOTH)
+            mode = (stat.S_IRUSR | stat.S_IWUSR | stat.S_IRGRP |
+                    stat.S_IROTH)
             mock_open.assert_called_with(init_path, flags, mode)
             mock_fdopen.assert_called_with(123, 'w')
             handle = mock_fdopen()
@@ -230,7 +195,7 @@ class TestServerTestCase(base.TestCase):
                                          data='test')
             self.assertEqual(400, rv.status_code)
             self.assertEqual(
-                {'message': 'Invalid request', u'details': u'random error'},
+                {'message': 'Invalid request', 'details': 'random error'},
                 jsonutils.loads(rv.data.decode('utf-8')))
             mode = stat.S_IRUSR | stat.S_IWUSR
             mock_open.assert_called_with(file_name, flags, mode)
@@ -243,28 +208,11 @@ class TestServerTestCase(base.TestCase):
                     haproxy_ug=consts.HAPROXY_USER_GROUP_CFG,
                     peer=(octavia_utils.
                           base64_sha1_string('amp_123').rstrip('='))).split(),
-                stderr=-2)
+                stderr=subprocess.STDOUT, encoding='utf-8')
             mock_rename.assert_called_with(
                 '/var/lib/octavia/123/haproxy.cfg.new',
                 '/var/lib/octavia/123/haproxy.cfg.new-failed')
 
-        # unhappy path with bogus init system
-        mock_init_system.return_value = 'bogus'
-        with mock.patch('os.open') as mock_open, mock.patch.object(
-                os, 'fdopen', m) as mock_fdopen, mock.patch(
-                'distro.id') as mock_distro_id:
-            mock_open.return_value = 123
-            mock_distro_id.return_value = distro
-            if distro == consts.UBUNTU:
-                rv = self.ubuntu_app.put('/' + api_server.VERSION +
-                                         '/loadbalancer/amp_123/123/haproxy',
-                                         data='test')
-            elif distro == consts.CENTOS:
-                rv = self.ubuntu_app.put('/' + api_server.VERSION +
-                                         '/loadbalancer/amp_123/123/haproxy',
-                                         data='test')
-            self.assertEqual(500, rv.status_code)
-
     def test_ubuntu_start(self):
         self._test_start(consts.UBUNTU)
 
@@ -321,7 +269,9 @@ class TestServerTestCase(base.TestCase):
                         ' 123 started'},
             jsonutils.loads(rv.data.decode('utf-8')))
         mock_subprocess.assert_called_with(
-            ['/usr/sbin/service', 'haproxy-123', 'start'], stderr=-2)
+            ['systemctl', 'start', 'haproxy-123.service'],
+            stderr=subprocess.STDOUT,
+            encoding='utf-8')
 
         mock_exists.return_value = True
         mock_subprocess.side_effect = subprocess.CalledProcessError(
@@ -336,10 +286,11 @@ class TestServerTestCase(base.TestCase):
         self.assertEqual(
             {
                 'message': 'Error starting haproxy',
-                'details': RANDOM_ERROR.decode('utf-8'),
+                'details': RANDOM_ERROR,
             }, jsonutils.loads(rv.data.decode('utf-8')))
         mock_subprocess.assert_called_with(
-            ['/usr/sbin/service', 'haproxy-123', 'start'], stderr=-2)
+            ['systemctl', 'start', 'haproxy-123.service'],
+            stderr=subprocess.STDOUT, encoding='utf-8')
 
     def test_ubuntu_reload(self):
         self._test_reload(consts.UBUNTU)
@@ -377,7 +328,8 @@ class TestServerTestCase(base.TestCase):
              'details': 'Listener 123 reloaded'},
             jsonutils.loads(rv.data.decode('utf-8')))
         mock_subprocess.assert_called_with(
-            ['/usr/sbin/service', 'haproxy-123', 'reload'], stderr=-2)
+            ['systemctl', 'reload', 'haproxy-123.service'],
+            stderr=subprocess.STDOUT, encoding='utf-8')
 
         # Process not running so start
         mock_exists.return_value = True
@@ -395,7 +347,8 @@ class TestServerTestCase(base.TestCase):
                         ' 123 started'},
             jsonutils.loads(rv.data.decode('utf-8')))
         mock_subprocess.assert_called_with(
-            ['/usr/sbin/service', 'haproxy-123', 'start'], stderr=-2)
+            ['systemctl', 'start', 'haproxy-123.service'],
+            stderr=subprocess.STDOUT, encoding='utf-8')
 
     def test_ubuntu_info(self):
         self._test_info(consts.UBUNTU)
@@ -428,39 +381,13 @@ class TestServerTestCase(base.TestCase):
 
     @mock.patch('octavia.amphorae.backends.agent.api_server.util.'
                 'get_backend_for_lb_object', return_value='HAPROXY')
-    @mock.patch('octavia.amphorae.backends.agent.api_server.util.'
-                'get_os_init_system', return_value=consts.INIT_SYSTEMD)
-    def test_delete_ubuntu_listener_systemd(self, mock_init_system,
-                                            mock_get_proto):
-        self._test_delete_listener(consts.INIT_SYSTEMD, consts.UBUNTU,
-                                   mock_init_system)
+    def test_delete_ubuntu_listener(self, mock_get_proto):
+        self._test_delete_listener(consts.UBUNTU)
 
     @mock.patch('octavia.amphorae.backends.agent.api_server.util.'
                 'get_backend_for_lb_object', return_value='HAPROXY')
-    @mock.patch('octavia.amphorae.backends.agent.api_server.util.'
-                'get_os_init_system', return_value=consts.INIT_SYSTEMD)
-    def test_delete_centos_listener_systemd(self, mock_init_system,
-                                            mock_get_proto):
-        self._test_delete_listener(consts.INIT_SYSTEMD, consts.CENTOS,
-                                   mock_init_system)
-
-    @mock.patch('octavia.amphorae.backends.agent.api_server.util.'
-                'get_backend_for_lb_object', return_value='HAPROXY')
-    @mock.patch('octavia.amphorae.backends.agent.api_server.util.'
-                'get_os_init_system', return_value=consts.INIT_SYSVINIT)
-    def test_delete_ubuntu_listener_sysvinit(self, mock_init_system,
-                                             mock_get_proto):
-        self._test_delete_listener(consts.INIT_SYSVINIT, consts.UBUNTU,
-                                   mock_init_system)
-
-    @mock.patch('octavia.amphorae.backends.agent.api_server.util.'
-                'get_backend_for_lb_object', return_value='HAPROXY')
-    @mock.patch('octavia.amphorae.backends.agent.api_server.util.'
-                'get_os_init_system', return_value=consts.INIT_UPSTART)
-    def test_delete_ubuntu_listener_upstart(self, mock_init_system,
-                                            mock_get_proto):
-        self._test_delete_listener(consts.INIT_UPSTART, consts.UBUNTU,
-                                   mock_init_system)
+    def test_delete_centos_listener(self, mock_get_proto):
+        self._test_delete_listener(consts.CENTOS)
 
     @mock.patch('os.listdir')
     @mock.patch('os.path.exists')
@@ -471,7 +398,7 @@ class TestServerTestCase(base.TestCase):
                 'get_haproxy_pid')
     @mock.patch('shutil.rmtree')
     @mock.patch('os.remove')
-    def _test_delete_listener(self, init_system, distro, mock_init_system,
+    def _test_delete_listener(self, distro,
                               mock_remove, mock_rmtree, mock_pid, mock_vrrp,
                               mock_check_output, mock_exists, mock_listdir):
         self.assertIn(distro, [consts.UBUNTU, consts.CENTOS])
@@ -497,21 +424,12 @@ class TestServerTestCase(base.TestCase):
             rv = self.centos_app.delete('/' + api_server.VERSION +
                                         '/listeners/123')
         self.assertEqual(200, rv.status_code)
-        self.assertEqual({u'message': u'OK'},
+        self.assertEqual({'message': 'OK'},
                          jsonutils.loads(rv.data.decode('utf-8')))
         mock_rmtree.assert_called_with('/var/lib/octavia/123')
 
-        if init_system == consts.INIT_SYSTEMD:
-            mock_exists.assert_called_with(consts.SYSTEMD_DIR +
-                                           '/haproxy-123.service')
-        elif init_system == consts.INIT_UPSTART:
-            mock_exists.assert_called_with(consts.UPSTART_DIR +
-                                           '/haproxy-123.conf')
-        elif init_system == consts.INIT_SYSVINIT:
-            mock_exists.assert_called_with(consts.SYSVINIT_DIR +
-                                           '/haproxy-123')
-        else:
-            self.assertIn(init_system, consts.VALID_INIT_SYSTEMS)
+        mock_exists.assert_called_with(consts.SYSTEMD_DIR +
+                                       '/haproxy-123.service')
 
         mock_exists.assert_any_call('/var/lib/octavia/123/123.pid')
 
@@ -524,21 +442,12 @@ class TestServerTestCase(base.TestCase):
             rv = self.centos_app.delete('/' + api_server.VERSION +
                                         '/listeners/123')
         self.assertEqual(200, rv.status_code)
-        self.assertEqual({u'message': u'OK'},
+        self.assertEqual({'message': 'OK'},
                          jsonutils.loads(rv.data.decode('utf-8')))
         mock_rmtree.assert_called_with('/var/lib/octavia/123')
 
-        if init_system == consts.INIT_SYSTEMD:
-            mock_exists.assert_called_with(consts.SYSTEMD_DIR +
-                                           '/haproxy-123.service')
-        elif init_system == consts.INIT_UPSTART:
-            mock_exists.assert_called_with(consts.UPSTART_DIR +
-                                           '/haproxy-123.conf')
-        elif init_system == consts.INIT_SYSVINIT:
-            mock_exists.assert_called_with(consts.SYSVINIT_DIR +
-                                           '/haproxy-123')
-        else:
-            self.assertIn(init_system, consts.VALID_INIT_SYSTEMS)
+        mock_exists.assert_called_with(consts.SYSTEMD_DIR +
+                                       '/haproxy-123.service')
 
         mock_exists.assert_any_call('/var/lib/octavia/123/123.pid')
 
@@ -551,20 +460,11 @@ class TestServerTestCase(base.TestCase):
             rv = self.centos_app.delete('/' + api_server.VERSION +
                                         '/listeners/123')
         self.assertEqual(200, rv.status_code)
-        self.assertEqual({u'message': u'OK'},
+        self.assertEqual({'message': 'OK'},
                          jsonutils.loads(rv.data.decode('utf-8')))
 
-        if init_system == consts.INIT_SYSTEMD:
-            mock_remove.assert_called_with(consts.SYSTEMD_DIR +
-                                           '/haproxy-123.service')
-        elif init_system == consts.INIT_UPSTART:
-            mock_remove.assert_called_with(consts.UPSTART_DIR +
-                                           '/haproxy-123.conf')
-        elif init_system == consts.INIT_SYSVINIT:
-            mock_remove.assert_called_with(consts.SYSVINIT_DIR +
-                                           '/haproxy-123')
-        else:
-            self.assertIn(init_system, consts.VALID_INIT_SYSTEMS)
+        mock_remove.assert_called_with(consts.SYSTEMD_DIR +
+                                       '/haproxy-123.service')
 
         # service is stopped + upstart script + vrrp
         mock_exists.side_effect = [True, True, False, True, True]
@@ -575,20 +475,11 @@ class TestServerTestCase(base.TestCase):
             rv = self.centos_app.delete('/' + api_server.VERSION +
                                         '/listeners/123')
         self.assertEqual(200, rv.status_code)
-        self.assertEqual({u'message': u'OK'},
+        self.assertEqual({'message': 'OK'},
                          jsonutils.loads(rv.data.decode('utf-8')))
 
-        if init_system == consts.INIT_SYSTEMD:
-            mock_remove.assert_called_with(consts.SYSTEMD_DIR +
-                                           '/haproxy-123.service')
-        elif init_system == consts.INIT_UPSTART:
-            mock_remove.assert_called_with(consts.UPSTART_DIR +
-                                           '/haproxy-123.conf')
-        elif init_system == consts.INIT_SYSVINIT:
-            mock_remove.assert_called_with(consts.SYSVINIT_DIR +
-                                           '/haproxy-123')
-        else:
-            self.assertIn(init_system, consts.VALID_INIT_SYSTEMS)
+        mock_remove.assert_called_with(consts.SYSTEMD_DIR +
+                                       '/haproxy-123.service')
 
         # service is running + upstart script + no vrrp
         mock_exists.side_effect = [True, True, True, True, False, True]
@@ -600,25 +491,16 @@ class TestServerTestCase(base.TestCase):
             rv = self.centos_app.delete('/' + api_server.VERSION +
                                         '/listeners/123')
         self.assertEqual(200, rv.status_code)
-        self.assertEqual({u'message': u'OK'},
+        self.assertEqual({'message': 'OK'},
                          jsonutils.loads(rv.data.decode('utf-8')))
         mock_pid.assert_called_once_with('123')
         mock_check_output.assert_any_call(
-            ['/usr/sbin/service', 'haproxy-123', 'stop'], stderr=-2)
-
-        if init_system == consts.INIT_SYSTEMD:
-            mock_check_output.assert_any_call(
-                "systemctl disable haproxy-123".split(),
-                stderr=subprocess.STDOUT)
-        elif init_system == consts.INIT_UPSTART:
-            mock_remove.assert_any_call(consts.UPSTART_DIR +
-                                        '/haproxy-123.conf')
-        elif init_system == consts.INIT_SYSVINIT:
-            mock_check_output.assert_any_call(
-                "insserv -r /etc/init.d/haproxy-123".split(),
-                stderr=subprocess.STDOUT)
-        else:
-            self.assertIn(init_system, consts.VALID_INIT_SYSTEMS)
+            ['systemctl', 'stop', 'haproxy-123.service'],
+            stderr=subprocess.STDOUT, encoding='utf-8')
+
+        mock_check_output.assert_any_call(
+            ['systemctl', 'disable', 'haproxy-123.service'],
+            stderr=subprocess.STDOUT, encoding='utf-8')
 
         # service is running + upstart script + vrrp
         mock_exists.side_effect = [True, True, True, True, True, True]
@@ -630,25 +512,16 @@ class TestServerTestCase(base.TestCase):
             rv = self.centos_app.delete('/' + api_server.VERSION +
                                         '/listeners/123')
         self.assertEqual(200, rv.status_code)
-        self.assertEqual({u'message': u'OK'},
+        self.assertEqual({'message': 'OK'},
                          jsonutils.loads(rv.data.decode('utf-8')))
         mock_pid.assert_called_with('123')
         mock_check_output.assert_any_call(
-            ['/usr/sbin/service', 'haproxy-123', 'stop'], stderr=-2)
-
-        if init_system == consts.INIT_SYSTEMD:
-            mock_check_output.assert_any_call(
-                "systemctl disable haproxy-123".split(),
-                stderr=subprocess.STDOUT)
-        elif init_system == consts.INIT_UPSTART:
-            mock_remove.assert_any_call(consts.UPSTART_DIR +
-                                        '/haproxy-123.conf')
-        elif init_system == consts.INIT_SYSVINIT:
-            mock_check_output.assert_any_call(
-                "insserv -r /etc/init.d/haproxy-123".split(),
-                stderr=subprocess.STDOUT)
-        else:
-            self.assertIn(init_system, consts.VALID_INIT_SYSTEMS)
+            ['systemctl', 'stop', 'haproxy-123.service'],
+            stderr=subprocess.STDOUT, encoding='utf-8')
+
+        mock_check_output.assert_any_call(
+            ['systemctl', 'disable', 'haproxy-123.service'],
+            stderr=subprocess.STDOUT, encoding='utf-8')
 
         # service is running + stopping fails
         mock_exists.side_effect = [True, True, True, True]
@@ -1014,7 +887,7 @@ class TestServerTestCase(base.TestCase):
             for idx in range(test_int_num)]
         mock_isfile.return_value = True
 
-        mock_check_output.return_value = b"1\n2\n3\n"
+        mock_check_output.return_value = "1\n2\n3\n"
 
         test_int_num = str(test_int_num)
 
@@ -1068,14 +941,8 @@ class TestServerTestCase(base.TestCase):
         # One Interface down, Happy Path
         mode = stat.S_IRUSR | stat.S_IWUSR | stat.S_IRGRP | stat.S_IROTH
 
-        if self.conf.conf.amphora_agent.agent_server_network_file:
-            file_name = self.conf.conf.amphora_agent.agent_server_network_file
-            flags = os.O_WRONLY | os.O_CREAT | os.O_APPEND
-
-        else:
-            file_name = ('/etc/octavia/interfaces/'
-                         'eth{}.json'.format(test_int_num))
-            flags = os.O_WRONLY | os.O_CREAT | os.O_TRUNC
+        file_name = f'/etc/octavia/interfaces/eth{test_int_num}.json'
+        flags = os.O_WRONLY | os.O_CREAT | os.O_TRUNC
 
         m = self.useFixture(test_utils.OpenFixture(file_name)).mock_open
         with mock.patch('os.open') as mock_open, mock.patch.object(
@@ -1105,7 +972,7 @@ class TestServerTestCase(base.TestCase):
             mock_fdopen.assert_any_call(123, 'r+')
 
             expected_dict = {
-                consts.NAME: "eth{}".format(test_int_num),
+                consts.NAME: f"eth{test_int_num}",
                 consts.ADDRESSES: [
                     {
                         consts.DHCP: True,
@@ -1145,7 +1012,8 @@ class TestServerTestCase(base.TestCase):
 
             mock_check_output.assert_called_with(
                 ['ip', 'netns', 'exec', consts.AMPHORA_NAMESPACE,
-                 'amphora-interface', 'up', 'eth' + test_int_num], stderr=-2)
+                 'amphora-interface', 'up', 'eth' + test_int_num],
+                stderr=subprocess.STDOUT, encoding='utf-8')
 
         # fixed IPs happy path
         port_info = {'mac_address': '123', 'mtu': 1450, 'fixed_ips': [
@@ -1153,13 +1021,8 @@ class TestServerTestCase(base.TestCase):
 
         mode = stat.S_IRUSR | stat.S_IWUSR | stat.S_IRGRP | stat.S_IROTH
 
-        if self.conf.conf.amphora_agent.agent_server_network_file:
-            file_name = self.conf.conf.amphora_agent.agent_server_network_file
-            flags = os.O_WRONLY | os.O_CREAT | os.O_APPEND
-        else:
-            file_name = ('/etc/octavia/interfaces/'
-                         'eth{}.json'.format(test_int_num))
-            flags = os.O_WRONLY | os.O_CREAT | os.O_TRUNC
+        file_name = f'/etc/octavia/interfaces/eth{test_int_num}.json'
+        flags = os.O_WRONLY | os.O_CREAT | os.O_TRUNC
 
         m = self.useFixture(test_utils.OpenFixture(file_name)).mock_open
         with mock.patch('os.open') as mock_open, mock.patch.object(
@@ -1189,7 +1052,7 @@ class TestServerTestCase(base.TestCase):
             mock_fdopen.assert_any_call(123, 'r+')
 
             expected_dict = {
-                consts.NAME: "eth{}".format(test_int_num),
+                consts.NAME: f"eth{test_int_num}",
                 consts.MTU: 1450,
                 consts.ADDRESSES: [
                     {consts.ADDRESS: '10.0.0.5', consts.PREFIXLEN: 24}
@@ -1215,7 +1078,8 @@ class TestServerTestCase(base.TestCase):
 
             mock_check_output.assert_called_with(
                 ['ip', 'netns', 'exec', consts.AMPHORA_NAMESPACE,
-                 'amphora-interface', 'up', 'eth' + test_int_num], stderr=-2)
+                 'amphora-interface', 'up', 'eth' + test_int_num],
+                stderr=subprocess.STDOUT, encoding='utf-8')
 
         # fixed IPs happy path IPv6
         port_info = {'mac_address': '123', 'mtu': 1450, 'fixed_ips': [
@@ -1223,13 +1087,8 @@ class TestServerTestCase(base.TestCase):
 
         mode = stat.S_IRUSR | stat.S_IWUSR | stat.S_IRGRP | stat.S_IROTH
 
-        if self.conf.conf.amphora_agent.agent_server_network_file:
-            file_name = self.conf.conf.amphora_agent.agent_server_network_file
-            flags = os.O_WRONLY | os.O_CREAT | os.O_APPEND
-        else:
-            file_name = ('/etc/octavia/interfaces/'
-                         'eth{}.json'.format(test_int_num))
-            flags = os.O_WRONLY | os.O_CREAT | os.O_TRUNC
+        file_name = f'/etc/octavia/interfaces/eth{test_int_num}.json'
+        flags = os.O_WRONLY | os.O_CREAT | os.O_TRUNC
 
         m = self.useFixture(test_utils.OpenFixture(file_name)).mock_open
         with mock.patch('os.open') as mock_open, mock.patch.object(
@@ -1259,7 +1118,7 @@ class TestServerTestCase(base.TestCase):
             mock_fdopen.assert_any_call(123, 'r+')
 
             expected_dict = {
-                consts.NAME: "eth{}".format(test_int_num),
+                consts.NAME: f"eth{test_int_num}",
                 consts.MTU: 1450,
                 consts.ADDRESSES: [
                     {consts.ADDRESS: '2001:0db8::2',
@@ -1285,7 +1144,8 @@ class TestServerTestCase(base.TestCase):
 
             mock_check_output.assert_called_with(
                 ['ip', 'netns', 'exec', consts.AMPHORA_NAMESPACE,
-                 'amphora-interface', 'up', 'eth' + test_int_num], stderr=-2)
+                 'amphora-interface', 'up', 'eth' + test_int_num],
+                stderr=subprocess.STDOUT, encoding='utf-8')
 
         # fixed IPs, bogus IP
         port_info = {'mac_address': '123', 'fixed_ips': [
@@ -1293,8 +1153,7 @@ class TestServerTestCase(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
-        file_name = ('/etc/octavia/interfaces/'
-                     'eth{}.json'.format(test_int_num))
+        file_name = f'/etc/octavia/interfaces/eth{test_int_num}.json'
         m = self.useFixture(test_utils.OpenFixture(file_name)).mock_open
         with mock.patch('os.open') as mock_open, mock.patch.object(
                 os, 'fdopen', m) as mock_fdopen:
@@ -1314,9 +1173,10 @@ class TestServerTestCase(base.TestCase):
         # same as above but ifup fails
         port_info = {'mac_address': '123', 'fixed_ips': [
             {'ip_address': '10.0.0.5', 'subnet_cidr': '10.0.0.0/24'}]}
-        mock_check_output.side_effect = [subprocess.CalledProcessError(
-            7, 'test', RANDOM_ERROR), subprocess.CalledProcessError(
-            7, 'test', RANDOM_ERROR)]
+        mock_check_output.side_effect = [
+            subprocess.CalledProcessError(7, 'test', RANDOM_ERROR),
+            subprocess.CalledProcessError(7, 'test', RANDOM_ERROR)
+        ]
 
         m = self.useFixture(test_utils.OpenFixture(file_name)).mock_open
         with mock.patch('os.open'), mock.patch.object(os, 'fdopen', m):
@@ -1332,7 +1192,7 @@ class TestServerTestCase(base.TestCase):
                                           data=jsonutils.dumps(port_info))
             self.assertEqual(500, rv.status_code)
             self.assertEqual(
-                {'details': RANDOM_ERROR.decode('utf-8'),
+                {'details': RANDOM_ERROR,
                  'message': 'Error plugging network'},
                 jsonutils.loads(rv.data.decode('utf-8')))
 
@@ -1366,8 +1226,6 @@ class TestServerTestCase(base.TestCase):
 
     def test_ubuntu_plug_network_host_routes(self):
         self._test_plug_network_host_routes(consts.UBUNTU)
-        self.conf.config(group="amphora_agent",
-                         agent_server_network_file="/path/to/interfaces_file")
 
     def test_centos_plug_network_host_routes(self):
         self._test_plug_network_host_routes(consts.CENTOS)
@@ -1477,7 +1335,8 @@ class TestServerTestCase(base.TestCase):
 
             mock_check_output.assert_called_with(
                 ['ip', 'netns', 'exec', consts.AMPHORA_NAMESPACE,
-                 'amphora-interface', 'up', 'eth3'], stderr=-2)
+                 'amphora-interface', 'up', 'eth3'], stderr=subprocess.STDOUT,
+                encoding='utf-8')
 
     def test_ubuntu_plug_VIP4(self):
         self._test_plug_VIP4(consts.UBUNTU)
@@ -1620,13 +1479,9 @@ class TestServerTestCase(base.TestCase):
 
         mode = stat.S_IRUSR | stat.S_IWUSR | stat.S_IRGRP | stat.S_IROTH
 
-        if self.conf.conf.amphora_agent.agent_server_network_file:
-            file_name = self.conf.conf.amphora_agent.agent_server_network_file
-            flags = os.O_WRONLY | os.O_CREAT | os.O_APPEND
-        else:
-            file_name = ('/etc/octavia/interfaces/{netns_int}.json'.format(
-                netns_int=consts.NETNS_PRIMARY_INTERFACE))
-            flags = os.O_WRONLY | os.O_CREAT | os.O_TRUNC
+        file_name = ('/etc/octavia/interfaces/{netns_int}.json'.format(
+            netns_int=consts.NETNS_PRIMARY_INTERFACE))
+        flags = os.O_WRONLY | os.O_CREAT | os.O_TRUNC
 
         m = self.useFixture(test_utils.OpenFixture(file_name)).mock_open
 
@@ -1732,19 +1587,15 @@ class TestServerTestCase(base.TestCase):
             mock_check_output.assert_called_with(
                 ['ip', 'netns', 'exec', consts.AMPHORA_NAMESPACE,
                  'amphora-interface', 'up',
-                 consts.NETNS_PRIMARY_INTERFACE], stderr=-2)
+                 consts.NETNS_PRIMARY_INTERFACE], stderr=subprocess.STDOUT,
+                encoding='utf-8')
 
         # One Interface down, Happy Path IPv4
         mode = stat.S_IRUSR | stat.S_IWUSR | stat.S_IRGRP | stat.S_IROTH
 
-        if self.conf.conf.amphora_agent.agent_server_network_file:
-            file_name = self.conf.conf.amphora_agent.agent_server_network_file
-            flags = os.O_WRONLY | os.O_CREAT | os.O_APPEND
-
-        else:
-            file_name = ('/etc/octavia/interfaces/'
-                         '{}.json'.format(consts.NETNS_PRIMARY_INTERFACE))
-            flags = os.O_WRONLY | os.O_CREAT | os.O_TRUNC
+        file_name = ('/etc/octavia/interfaces/{}.json'.format(
+            consts.NETNS_PRIMARY_INTERFACE))
+        flags = os.O_WRONLY | os.O_CREAT | os.O_TRUNC
 
         m = self.useFixture(test_utils.OpenFixture(file_name)).mock_open
 
@@ -1832,12 +1683,13 @@ class TestServerTestCase(base.TestCase):
             mock_check_output.assert_called_with(
                 ['ip', 'netns', 'exec', consts.AMPHORA_NAMESPACE,
                  'amphora-interface', 'up',
-                 consts.NETNS_PRIMARY_INTERFACE], stderr=-2)
+                 consts.NETNS_PRIMARY_INTERFACE], stderr=subprocess.STDOUT,
+                encoding='utf-8')
 
         mock_check_output.side_effect = [
-            subprocess.CalledProcessError(
-                7, 'test', RANDOM_ERROR), subprocess.CalledProcessError(
-                7, 'test', RANDOM_ERROR)]
+            subprocess.CalledProcessError(7, 'test', RANDOM_ERROR),
+            subprocess.CalledProcessError(7, 'test', RANDOM_ERROR)
+        ]
 
         m = self.useFixture(test_utils.OpenFixture(file_name)).mock_open
         with mock.patch('os.open'), mock.patch.object(os, 'fdopen', m):
@@ -1853,7 +1705,7 @@ class TestServerTestCase(base.TestCase):
                                           data=jsonutils.dumps(subnet_info))
             self.assertEqual(500, rv.status_code)
             self.assertEqual(
-                {'details': RANDOM_ERROR.decode('utf-8'),
+                {'details': RANDOM_ERROR,
                  'message': 'Error plugging VIP'},
                 jsonutils.loads(rv.data.decode('utf-8')))
 
@@ -1983,8 +1835,8 @@ class TestServerTestCase(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
 
-        file_name = ('/etc/octavia/interfaces/{netns_int}.json'.format(
-                     netns_int=consts.NETNS_PRIMARY_INTERFACE))
+        file_name = (f'/etc/octavia/interfaces/'
+                     f'{consts.NETNS_PRIMARY_INTERFACE}.json')
         m = self.useFixture(test_utils.OpenFixture(file_name)).mock_open
 
         with mock.patch('os.open') as mock_open, mock.patch.object(
@@ -2086,16 +1938,21 @@ class TestServerTestCase(base.TestCase):
                 self, args[0], expected_dict)
 
             mock_check_output.assert_called_with(
-                ['ip', 'netns', 'exec', consts.AMPHORA_NAMESPACE,
+                [
+                    'ip', 'netns', 'exec', consts.AMPHORA_NAMESPACE,
                     'amphora-interface', 'up', '{netns_int}'.format(
-                        netns_int=consts.NETNS_PRIMARY_INTERFACE)], stderr=-2)
+                        netns_int=consts.NETNS_PRIMARY_INTERFACE
+                    )
+                ],
+                stderr=subprocess.STDOUT,
+                encoding='utf-8')
 
         # One Interface down, Happy Path IPv6
         flags = os.O_WRONLY | os.O_CREAT | os.O_TRUNC
         mode = stat.S_IRUSR | stat.S_IWUSR | stat.S_IRGRP | stat.S_IROTH
 
-        file_name = ('/etc/octavia/interfaces/{netns_int}.json'.format(
-                     netns_int=consts.NETNS_PRIMARY_INTERFACE))
+        file_name = (f'/etc/octavia/interfaces/'
+                     f'{consts.NETNS_PRIMARY_INTERFACE}.json')
         m = self.useFixture(test_utils.OpenFixture(file_name)).mock_open
 
         with mock.patch('os.open') as mock_open, mock.patch.object(
@@ -2181,14 +2038,14 @@ class TestServerTestCase(base.TestCase):
             test_utils.assert_interface_files_equal(
                 self, args[0], expected_dict)
 
-            mock_check_output.assert_called_with(
-                ['ip', 'netns', 'exec', consts.AMPHORA_NAMESPACE,
-                    'amphora-interface', 'up', '{netns_int}'.format(
-                        netns_int=consts.NETNS_PRIMARY_INTERFACE)], stderr=-2)
+            mock_check_output.assert_called_with([
+                'ip', 'netns', 'exec', consts.AMPHORA_NAMESPACE,
+                'amphora-interface', 'up', consts.NETNS_PRIMARY_INTERFACE
+            ], stderr=subprocess.STDOUT, encoding='utf-8')
         mock_check_output.side_effect = [
-            subprocess.CalledProcessError(
-                7, 'test', RANDOM_ERROR), subprocess.CalledProcessError(
-                7, 'test', RANDOM_ERROR)]
+            subprocess.CalledProcessError(7, 'test', RANDOM_ERROR),
+            subprocess.CalledProcessError(7, 'test', RANDOM_ERROR)
+        ]
 
         m = self.useFixture(test_utils.OpenFixture(file_name)).mock_open
         with mock.patch('os.open'), mock.patch.object(os, 'fdopen', m):
@@ -2204,7 +2061,7 @@ class TestServerTestCase(base.TestCase):
                                           data=jsonutils.dumps(subnet_info))
             self.assertEqual(500, rv.status_code)
             self.assertEqual(
-                {'details': RANDOM_ERROR.decode('utf-8'),
+                {'details': RANDOM_ERROR,
                  'message': 'Error plugging VIP'},
                 jsonutils.loads(rv.data.decode('utf-8')))
 
@@ -2271,8 +2128,8 @@ class TestServerTestCase(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
 
-        file_name = ('/etc/octavia/interfaces/{netns_int}.json'.format(
-                     netns_int=consts.NETNS_PRIMARY_INTERFACE))
+        file_name = (f'/etc/octavia/interfaces/'
+                     f'{consts.NETNS_PRIMARY_INTERFACE}.json')
         m = self.useFixture(test_utils.OpenFixture(file_name)).mock_open
 
         with mock.patch('os.open') as mock_open, mock.patch.object(
@@ -2421,10 +2278,11 @@ class TestServerTestCase(base.TestCase):
             test_utils.assert_interface_files_equal(
                 self, args[0], expected_dict)
 
-            mock_check_output.assert_called_with(
-                ['ip', 'netns', 'exec', consts.AMPHORA_NAMESPACE,
-                 'amphora-interface', 'up',
-                 consts.NETNS_PRIMARY_INTERFACE], stderr=-2)
+            mock_check_output.assert_called_with([
+                'ip', 'netns', 'exec', consts.AMPHORA_NAMESPACE,
+                'amphora-interface', 'up',
+                consts.NETNS_PRIMARY_INTERFACE
+            ], stderr=subprocess.STDOUT, encoding='utf-8')
 
     def test_ubuntu_plug_VIP6_with_additional_VIP(self):
         self._test_plug_VIP6_with_additional_VIP(consts.UBUNTU)
@@ -2489,8 +2347,8 @@ class TestServerTestCase(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
 
-        file_name = ('/etc/octavia/interfaces/{netns_int}.json'.format(
-                     netns_int=consts.NETNS_PRIMARY_INTERFACE))
+        file_name = (f'/etc/octavia/interfaces/'
+                     f'{consts.NETNS_PRIMARY_INTERFACE}.json')
         m = self.useFixture(test_utils.OpenFixture(file_name)).mock_open
 
         with mock.patch('os.open') as mock_open, mock.patch.object(
@@ -2638,10 +2496,10 @@ class TestServerTestCase(base.TestCase):
             test_utils.assert_interface_files_equal(
                 self, args[0], expected_dict)
 
-            mock_check_output.assert_called_with(
-                ['ip', 'netns', 'exec', consts.AMPHORA_NAMESPACE,
-                 'amphora-interface', 'up',
-                 consts.NETNS_PRIMARY_INTERFACE], stderr=-2)
+            mock_check_output.assert_called_with([
+                'ip', 'netns', 'exec', consts.AMPHORA_NAMESPACE,
+                'amphora-interface', 'up', consts.NETNS_PRIMARY_INTERFACE
+            ], stderr=subprocess.STDOUT, encoding='utf-8')
 
     def test_ubuntu_get_interface(self):
         self._test_get_interface(consts.UBUNTU)
@@ -2721,31 +2579,13 @@ class TestServerTestCase(base.TestCase):
                                      content_type='application/json')
         self.assertEqual(400, rv.status_code)
 
-    @mock.patch('octavia.amphorae.backends.agent.api_server.util.'
-                'get_os_init_system', return_value=consts.INIT_SYSTEMD)
-    def test_ubuntu_upload_keepalived_config_systemd(self, mock_init_system):
+    def test_ubuntu_upload_keepalived_config(self):
         with mock.patch('distro.id', return_value='ubuntu'):
-            self._test_upload_keepalived_config(
-                consts.INIT_SYSTEMD, consts.UBUNTU, mock_init_system)
+            self._test_upload_keepalived_config(consts.UBUNTU)
 
-    @mock.patch('octavia.amphorae.backends.agent.api_server.util.'
-                'get_os_init_system', return_value=consts.INIT_SYSTEMD)
-    def test_centos_upload_keepalived_config_systemd(self, mock_init_system):
+    def test_centos_upload_keepalived_config(self):
         with mock.patch('distro.id', return_value='centos'):
-            self._test_upload_keepalived_config(
-                consts.INIT_SYSTEMD, consts.CENTOS, mock_init_system)
-
-    @mock.patch('octavia.amphorae.backends.agent.api_server.util.'
-                'get_os_init_system', return_value=consts.INIT_UPSTART)
-    def test_ubuntu_upload_keepalived_config_upstart(self, mock_init_system):
-        self._test_upload_keepalived_config(consts.INIT_UPSTART,
-                                            consts.UBUNTU, mock_init_system)
-
-    @mock.patch('octavia.amphorae.backends.agent.api_server.util.'
-                'get_os_init_system', return_value=consts.INIT_SYSVINIT)
-    def test_ubuntu_upload_keepalived_config_sysvinit(self, mock_init_system):
-        self._test_upload_keepalived_config(consts.INIT_SYSVINIT,
-                                            consts.UBUNTU, mock_init_system)
+            self._test_upload_keepalived_config(consts.CENTOS)
 
     @mock.patch('octavia.amphorae.backends.agent.api_server.util.'
                 'vrrp_check_script_update')
@@ -2754,8 +2594,7 @@ class TestServerTestCase(base.TestCase):
     @mock.patch('os.rename')
     @mock.patch('subprocess.check_output')
     @mock.patch('os.remove')
-    def _test_upload_keepalived_config(self, init_system, distro,
-                                       mock_init_system, mock_remove,
+    def _test_upload_keepalived_config(self, distro, mock_remove,
                                        mock_subprocess, mock_rename,
                                        mock_makedirs, mock_exists,
                                        mock_vrrp_check):
@@ -2977,8 +2816,8 @@ class TestServerTestCase(base.TestCase):
                          'haproxy_count': haproxy_count,
                          'haproxy_version': '9.9.99-9',
                          'hostname': 'test-host',
-                         'ipvsadm_version': u'2.2.22-2',
-                         'keepalived_version': u'1.1.11-1',
+                         'ipvsadm_version': '2.2.22-2',
+                         'keepalived_version': '1.1.11-1',
                          'listeners': [listener_id],
                          'load': [load_1min, load_5min, load_15min],
                          'memory': {'buffers': Buffers,
@@ -3060,7 +2899,7 @@ class TestServerTestCase(base.TestCase):
     @mock.patch('octavia.amphorae.backends.utils.nftable_utils.'
                 'load_nftables_file')
     @mock.patch('octavia.amphorae.backends.utils.nftable_utils.'
-                'write_nftable_vip_rules_file')
+                'write_nftable_rules_file')
     @mock.patch('octavia.amphorae.backends.agent.api_server.amphora_info.'
                 'AmphoraInfo.get_interface')
     def test_set_interface_rules(self, mock_get_int, mock_write_rules,