octavia 15.0.0.0rc1__tar.gz → 15.0.1__tar.gz

{octavia-15.0.0.0rc1 → octavia-15.0.1}/AUTHORS

@@ -102,6 +102,7 @@ Hongbin Lu <hongbin.lu@huawei.com>
 Ian Wienand <iwienand@redhat.com>
 Ihar Hrachyshka <ihrachys@redhat.com>
 Ildar Iskhakov <iiskhako@cisco.com>
+Ilia Kerbs <ikerbs@protonmail.com>
 Itzik Brown <itzikb@redhat.com>
 Jacky Hu <hudayou@hotmail.com>
 James Arendt <james.arendt@hp.com>
@@ -192,6 +193,7 @@ Sean McGinnis <sean.mcginnis@gmail.com>
 Selvakumar S <selvakumar.s2@hp.com>
 Sergey Belous <sbelous@mirantis.com>
 Sergey Kraynev <sergejyit@gmail.com>
+Seunghun Lee <seunghun@stackhpc.com>
 ShangXiao <shangxiaobj@inspur.com>
 Shashank Kumar Shankar <shashank.kumar.shankar@intel.com>
 Sherif Abdelwahab <sherif.abdelwahab@hp.com>

{octavia-15.0.0.0rc1 → octavia-15.0.1}/ChangeLog

@@ -1,8 +1,23 @@
 CHANGES
 =======
 
-15.0.0.0rc1
------------
+15.0.1
+------
+
+* Ignore load\_balancer graph in task results to avoid break write data in jobboard DB
+* Fix amphora image builds to use DIB bindep
+* Update stable/2024.2 to use 2024.2 tests
+* Fix missing GARP with UDP listeners on SINGLE LB
+* Fix verification of certificates signed by a private CA
+* Remove amphora\_health record on revert CreateAmphoraInDB
+* Handle undefined protocol field in security group rules correctly
+* Do not fail on revert PlugVIPAmphora due undefined db\_lb
+* Pin pylint on 2024.2
+* Update TOX\_CONSTRAINTS\_FILE for stable/2024.2
+* Update .gitreview for stable/2024.2
+
+15.0.0
+------
 
 * Imported Translations from Zanata
 * Fix SR-IOV when VIP interface is used for members

octavia-15.0.1/PKG-INFO

