Merge "Remove deprecated [amphora_agent] agent_server_network_file"

Author: Zuul

octavia/common/config.py

@@ -148,14 +148,6 @@
     cfg.StrOpt('agent_server_network_dir',
                help=_("The directory where new network interfaces "
                       "are located")),
-    cfg.StrOpt('agent_server_network_file',
-               help=_("The file where the network interfaces are located. "
-                      "Specifying this will override any value set for "
-                      "agent_server_network_dir."),
-               deprecated_for_removal=True,
-               deprecated_reason=_('New amphora interface management '
-                                   'does not support single interface file.'),
-               deprecated_since='Xena'),
     cfg.IntOpt('agent_request_read_timeout', default=180,
                help=_("The time in seconds to allow a request from the "
                       "controller to run before terminating the socket.")),

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

@@ -1078,13 +1078,8 @@ def _test_plug_network(self, distro, mock_isfile, mock_int_by_mac,
         # 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 = f'/etc/octavia/interfaces/eth{test_int_num}.json'
-            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(
@@ -1163,12 +1158,8 @@ def _test_plug_network(self, distro, mock_isfile, mock_int_by_mac,
 
         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 = f'/etc/octavia/interfaces/eth{test_int_num}.json'
-            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(
@@ -1233,12 +1224,8 @@ def _test_plug_network(self, distro, mock_isfile, mock_int_by_mac,
 
         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 = f'/etc/octavia/interfaces/eth{test_int_num}.json'
-            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(
@@ -1376,8 +1363,6 @@ def _test_plug_network(self, distro, mock_isfile, mock_int_by_mac,
 
     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)
@@ -1631,13 +1616,9 @@ def _test_plug_VIP4(self, distro, mock_isfile, mock_makedirs,
 
         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
 
@@ -1749,14 +1730,9 @@ def _test_plug_VIP4(self, distro, mock_isfile, mock_makedirs,
         # 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
 

releasenotes/notes/remove-agent_server_network_file-1c9ab712d6b05016.yaml

@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    The deprecated ``[amphora_agent] agent_server_network_file`` option has
+    been removed.