octavia 13.0.0__py3-none-any.whl → 13.0.1__py3-none-any.whl

octavia/tests/unit/controller/worker/v2/tasks/test_database_tasks_quota.py

@@ -134,7 +134,7 @@ class TestDatabaseTasksQuota(base.TestCase):
                 task.revert(test_object, None)
 
             mock_check_quota_met.assert_called_once_with(
-                mock_session, mock_session, data_model,
+                mock_session, data_model,
                 project_id)
 
             mock_session.commit.assert_called_once_with()
@@ -238,13 +238,13 @@ class TestDatabaseTasksQuota(base.TestCase):
 
             task.revert(project_id, pool_child_count, None)
 
-            calls = [mock.call(mock_session, mock_session,
+            calls = [mock.call(mock_session,
                                data_models.Pool, project_id),
-                     mock.call(mock_session, mock_session,
+                     mock.call(mock_session,
                                data_models.HealthMonitor, project_id),
-                     mock.call(mock_session, mock_session,
+                     mock.call(mock_session,
                                data_models.Member, project_id),
-                     mock.call(mock_session, mock_session,
+                     mock.call(mock_session,
                                data_models.Member, project_id)]
 
             mock_check_quota_met.assert_has_calls(calls)
@@ -261,13 +261,13 @@ class TestDatabaseTasksQuota(base.TestCase):
 
             task.revert(project_id, pool_child_count, None)
 
-            calls = [mock.call(mock_session, mock_session,
+            calls = [mock.call(mock_session,
                                data_models.Pool, project_id),
-                     mock.call(mock_session, mock_session,
+                     mock.call(mock_session,
                                data_models.HealthMonitor, project_id),
-                     mock.call(mock_session, mock_session,
+                     mock.call(mock_session,
                                data_models.Member, project_id),
-                     mock.call(mock_session, mock_session,
+                     mock.call(mock_session,
                                data_models.Member, project_id)]
 
             mock_check_quota_met.assert_has_calls(calls)
@@ -285,13 +285,13 @@ class TestDatabaseTasksQuota(base.TestCase):
 
             task.revert(project_id, pool_child_count, None)
 
-            calls = [mock.call(mock_session, mock_session,
+            calls = [mock.call(mock_session,
                                data_models.Pool, project_id),
-                     mock.call(mock_session, mock_session,
+                     mock.call(mock_session,
                                data_models.HealthMonitor, project_id),
-                     mock.call(mock_session, mock_session,
+                     mock.call(mock_session,
                                data_models.Member, project_id),
-                     mock.call(mock_session, mock_session,
+                     mock.call(mock_session,
                                data_models.Member, project_id)]
 
             mock_check_quota_met.assert_has_calls(calls)
@@ -370,11 +370,11 @@ class TestDatabaseTasksQuota(base.TestCase):
 
             task.revert(test_object, None)
 
-            calls = [mock.call(mock_session, mock_session,
+            calls = [mock.call(mock_session,
                                data_models.L7Policy, project_id),
-                     mock.call(mock_session, mock_session,
+                     mock.call(mock_session,
                                data_models.L7Rule, project_id),
-                     mock.call(mock_session, mock_session,
+                     mock.call(mock_session,
                                data_models.L7Rule, project_id)]
 
             mock_check_quota_met.assert_has_calls(calls)
@@ -391,11 +391,11 @@ class TestDatabaseTasksQuota(base.TestCase):
 
             task.revert(test_object, None)
 
-            calls = [mock.call(mock_session, mock_session,
+            calls = [mock.call(mock_session,
                                data_models.L7Policy, project_id),
-                     mock.call(mock_session, mock_session,
+                     mock.call(mock_session,
                                data_models.L7Rule, project_id),
-                     mock.call(mock_session, mock_session,
+                     mock.call(mock_session,
                                data_models.L7Rule, project_id)]
 
             mock_check_quota_met.assert_has_calls(calls)

octavia/tests/unit/controller/worker/v2/tasks/test_network_tasks.py

@@ -1568,6 +1568,57 @@ class TestNetworkTasks(base.TestCase):
         mock_driver.unplug_aap_port.assert_called_once_with(
             LB.vip, self.db_amphora_mock, mockSubnet)
 
+    @mock.patch('octavia.db.repositories.AmphoraRepository.get')
+    @mock.patch('octavia.db.repositories.LoadBalancerRepository.get')
+    @mock.patch('octavia.db.api.get_session', return_value=_session_mock)
+    def test_revert_plug_vip_amphora_subnet_not_found(
+            self, mock_session, mock_lb_get, mock_get, mock_get_net_driver):
+        mock_driver = mock.MagicMock()
+        mock_lb_get.return_value = LB
+        mock_get.return_value = self.db_amphora_mock
+        mock_get_net_driver.return_value = mock_driver
+        net = network_tasks.PlugVIPAmphora()
+        amphora = {constants.ID: AMPHORA_ID,
+                   constants.LB_NETWORK_IP: IP_ADDRESS}
+        subnet = {constants.ID: SUBNET_ID}
+        err_msg = 'Subnet not found'
+        mock_driver.get_subnet.side_effect = net_base.SubnetNotFound(err_msg)
+        result = AMPS_DATA[0].to_dict()
+        net.revert(result, self.load_balancer_mock, amphora, subnet)
+        mock_driver.unplug_aap_port.assert_not_called()
+        network_tasks.LOG.error.assert_called_once_with(
+            'Failed to unplug AAP port for load balancer: %s. '
+            'Resources may still be in use for VRRP port: %s. '
+            'Due to error: %s',
+            self.load_balancer_mock[constants.LOADBALANCER_ID],
+            result[constants.VRRP_PORT_ID], err_msg
+        )
+
+    @mock.patch('octavia.db.repositories.AmphoraRepository.get')
+    @mock.patch('octavia.db.repositories.LoadBalancerRepository.get')
+    @mock.patch('octavia.db.api.get_session', return_value=_session_mock)
+    def test_revert_plug_vip_amphora_raise_db_error(
+            self, mock_session, mock_lb_get, mock_get, mock_get_net_driver):
+        mock_driver = mock.MagicMock()
+        mock_lb_get.return_value = LB
+        err_msg = 'Some Error'
+        mock_get.side_effect = Exception(err_msg)
+        net = network_tasks.PlugVIPAmphora()
+        amphora = {constants.ID: AMPHORA_ID,
+                   constants.LB_NETWORK_IP: IP_ADDRESS}
+        subnet = {constants.ID: SUBNET_ID}
+        result = AMPS_DATA[0].to_dict()
+        net.revert(result, self.load_balancer_mock, amphora, subnet)
+        mock_driver.unplug_aap_port.assert_not_called()
+        mock_lb_get.assert_not_called()
+        network_tasks.LOG.error.assert_called_once_with(
+            'Failed to unplug AAP port for load balancer: %s. '
+            'Resources may still be in use for VRRP port: %s. '
+            'Due to error: %s',
+            self.load_balancer_mock[constants.LOADBALANCER_ID],
+            result[constants.VRRP_PORT_ID], err_msg
+        )
+
     @mock.patch('octavia.controller.worker.v2.tasks.network_tasks.DeletePort.'
                 'update_progress')
     def test_delete_port(self, mock_update_progress, mock_get_net_driver):
@@ -1712,7 +1763,11 @@ class TestNetworkTasks(base.TestCase):
         # Test revert
         mock_driver.reset_mock()
 
-        net_task.revert([port_mock], vip_dict, VIP_SG_ID, AMP_ID,
+        # The execute path generates a port dict, so this will be the result
+        # passed into the revert method by Taskflow
+        port_dict = {constants.ID: PORT_ID}
+
+        net_task.revert(port_dict, vip_dict, VIP_SG_ID, AMP_ID,
                         additional_vips)
 
         mock_driver.delete_port.assert_called_once_with(PORT_ID)
@@ -1720,7 +1775,7 @@ class TestNetworkTasks(base.TestCase):
         # Test revert exception
         mock_driver.reset_mock()
 
-        net_task.revert([port_mock], vip_dict, VIP_SG_ID, AMP_ID,
+        net_task.revert(port_dict, vip_dict, VIP_SG_ID, AMP_ID,
                         additional_vips)
 
         mock_driver.delete_port.assert_called_once_with(PORT_ID)

octavia/tests/unit/controller/worker/v2/test_controller_worker.py

@@ -27,7 +27,7 @@ from octavia.controller.worker.v2 import controller_worker
 from octavia.controller.worker.v2.flows import flow_utils
 import octavia.tests.unit.base as base
 
-
+TLS_CERT_ID = uuidutils.generate_uuid()
 AMP_ID = uuidutils.generate_uuid()
 LB_ID = uuidutils.generate_uuid()
 LISTENER_ID = uuidutils.generate_uuid()
@@ -771,6 +771,61 @@ class TestControllerWorker(base.TestCase):
                        })
          )
 
+    @mock.patch(
+        "octavia.common.tls_utils.cert_parser.load_certificates_data",
+        side_effect=RuntimeError
+    )
+    def test_delete_load_balancer_with_cascade_tls_unavailable(
+            self,
+            mock_load_tls_cert,
+            mock_api_get_session,
+            mock_dyn_log_listener,
+            mock_taskflow_load,
+            mock_pool_repo_get,
+            mock_member_repo_get,
+            mock_l7rule_repo_get,
+            mock_l7policy_repo_get,
+            mock_listener_repo_get,
+            mock_lb_repo_get,
+            mock_health_mon_repo_get,
+            mock_amp_repo_get
+    ):
+        _flow_mock.reset_mock()
+
+        _listener_mock.tls_certificate_id = TLS_CERT_ID
+        _listener_mock.to_dict.return_value[
+            constants.TLS_CERTIFICATE_ID] = TLS_CERT_ID
+
+        cw = controller_worker.ControllerWorker()
+        cw.delete_load_balancer(_load_balancer_mock, cascade=True)
+
+        mock_lb_repo_get.assert_called_once_with(
+            _db_session,
+            id=LB_ID)
+
+        # Check load_certificates_data called and error is raised
+        # Error must be ignored because it is not critical for current flow
+        mock_load_tls_cert.assert_called_once()
+
+        listener_list = [{constants.LISTENER_ID: LISTENER_ID,
+                          constants.LOADBALANCER_ID: LB_ID,
+                          constants.PROJECT_ID: PROJECT_ID,
+                          "default_tls_container_ref": TLS_CERT_ID}]
+
+        (cw.services_controller.run_poster.
+            assert_called_once_with(
+                flow_utils.get_cascade_delete_load_balancer_flow,
+                _load_balancer_mock, listener_list, [],
+                store={constants.LOADBALANCER: _load_balancer_mock,
+                       constants.LOADBALANCER_ID: LB_ID,
+                       constants.SERVER_GROUP_ID:
+                           _db_load_balancer_mock.server_group_id,
+                       constants.PROJECT_ID: _db_load_balancer_mock.project_id,
+                       })
+         )
+
+        _listener_mock.reset_mock()
+
     @mock.patch('octavia.db.repositories.ListenerRepository.get_all',
                 return_value=([_listener_mock], None))
     def test_update_load_balancer(self,

octavia/tests/unit/network/drivers/neutron/test_allowed_address_pairs.py

@@ -122,6 +122,28 @@ class TestAllowedAddressPairsDriver(base.TestCase):
         delete_port.assert_has_calls(calls, any_order=True)
         delete_sec_grp.assert_called_once_with(sec_grp_id)
 
+    def test_deallocate_vip_no_vrrp_port(self):
+        lb = dmh.generate_load_balancer_tree()
+        lb.vip.load_balancer = lb
+        # amphora 0 doesn't have a vrrp_port_id
+        lb.amphorae[0].vrrp_port_id = None
+        vip = lb.vip
+        sec_grp_id = 'lb-sec-grp1'
+        show_port = self.driver.network_proxy.get_port
+        show_port.return_value = Port(
+            device_owner=allowed_address_pairs.OCTAVIA_OWNER)
+        delete_port = self.driver.network_proxy.delete_port
+        delete_sec_grp = self.driver.network_proxy.delete_security_group
+        list_security_groups = self.driver.network_proxy.find_security_group
+        list_security_groups.return_value = SecurityGroup(id=sec_grp_id)
+        self.driver.deallocate_vip(vip)
+        # not called for lb.amphorae[0]
+        calls = [mock.call(vip.port_id),
+                 mock.call(lb.amphorae[1].vrrp_port_id)]
+        delete_port.assert_has_calls(calls, any_order=True)
+        self.assertEqual(2, delete_port.call_count)
+        delete_sec_grp.assert_called_once_with(sec_grp_id)
+
     def test_deallocate_vip_no_port(self):
         lb = dmh.generate_load_balancer_tree()
         lb.vip.load_balancer = lb
@@ -1076,7 +1098,8 @@ class TestAllowedAddressPairsDriver(base.TestCase):
         fake_rules = [
             {'id': 'rule-80', 'port_range_max': 80, 'protocol': 'tcp',
              'remote_ip_prefix': '10.0.101.0/24'},
-            {'id': 'rule-22', 'port_range_max': 22, 'protocol': 'tcp'}
+            {'id': 'rule-22', 'port_range_max': 22, 'protocol': 'tcp'},
+            {'id': 'rule-None', 'port_range_max': 22},
         ]
         list_rules = self.driver.network_proxy.security_group_rules
         list_rules.return_value = fake_rules

{octavia-13.0.0.dist-info → octavia-13.0.1.dist-info}/AUTHORS

@@ -69,6 +69,7 @@ Elena Ezhova <eezhova@mirantis.com>
 EranRaichstein <eranra@il.ibm.com>
 Erik Olof Gunnar Andersson <eandersson@blizzard.com>
 Evan Gray <evanscottgray@gmail.com>
+Evgeniy Bykov <chypakabre@gmail.com>
 Evgeny Fedoruk <evgenyf@radware.com>
 Fei Long Wang <flwang@catalyst.net.nz>
 Fernando Royo <froyo@redhat.com>
@@ -101,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>
@@ -159,6 +161,7 @@ Nakul Dahiwade <nakul.dahiwade@intel.com>
 Nam Nguyen Hoai <namnh@vn.fujitsu.com>
 Ngo Quoc Cuong <cuongnq@vn.fujitsu.com>
 Nguyen Hai <nguyentrihai93@gmail.com>
+Nguyen Ngoc Hieu <hieunn23@fpt.com>
 Nguyen Van Trung <trungnv@vn.fujitsu.com>
 Nir Magnezi <nmagnezi@redhat.com>
 Noboru Iwamatsu <n_iwamatsu@jp.fujitsu.com>
@@ -185,6 +188,8 @@ Santhosh Fernandes <santhosh.fernandes@gmail.com>
 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>
@@ -198,6 +203,7 @@ Stephen Balukoff <stephen@balukoff.com>
 Stephen Finucane <stephenfin@redhat.com>
 Susanne Balle <sleipnir012@gmail.com>
 Sven Wegener <sven.wegener@inovex.de>
+Takashi Kajinami <kajinamit@oss.nttdata.com>
 Takashi Kajinami <tkajinam@redhat.com>
 Takashi Natsume <takanattie@gmail.com>
 Tatsuma Matsuki <matsuki.tatsuma@jp.fujitsu.com>
@@ -214,6 +220,7 @@ Tuan Do Anh <tuanda@vn.fujitsu.com>
 Vadim Ponomarev <velizarx@gmail.com>
 Valeria Perelman <perelman@il.ibm.com>
 Van Hung Pham <hungpv@vn.fujitsu.com>
+Vasyl Saienko <vsaienko@mirantis.com>
 Vieri <15050873171@163.com>
 Vlad Gusev <vlad.esten@gmail.com>
 Vu Cong Tuan <tuanvc@vn.fujitsu.com>
@@ -276,6 +283,7 @@ ptoohill1 <phillip.toohill@rackspace.com>
 qinchunhua <qin.chunhua@zte.com.cn>
 rajat29 <rajat.sharma@nectechnologies.in>
 ramboman <lijie@unitedstack.com>
+ricolin <rlin@vexxhost.com>
 root <liusu@chinac.com>
 root <sandyada@redhat.com>
 sapd <saphi070@gmail.com>

octavia-13.0.1.dist-info/METADATA

@@ -0,0 +1,155 @@
+Metadata-Version: 2.1
+Name: octavia
+Version: 13.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.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Requires-Python: >=3.8
+License-File: LICENSE
+License-File: AUTHORS
+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 >=4.4.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: simplejson >=3.13.2
+Requires-Dist: setproctitle >=1.1.10
+Requires-Dist: python-dateutil >=2.7.0
+Requires-Dist: Flask !=0.11,>=0.10
+Requires-Dist: cryptography >=3.0
+Requires-Dist: gunicorn >=19.9.0
+Requires-Dist: Werkzeug >=0.14.1
+Requires-Dist: pyroute2 >=0.5.14 ; (sys_platform!='win32')
+Provides-Extra: redis
+Requires-Dist: redis >=2.10.0 ; extra == 'redis'
+Provides-Extra: test
+Requires-Dist: hacking <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.12 ; extra == 'test'
+Requires-Dist: python-subunit >=1.0.0 ; extra == 'test'
+Requires-Dist: oslotest >=3.2.0 ; extra == 'test'
+Requires-Dist: pylint <=3.0.4,>=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'
+Provides-Extra: zookeeper
+Requires-Dist: kazoo >=2.6.0 ; extra == 'zookeeper'
+Requires-Dist: zake >=0.1.6 ; extra == 'zookeeper'
+
+========================
+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.
+