@@ -0,0 +1,153 @@
+Metadata-Version: 2.1
+Name: octavia
+Version: 15.0.1
+Summary: OpenStack Octavia Scalable Load Balancer as a Service
+Home-page: https://docs.openstack.org/octavia/latest/
+Author: OpenStack
+Author-email: openstack-discuss@lists.openstack.org
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: OpenStack
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Information Technology
+Classifier: Intended Audience :: System Administrators
+Classifier: License :: OSI Approved :: Apache Software License
+Classifier: Operating System :: POSIX :: Linux
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Requires-Python: >=3.9
+License-File: LICENSE
+Requires-Dist: alembic>=0.9.6
+Requires-Dist: cotyledon>=1.3.0
+Requires-Dist: pecan>=1.3.2
+Requires-Dist: pbr>=3.1.1
+Requires-Dist: SQLAlchemy>=1.2.19
+Requires-Dist: SQLAlchemy-Utils>=0.30.11
+Requires-Dist: futurist>=1.2.0
+Requires-Dist: requests>=2.23.0
+Requires-Dist: rfc3986>=1.2.0
+Requires-Dist: keystoneauth1>=3.4.0
+Requires-Dist: keystonemiddleware>=9.5.0
+Requires-Dist: WebOb>=1.8.2
+Requires-Dist: stevedore>=1.20.0
+Requires-Dist: openstacksdk>=0.103.0
+Requires-Dist: oslo.config>=6.8.0
+Requires-Dist: oslo.context>=2.22.0
+Requires-Dist: oslo.db[mysql]>=8.4.0
+Requires-Dist: oslo.i18n>=3.20.0
+Requires-Dist: oslo.log>=4.3.0
+Requires-Dist: oslo.messaging>=14.1.0
+Requires-Dist: oslo.middleware>=4.0.1
+Requires-Dist: oslo.policy>=3.7.0
+Requires-Dist: oslo.reports>=1.18.0
+Requires-Dist: oslo.serialization>=2.28.1
+Requires-Dist: oslo.upgradecheck>=1.3.0
+Requires-Dist: oslo.utils>=4.7.0
+Requires-Dist: psutil>=5.7.1
+Requires-Dist: pyasn1!=0.2.3,>=0.1.8
+Requires-Dist: pyasn1-modules>=0.0.6
+Requires-Dist: python-barbicanclient>=4.5.2
+Requires-Dist: python-glanceclient>=2.8.0
+Requires-Dist: python-novaclient>=9.1.0
+Requires-Dist: python-cinderclient>=3.3.0
+Requires-Dist: WSME>=0.8.0
+Requires-Dist: Jinja2>=2.10
+Requires-Dist: taskflow>=5.5.0
+Requires-Dist: castellan>=0.16.0
+Requires-Dist: tenacity>=5.0.4
+Requires-Dist: distro>=1.2.0
+Requires-Dist: jsonschema>=3.2.0
+Requires-Dist: octavia-lib>=3.3.0
+Requires-Dist: setproctitle>=1.1.10
+Requires-Dist: python-dateutil>=2.7.0
+Requires-Dist: Flask!=0.11,>=0.10
+Requires-Dist: cryptography>=42.0.0
+Requires-Dist: pyroute2>=0.5.14
+Requires-Dist: gunicorn>=19.9.0
+Requires-Dist: Werkzeug>=0.14.1
+Provides-Extra: redis
+Requires-Dist: redis>=3.4.0; extra == "redis"
+Provides-Extra: zookeeper
+Requires-Dist: kazoo>=2.6.0; extra == "zookeeper"
+Requires-Dist: zake>=0.1.6; extra == "zookeeper"
+Provides-Extra: test
+Requires-Dist: hacking<6.2.0,>=6.1.0; extra == "test"
+Requires-Dist: requests-mock>=1.2.0; extra == "test"
+Requires-Dist: coverage!=4.4,>=4.0; extra == "test"
+Requires-Dist: fixtures>=3.0.0; extra == "test"
+Requires-Dist: flake8-import-order<0.19.0,>=0.18.0; extra == "test"
+Requires-Dist: python-subunit>=1.0.0; extra == "test"
+Requires-Dist: oslotest>=3.2.0; extra == "test"
+Requires-Dist: pylint<3.2.0,>=2.5.3; extra == "test"
+Requires-Dist: testrepository>=0.0.18; extra == "test"
+Requires-Dist: testtools>=2.2.0; extra == "test"
+Requires-Dist: testresources>=2.0.0; extra == "test"
+Requires-Dist: testscenarios>=0.4; extra == "test"
+Requires-Dist: doc8>=0.6.0; extra == "test"
+Requires-Dist: bandit!=1.6.0,>=1.1.0; extra == "test"
+Requires-Dist: tempest>=23.0.0; extra == "test"
+Requires-Dist: sphinx!=2.1.0,>=2.0.0; extra == "test"
+Requires-Dist: bashate>=0.5.1; extra == "test"
+Requires-Dist: WebTest>=2.0.26; extra == "test"
+
+========================
+Team and repository tags
+========================
+
+.. image:: https://governance.openstack.org/tc/badges/octavia.svg
+    :target: https://governance.openstack.org/tc/reference/tags/index.html
+
+.. Change things from this point on
+
+=======
+Octavia
+=======
+
+.. image:: https://img.shields.io/pypi/v/octavia.svg
+    :target: https://pypi.org/project/octavia/
+    :alt: Latest Version
+
+Octavia is an operator-grade open source scalable load balancer for use in
+large OpenStack deployments.
+
+Octavia provides the load balancing API for OpenStack. It supports multiple
+"provider drivers" that implement load balancing, including the "amphora"
+reference driver included with Octavia.
+
+Octavia is distributed under the terms of the Apache License, Version 2.0.
+The full terms and conditions of this license are detailed in the LICENSE
+file.
+
+Project resources
+~~~~~~~~~~~~~~~~~
+
+Developer documentation for the Octavia project is available at
+https://docs.openstack.org/octavia/latest/
+
+Release notes for the Octavia project are available at
+https://docs.openstack.org/releasenotes/octavia/
+
+The project source code repository is located at
+https://opendev.org/openstack/octavia
+
+Project status, bugs, and requests for feature enhancements are tracked on
+https://launchpad.net/octavia
+
+For more information on project direction and guiding principles for
+contributors, please see the CONSTITUTION.rst file in this directory, or
+specifications in the specs/ sub-directory.
+
+The project roadmap is available at
+https://wiki.openstack.org/wiki/Octavia/Roadmap
+
+External Resources
+~~~~~~~~~~~~~~~~~~
+
+* Octavia Wiki: https://wiki.openstack.org/wiki/Octavia
+
+* For help on usage and hacking of Octavia, please send an email to
+  OpenStack-dev Mailing List <mailto:openstack-discuss@lists.openstack.org>
+  with **[Octavia]** tag.
+

octavia-15.0.1/elements/amphora-agent/source-repository-amphora-agent

@@ -0,0 +1,3 @@
+# This is used for source-based builds
+amphora-agent git /opt/amphora-agent https://opendev.org/openstack/octavia stable/2024.2
+upper-constraints file /opt/upper-constraints.txt https://releases.openstack.org/constraints/upper/2024.2

{octavia-15.0.0.0rc1 → octavia-15.0.1}/elements/octavia-lib/source-repository-octavia-lib

@@ -1,2 +1,2 @@
 # This is used for source-based builds
-octavia-lib git /opt/octavia-lib https://opendev.org/openstack/octavia-lib
+octavia-lib git /opt/octavia-lib https://opendev.org/openstack/octavia-lib stable/2024.2

{octavia-15.0.0.0rc1 → octavia-15.0.1}/octavia/amphorae/backends/agent/api_server/keepalivedlvs.py

@@ -201,6 +201,15 @@ class KeepalivedLvs(lvs_listener_base.LvsListenerApiServerBase):
                             f"{listener_id}"),
                 'details': e.output}, status=500)
 
+        is_vrrp = (CONF.controller_worker.loadbalancer_topology ==
+                   consts.TOPOLOGY_ACTIVE_STANDBY)
+        # TODO(gthiemonge) remove RESTART from the list (same as previous todo
+        # in this function)
+        if not is_vrrp and action in [consts.AMP_ACTION_START,
+                                      consts.AMP_ACTION_RESTART,
+                                      consts.AMP_ACTION_RELOAD]:
+            util.send_vip_advertisements(listener_id=listener_id)
+
         return webob.Response(
             json={'message': 'OK',
                   'details': (f'keepalivedlvs listener {listener_id} '

{octavia-15.0.0.0rc1 → octavia-15.0.1}/octavia/amphorae/backends/agent/api_server/util.py

@@ -347,7 +347,37 @@ def get_haproxy_vip_addresses(lb_id):
     return vips
 
 
-def send_vip_advertisements(lb_id):
+def get_lvs_vip_addresses(listener_id: str) -> list[str]:
+    """Get the VIP addresses for a LVS load balancer.
+
+    :param listener_id: The listener ID to get VIP addresses from.
+    :returns: List of VIP addresses (IPv4 and IPv6)
+    """
+    vips = []
+    # Extract the VIP addresses from keepalived configuration
+    # Format is
+    # virtual_server_group ipv<n>-group {
+    #     vip_address1 port1
+    #     vip_address2 port2
+    # }
+    # it can be repeated in case of dual-stack LBs
+    with open(keepalived_lvs_cfg_path(listener_id), encoding='utf-8') as file:
+        vsg_section = False
+        for line in file:
+            current_line = line.strip()
+            if vsg_section:
+                if current_line.startswith('}'):
+                    vsg_section = False
+                else:
+                    vip_address = current_line.split(' ')[0]
+                    vips.append(vip_address)
+            elif line.startswith('virtual_server_group '):
+                vsg_section = True
+    return vips
+
+
+def send_vip_advertisements(lb_id: tp.Optional[str] = None,
+                            listener_id: tp.Optional[str] = None):
     """Sends address advertisements for each load balancer VIP.
 
     This method will send either GARP (IPv4) or neighbor advertisements (IPv6)
@@ -357,7 +387,10 @@ def send_vip_advertisements(lb_id):
     :returns: None
     """
     try:
-        vips = get_haproxy_vip_addresses(lb_id)
+        if lb_id:
+            vips = get_haproxy_vip_addresses(lb_id)
+        else:
+            vips = get_lvs_vip_addresses(listener_id)
 
         for vip in vips:
             interface = network_utils.get_interface_name(

{octavia-15.0.0.0rc1 → octavia-15.0.1}/octavia/common/clients.py

@@ -111,6 +111,7 @@ class NeutronAuth:
         client.
         """
         sess = keystone.KeystoneSession('neutron').get_session()
+        kwargs = {}
         neutron_endpoint = CONF.neutron.endpoint_override
         if neutron_endpoint is None:
             endpoint_data = sess.get_endpoint_data(
@@ -119,8 +120,13 @@ class NeutronAuth:
                 region_name=CONF.neutron.region_name)
             neutron_endpoint = endpoint_data.catalog_url
 
+        neutron_cafile = getattr(CONF.neutron, "cafile", None)
+        insecure = getattr(CONF.neutron, "insecure", False)
+        kwargs['verify'] = not insecure
+        if neutron_cafile is not None and not insecure:
+            kwargs['verify'] = neutron_cafile
         user_auth = token_endpoint.Token(neutron_endpoint, context.auth_token)
-        user_sess = session.Session(auth=user_auth)
+        user_sess = session.Session(auth=user_auth, **kwargs)
 
         conn = openstack.connection.Connection(
             session=user_sess, oslo_conf=CONF)

{octavia-15.0.0.0rc1 → octavia-15.0.1}/octavia/controller/worker/v2/tasks/database_tasks.py

@@ -132,13 +132,17 @@ class CreateAmphoraInDB(BaseDatabaseTask):
         LOG.warning("Reverting create amphora in DB for amp id %s ", result)
 
         # Delete the amphora for now. May want to just update status later
-        try:
-            with db_apis.session().begin() as session:
+        with db_apis.session().begin() as session:
+            try:
                 self.amphora_repo.delete(session, id=result)
-        except Exception as e:
-            LOG.error("Failed to delete amphora %(amp)s "
-                      "in the database due to: "
-                      "%(except)s", {'amp': result, 'except': str(e)})
+            except Exception as e:
+                LOG.error("Failed to delete amphora %(amp)s "
+                          "in the database due to: "
+                          "%(except)s", {'amp': result, 'except': str(e)})
+            try:
+                self.amp_health_repo.delete(session, amphora_id=result)
+            except Exception:
+                pass
 
 
 class MarkLBAmphoraeDeletedInDB(BaseDatabaseTask):

{octavia-15.0.0.0rc1 → octavia-15.0.1}/octavia/controller/worker/v2/tasks/network_tasks.py

@@ -536,11 +536,10 @@ class PlugVIPAmphora(BaseNetworkTask):
         """Handle a failure to plumb a vip."""
         if isinstance(result, failure.Failure):
             return
+        lb_id = loadbalancer[constants.LOADBALANCER_ID]
         LOG.warning("Unable to plug VIP for amphora id %s "
                     "load balancer id %s",
-                    amphora.get(constants.ID),
-                    loadbalancer[constants.LOADBALANCER_ID])
-
+                    amphora.get(constants.ID), lb_id)
         try:
             session = db_apis.get_session()
             with session.begin():
@@ -550,15 +549,16 @@ class PlugVIPAmphora(BaseNetworkTask):
                 db_amp.ha_port_id = result[constants.HA_PORT_ID]
                 db_subnet = self.network_driver.get_subnet(
                     subnet[constants.ID])
-                db_lb = self.loadbalancer_repo.get(
-                    session,
-                    id=loadbalancer[constants.LOADBALANCER_ID])
-
+                db_lb = self.loadbalancer_repo.get(session, id=lb_id)
             self.network_driver.unplug_aap_port(db_lb.vip,
                                                 db_amp, db_subnet)
         except Exception as e:
-            LOG.error('Failed to unplug AAP port. Resources may still be in '
-                      'use for VIP: %s due to error: %s', db_lb.vip, str(e))
+            LOG.error(
+                'Failed to unplug AAP port for load balancer: %s. '
+                'Resources may still be in use for VRRP port: %s. '
+                'Due to error: %s',
+                lb_id, result[constants.VRRP_PORT_ID], str(e)
+            )
 
 
 class UnplugVIP(BaseNetworkTask):
@@ -706,7 +706,11 @@ class GetAmphoraNetworkConfigs(BaseNetworkTask):
             db_lb, amphora=db_amp)
         provider_dict = {}
         for amp_id, amp_conf in db_configs.items():
-            provider_dict[amp_id] = amp_conf.to_dict(recurse=True)
+            # Do not serialize loadbalancer class.  It's unused later and
+            # could be ignored for storing in results of task in persistence DB
+            provider_dict[amp_id] = amp_conf.to_dict(
+                recurse=True, calling_classes=[data_models.LoadBalancer]
+            )
         return provider_dict
 
 
@@ -724,7 +728,11 @@ class GetAmphoraNetworkConfigsByID(BaseNetworkTask):
                                                              amphora=amphora)
         provider_dict = {}
         for amp_id, amp_conf in db_configs.items():
-            provider_dict[amp_id] = amp_conf.to_dict(recurse=True)
+            # Do not serialize loadbalancer class.  It's unused later and
+            # could be ignored for storing in results of task in persistence DB
+            provider_dict[amp_id] = amp_conf.to_dict(
+                recurse=True, calling_classes=[data_models.LoadBalancer]
+            )
         return provider_dict
 
 
@@ -740,7 +748,11 @@ class GetAmphoraeNetworkConfigs(BaseNetworkTask):
         db_configs = self.network_driver.get_network_configs(db_lb)
         provider_dict = {}
         for amp_id, amp_conf in db_configs.items():
-            provider_dict[amp_id] = amp_conf.to_dict(recurse=True)
+            # Do not serialize loadbalancer class.  It's unused later and
+            # could be ignored for storing in results of task in persistence DB
+            provider_dict[amp_id] = amp_conf.to_dict(
+                recurse=True, calling_classes=[data_models.LoadBalancer]
+            )
         return provider_dict
 
 

{octavia-15.0.0.0rc1 → octavia-15.0.1}/octavia/network/drivers/neutron/allowed_address_pairs.py

@@ -194,12 +194,13 @@ class AllowedAddressPairsDriver(neutron_base.BaseNeutronDriver):
             # Don't remove egress rules and don't confuse other protocols with
             # None ports with the egress rules.  VRRP uses protocol 51 and 112
             if (rule.get('direction') == 'egress' or
-                    rule.get('protocol').upper() not in
+                    rule.get('protocol') is None or
+                    rule['protocol'].upper() not in
                     [constants.PROTOCOL_TCP, constants.PROTOCOL_UDP,
                      lib_consts.PROTOCOL_SCTP]):
                 continue
             old_ports.append((rule.get('port_range_max'),
-                              rule.get('protocol').lower(),
+                              rule['protocol'].lower(),
                               rule.get('remote_ip_prefix')))
 
         add_ports = set(updated_ports) - set(old_ports)

{octavia-15.0.0.0rc1 → octavia-15.0.1}/octavia/tests/unit/amphorae/backends/agent/api_server/test_util.py

@@ -356,13 +356,57 @@ class TestUtil(base.TestCase):
         self.assertEqual([], util.get_haproxy_vip_addresses(LB_ID1))
         mock_cfg_path.assert_called_once_with(LB_ID1)
 
+    @mock.patch('octavia.amphorae.backends.agent.api_server.util.'
+                'keepalived_lvs_cfg_path')
+    def test_get_lvs_vip_addresses(self, mock_cfg_path):
+        FAKE_PATH = 'fake_path'
+        mock_cfg_path.return_value = FAKE_PATH
+        self.useFixture(
+            test_utils.OpenFixture(FAKE_PATH, 'no match')).mock_open()
+
+        # Test with no matching lines in the config file
+        self.assertEqual([], util.get_lvs_vip_addresses(LB_ID1))
+        mock_cfg_path.assert_called_once_with(LB_ID1)
+
+        # Test with 2 matching lines
+        mock_cfg_path.reset_mock()
+        test_data = ('virtual_server_group ipv4-group {\n'
+                     '    203.0.113.43 1\n'
+                     '    203.0.113.44 1\n'
+                     '}\n')
+        self.useFixture(
+            test_utils.OpenFixture(FAKE_PATH, test_data)).mock_open()
+        expected_result = ['203.0.113.43', '203.0.113.44']
+        self.assertEqual(expected_result,
+                         util.get_lvs_vip_addresses(LB_ID1))
+        mock_cfg_path.assert_called_once_with(LB_ID1)
+
+        # Test with 2 groups
+        mock_cfg_path.reset_mock()
+        test_data = ('virtual_server_group ipv4-group {\n'
+                     '    203.0.113.43 1\n'
+                     '}\n'
+                     'virtual_server_group ipv6-group {\n'
+                     '    2d01:27::1 2\n'
+                     '    2d01:27::2 2\n'
+                     '}\n')
+        self.useFixture(
+            test_utils.OpenFixture(FAKE_PATH, test_data)).mock_open()
+        expected_result = ['203.0.113.43', '2d01:27::1', '2d01:27::2']
+        self.assertEqual(expected_result,
+                         util.get_lvs_vip_addresses(LB_ID1))
+        mock_cfg_path.assert_called_once_with(LB_ID1)
+
     @mock.patch('octavia.amphorae.backends.utils.ip_advertisement.'
                 'send_ip_advertisement')
     @mock.patch('octavia.amphorae.backends.utils.network_utils.'
                 'get_interface_name')
     @mock.patch('octavia.amphorae.backends.agent.api_server.util.'
                 'get_haproxy_vip_addresses')
-    def test_send_vip_advertisements(self, mock_get_vip_addrs,
+    @mock.patch('octavia.amphorae.backends.agent.api_server.util.'
+                'get_lvs_vip_addresses')
+    def test_send_vip_advertisements(self, mock_get_lvs_vip_addrs,
+                                     mock_get_vip_addrs,
                                      mock_get_int_name, mock_send_advert):
         mock_get_vip_addrs.side_effect = [[], ['203.0.113.46'],
                                           Exception('boom')]
@@ -371,6 +415,7 @@ class TestUtil(base.TestCase):
         # Test no VIPs
         util.send_vip_advertisements(LB_ID1)
         mock_get_vip_addrs.assert_called_once_with(LB_ID1)
+        mock_get_lvs_vip_addrs.assert_not_called()
         mock_get_int_name.assert_not_called()
         mock_send_advert.assert_not_called()
 
@@ -380,6 +425,7 @@ class TestUtil(base.TestCase):
         mock_send_advert.reset_mock()
         util.send_vip_advertisements(LB_ID1)
         mock_get_vip_addrs.assert_called_once_with(LB_ID1)
+        mock_get_lvs_vip_addrs.assert_not_called()
         mock_get_int_name.assert_called_once_with(
             '203.0.113.46', net_ns=consts.AMPHORA_NAMESPACE)
         mock_send_advert.assert_called_once_with(
@@ -393,6 +439,48 @@ class TestUtil(base.TestCase):
         mock_get_int_name.assert_not_called()
         mock_send_advert.assert_not_called()
 
+    @mock.patch('octavia.amphorae.backends.utils.ip_advertisement.'
+                'send_ip_advertisement')
+    @mock.patch('octavia.amphorae.backends.utils.network_utils.'
+                'get_interface_name')
+    @mock.patch('octavia.amphorae.backends.agent.api_server.util.'
+                'get_haproxy_vip_addresses')
+    @mock.patch('octavia.amphorae.backends.agent.api_server.util.'
+                'get_lvs_vip_addresses')
+    def test_send_vip_advertisements_udp(self, mock_get_lvs_vip_addrs,
+                                         mock_get_vip_addrs,
+                                         mock_get_int_name, mock_send_advert):
+        mock_get_lvs_vip_addrs.side_effect = [[], ['203.0.113.46'],
+                                              Exception('boom')]
+        mock_get_int_name.return_value = 'fake0'
+
+        # Test no VIPs
+        util.send_vip_advertisements(listener_id=LISTENER_ID1)
+        mock_get_lvs_vip_addrs.assert_called_once_with(LISTENER_ID1)
+        mock_get_vip_addrs.assert_not_called()
+        mock_get_int_name.assert_not_called()
+        mock_send_advert.assert_not_called()
+
+        # Test with a VIP
+        mock_get_lvs_vip_addrs.reset_mock()
+        mock_get_int_name.reset_mock()
+        mock_send_advert.reset_mock()
+        util.send_vip_advertisements(listener_id=LISTENER_ID1)
+        mock_get_lvs_vip_addrs.assert_called_once_with(LISTENER_ID1)
+        mock_get_vip_addrs.assert_not_called()
+        mock_get_int_name.assert_called_once_with(
+            '203.0.113.46', net_ns=consts.AMPHORA_NAMESPACE)
+        mock_send_advert.assert_called_once_with(
+            'fake0', '203.0.113.46', net_ns=consts.AMPHORA_NAMESPACE)
+
+        # Test with an exception (should not raise)
+        mock_get_lvs_vip_addrs.reset_mock()
+        mock_get_int_name.reset_mock()
+        mock_send_advert.reset_mock()
+        util.send_vip_advertisements(listener_id=LISTENER_ID1)
+        mock_get_int_name.assert_not_called()
+        mock_send_advert.assert_not_called()
+
     @mock.patch('octavia.amphorae.backends.utils.ip_advertisement.'
                 'send_ip_advertisement')
     @mock.patch('octavia.amphorae.backends.utils.network_utils.'

{octavia-15.0.0.0rc1 → octavia-15.0.1}/octavia/tests/unit/controller/worker/v2/tasks/test_database_tasks.py

@@ -184,7 +184,9 @@ class TestDatabaseTasks(base.TestCase):
 
     @mock.patch('octavia.db.repositories.AmphoraRepository.create',
                 return_value=_db_amphora_mock)
+    @mock.patch('octavia.db.repositories.AmphoraHealthRepository.delete')
     def test_create_amphora_in_db(self,
+                                  mock_amphora_health_repo_delete,
                                   mock_create,
                                   mock_generate_uuid,
                                   mock_LOG,
@@ -210,23 +212,43 @@ class TestDatabaseTasks(base.TestCase):
 
         # Test the revert
         create_amp_in_db.revert(_tf_failure_mock)
-        self.assertFalse(mock_amphora_repo_delete.called)
+        mock_amphora_repo_delete.assert_not_called()
+        mock_amphora_health_repo_delete.assert_not_called()
 
+        amp_id = 'AMP'
         mock_amphora_repo_delete.reset_mock()
-        create_amp_in_db.revert(result='AMP')
+        mock_amphora_health_repo_delete.reset_mock()
+        create_amp_in_db.revert(result=amp_id)
         self.assertTrue(mock_amphora_repo_delete.called)
+        self.assertTrue(mock_amphora_health_repo_delete.called)
         mock_amphora_repo_delete.assert_called_once_with(
             mock_session,
-            id='AMP')
+            id=amp_id)
+        mock_amphora_health_repo_delete.assert_called_once_with(
+            mock_session,
+            amphora_id=amp_id)
+        mock_LOG.error.assert_not_called()
+        mock_LOG.debug.assert_not_called()
 
         # Test revert with exception
         mock_amphora_repo_delete.reset_mock()
-        mock_amphora_repo_delete.side_effect = Exception('fail')
-        create_amp_in_db.revert(result='AMP')
+        mock_amphora_health_repo_delete.reset_mock()
+        err1_msg, err2_msg = ('fail', 'fail2')
+        mock_amphora_repo_delete.side_effect = Exception(err1_msg)
+        mock_amphora_health_repo_delete.side_effect = Exception(err2_msg)
+        create_amp_in_db.revert(result=amp_id)
         self.assertTrue(mock_amphora_repo_delete.called)
+        self.assertTrue(mock_amphora_health_repo_delete.called)
         mock_amphora_repo_delete.assert_called_once_with(
             mock_session,
-            id='AMP')
+            id=amp_id)
+        mock_amphora_health_repo_delete.assert_called_once_with(
+            mock_session,
+            amphora_id=amp_id)
+        mock_LOG.error.assert_called_once_with(
+            "Failed to delete amphora %(amp)s "
+            "in the database due to: "
+            "%(except)s", {'amp': amp_id, 'except': err1_msg})
 
     @mock.patch('octavia.db.repositories.ListenerRepository.delete')
     def test_delete_listener_in_db(self,