octavia 14.0.0.0rc1__py3-none-any.whl → 14.0.2__py3-none-any.whl

octavia/tests/unit/api/common/test_pagination.py

@@ -103,6 +103,16 @@ class TestPaginationHelper(base.TestCase):
         helper.apply(query_mock, models.LoadBalancer)
         self.assertEqual(params, helper.filters)
 
+    @mock.patch('octavia.api.common.pagination.request')
+    def test_filter_with_booleans(self, request_mock):
+        params = {'backup': 'True', 'admin_state_up': 'false'}
+        expected_params = {'backup': True, 'enabled': False}
+        helper = pagination.PaginationHelper(params)
+        query_mock = mock.MagicMock()
+
+        helper.apply(query_mock, models.Member)
+        self.assertEqual(expected_params, helper.filters)
+
     @mock.patch('octavia.api.common.pagination.request')
     def test_filter_mismatched_params(self, request_mock):
         params = {
@@ -227,12 +237,46 @@ class TestPaginationHelper(base.TestCase):
         helper = pagination.PaginationHelper(params)
         links = helper._make_links(model_list)
         self.assertEqual(links[0].rel, "previous")
+        self.assertEqual(
+            links[0].href,
+            ("{base_uri}{path}?limit={limit}&marker={marker}"
+             "&page_reverse=True").format(
+                base_uri=api_base_uri,
+                path=request_mock.path,
+                limit=params['limit'],
+                marker=member1.id
+            ))
+        self.assertEqual(links[1].rel, "next")
         self.assertEqual(
             links[1].href,
             "{base_uri}{path}?limit={limit}&marker={marker}".format(
                 base_uri=api_base_uri,
                 path=request_mock.path,
                 limit=params['limit'],
+                marker=member1.id))
+
+    @mock.patch('octavia.api.common.pagination.request')
+    def test_make_links_with_zero_limit(self, request_mock):
+        request_mock.path = "/lbaas/v2/pools/1/members"
+        request_mock.path_url = "http://localhost" + request_mock.path
+        api_base_uri = "https://127.0.0.1"
+        conf = self.useFixture(oslo_fixture.Config(cfg.CONF))
+        conf.config(group='api_settings', api_base_uri=api_base_uri)
+        member1 = models.Member()
+        member1.id = uuidutils.generate_uuid()
+        model_list = [member1]
+
+        params = {'limit': 0, 'marker': member1.id}
+        helper = pagination.PaginationHelper(params)
+        links = helper._make_links(model_list)
+        self.assertEqual(links[0].rel, "previous")
+        self.assertEqual(
+            links[0].href,
+            ("{base_uri}{path}?limit={limit}&marker={marker}"
+             "&page_reverse=True").format(
+                base_uri=api_base_uri,
+                path=request_mock.path,
+                limit=None,
                 marker=member1.id
             ))
         self.assertEqual(links[1].rel, "next")
@@ -241,5 +285,38 @@ class TestPaginationHelper(base.TestCase):
             "{base_uri}{path}?limit={limit}&marker={marker}".format(
                 base_uri=api_base_uri,
                 path=request_mock.path,
-                limit=params['limit'],
+                limit=None,
+                marker=member1.id))
+
+    @mock.patch('octavia.api.common.pagination.request')
+    def test_make_links_with_negative_limit(self, request_mock):
+        request_mock.path = "/lbaas/v2/pools/1/members"
+        request_mock.path_url = "http://localhost" + request_mock.path
+        api_base_uri = "https://127.0.0.1"
+        conf = self.useFixture(oslo_fixture.Config(cfg.CONF))
+        conf.config(group='api_settings', api_base_uri=api_base_uri)
+        member1 = models.Member()
+        member1.id = uuidutils.generate_uuid()
+        model_list = [member1]
+
+        params = {'limit': -1, 'marker': member1.id}
+        helper = pagination.PaginationHelper(params)
+        links = helper._make_links(model_list)
+        self.assertEqual(links[0].rel, "previous")
+        self.assertEqual(
+            links[0].href,
+            ("{base_uri}{path}?limit={limit}&marker={marker}"
+             "&page_reverse=True").format(
+                base_uri=api_base_uri,
+                path=request_mock.path,
+                limit=None,
+                marker=member1.id
+            ))
+        self.assertEqual(links[1].rel, "next")
+        self.assertEqual(
+            links[1].href,
+            "{base_uri}{path}?limit={limit}&marker={marker}".format(
+                base_uri=api_base_uri,
+                path=request_mock.path,
+                limit=None,
                 marker=member1.id))

octavia/tests/unit/cmd/test_prometheus_proxy.py

@@ -147,6 +147,7 @@ class TestPrometheusProxyCMD(base.TestCase):
         mock_http.shutdown.assert_called_once()
 
     @mock.patch('threading.Thread')
+    @mock.patch('http.server.ThreadingHTTPServer.__init__')
     @mock.patch('http.server.ThreadingHTTPServer.serve_forever')
     @mock.patch('octavia.amphorae.backends.utils.network_namespace.'
                 'NetworkNamespace.__exit__')
@@ -155,12 +156,18 @@ class TestPrometheusProxyCMD(base.TestCase):
     @mock.patch('octavia.cmd.prometheus_proxy.EXIT_EVENT')
     @mock.patch('octavia.cmd.prometheus_proxy.SignalHandler')
     def test_main(self, mock_signal_handler, mock_exit_event, mock_netns_enter,
-                  mock_netns_exit, mock_serve_forever, mock_thread):
+                  mock_netns_exit, mock_serve_forever, mock_server_init,
+                  mock_thread):
 
         mock_exit_event.is_set.side_effect = [False, False, True]
         mock_netns_enter.side_effect = [Exception('boom'), True]
 
+        mock_server_init.return_value = None
+
         prometheus_proxy.main()
 
         mock_signal_handler.assert_called_once()
+        mock_server_init.assert_called_once_with(
+            ('127.0.0.1', 9102),
+            prometheus_proxy.PrometheusProxy)
         mock_serve_forever.assert_called_once()

octavia/tests/unit/controller/worker/v2/flows/test_listener_flows.py

@@ -44,15 +44,14 @@ class TestListenerFlows(base.TestCase):
 
         self.assertIn(constants.LISTENERS, listener_flow.requires)
         self.assertIn(constants.LOADBALANCER_ID, listener_flow.requires)
-        self.assertIn(constants.AMPHORAE_STATUS, listener_flow.requires)
 
         self.assertIn(constants.AMPHORAE_NETWORK_CONFIG,
                       listener_flow.provides)
         self.assertIn(constants.AMPHORAE, listener_flow.provides)
         self.assertIn(constants.AMPHORA_FIREWALL_RULES, listener_flow.provides)
 
-        self.assertEqual(3, len(listener_flow.requires))
-        self.assertEqual(3, len(listener_flow.provides))
+        self.assertEqual(2, len(listener_flow.requires))
+        self.assertEqual(4, len(listener_flow.provides))
 
     def test_get_delete_listener_flow(self, mock_get_net_driver):
         flavor_dict = {
@@ -66,15 +65,14 @@ class TestListenerFlows(base.TestCase):
         self.assertIn(constants.LISTENER, listener_flow.requires)
         self.assertIn(constants.LOADBALANCER_ID, listener_flow.requires)
         self.assertIn(constants.PROJECT_ID, listener_flow.requires)
-        self.assertIn(constants.AMPHORAE_STATUS, listener_flow.requires)
 
         self.assertIn(constants.AMPHORAE_NETWORK_CONFIG,
                       listener_flow.provides)
         self.assertIn(constants.AMPHORAE, listener_flow.provides)
         self.assertIn(constants.AMPHORA_FIREWALL_RULES, listener_flow.provides)
 
-        self.assertEqual(4, len(listener_flow.requires))
-        self.assertEqual(3, len(listener_flow.provides))
+        self.assertEqual(3, len(listener_flow.requires))
+        self.assertEqual(4, len(listener_flow.provides))
 
     def test_get_delete_listener_internal_flow(self, mock_get_net_driver):
         flavor_dict = {
@@ -88,15 +86,14 @@ class TestListenerFlows(base.TestCase):
 
         self.assertIn(constants.LOADBALANCER_ID, listener_flow.requires)
         self.assertIn(constants.PROJECT_ID, listener_flow.requires)
-        self.assertIn(constants.AMPHORAE_STATUS, listener_flow.requires)
 
         self.assertIn(constants.AMPHORAE_NETWORK_CONFIG,
                       listener_flow.provides)
         self.assertIn(constants.AMPHORAE, listener_flow.provides)
         self.assertIn(constants.AMPHORA_FIREWALL_RULES, listener_flow.provides)
 
-        self.assertEqual(3, len(listener_flow.requires))
-        self.assertEqual(3, len(listener_flow.provides))
+        self.assertEqual(2, len(listener_flow.requires))
+        self.assertEqual(4, len(listener_flow.provides))
 
     def test_get_update_listener_flow(self, mock_get_net_driver):
         flavor_dict = {
@@ -112,15 +109,14 @@ class TestListenerFlows(base.TestCase):
         self.assertIn(constants.UPDATE_DICT, listener_flow.requires)
         self.assertIn(constants.LISTENERS, listener_flow.requires)
         self.assertIn(constants.LOADBALANCER_ID, listener_flow.requires)
-        self.assertIn(constants.AMPHORAE_STATUS, listener_flow.requires)
 
         self.assertIn(constants.AMPHORAE_NETWORK_CONFIG,
                       listener_flow.provides)
         self.assertIn(constants.AMPHORAE, listener_flow.provides)
         self.assertIn(constants.AMPHORA_FIREWALL_RULES, listener_flow.provides)
 
-        self.assertEqual(5, len(listener_flow.requires))
-        self.assertEqual(3, len(listener_flow.provides))
+        self.assertEqual(4, len(listener_flow.requires))
+        self.assertEqual(4, len(listener_flow.provides))
 
     def test_get_create_all_listeners_flow(self, mock_get_net_driver):
         flavor_dict = {
@@ -131,12 +127,11 @@ class TestListenerFlows(base.TestCase):
         self.assertIsInstance(listeners_flow, flow.Flow)
         self.assertIn(constants.LOADBALANCER, listeners_flow.requires)
         self.assertIn(constants.LOADBALANCER_ID, listeners_flow.requires)
-        self.assertIn(constants.AMPHORAE_STATUS, listeners_flow.requires)
         self.assertIn(constants.LOADBALANCER, listeners_flow.provides)
         self.assertIn(constants.AMPHORAE_NETWORK_CONFIG,
                       listeners_flow.provides)
         self.assertIn(constants.AMPHORAE, listeners_flow.provides)
         self.assertIn(constants.AMPHORA_FIREWALL_RULES,
                       listeners_flow.provides)
-        self.assertEqual(3, len(listeners_flow.requires))
-        self.assertEqual(5, len(listeners_flow.provides))
+        self.assertEqual(2, len(listeners_flow.requires))
+        self.assertEqual(6, len(listeners_flow.provides))

octavia/tests/unit/controller/worker/v2/flows/test_load_balancer_flows.py

@@ -344,7 +344,6 @@ class TestLoadBalancerFlows(base.TestCase):
         self.assertIn(constants.FLAVOR, failover_flow.requires)
         self.assertIn(constants.LOADBALANCER, failover_flow.requires)
         self.assertIn(constants.LOADBALANCER_ID, failover_flow.requires)
-        self.assertIn(constants.AMPHORAE_STATUS, failover_flow.requires)
 
         self.assertIn(constants.UPDATED_PORTS, failover_flow.provides)
         self.assertIn(constants.AMPHORA, failover_flow.provides)
@@ -364,9 +363,9 @@ class TestLoadBalancerFlows(base.TestCase):
         self.assertIn(constants.SUBNET, failover_flow.provides)
         self.assertIn(constants.NEW_AMPHORAE, failover_flow.provides)
 
-        self.assertEqual(7, len(failover_flow.requires),
+        self.assertEqual(6, len(failover_flow.requires),
                          failover_flow.requires)
-        self.assertEqual(16, len(failover_flow.provides),
+        self.assertEqual(17, len(failover_flow.provides),
                          failover_flow.provides)
 
     @mock.patch('octavia.common.rpc.NOTIFIER',
@@ -424,7 +423,6 @@ class TestLoadBalancerFlows(base.TestCase):
         self.assertIn(constants.FLAVOR, failover_flow.requires)
         self.assertIn(constants.LOADBALANCER, failover_flow.requires)
         self.assertIn(constants.LOADBALANCER_ID, failover_flow.requires)
-        self.assertIn(constants.AMPHORAE_STATUS, failover_flow.requires)
 
         self.assertIn(constants.UPDATED_PORTS, failover_flow.provides)
         self.assertIn(constants.AMPHORA, failover_flow.provides)
@@ -445,9 +443,9 @@ class TestLoadBalancerFlows(base.TestCase):
         self.assertIn(constants.SUBNET, failover_flow.provides)
         self.assertIn(constants.NEW_AMPHORAE, failover_flow.provides)
 
-        self.assertEqual(7, len(failover_flow.requires),
+        self.assertEqual(6, len(failover_flow.requires),
                          failover_flow.requires)
-        self.assertEqual(16, len(failover_flow.provides),
+        self.assertEqual(17, len(failover_flow.provides),
                          failover_flow.provides)
 
     @mock.patch('octavia.common.rpc.NOTIFIER',

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,

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

@@ -1380,6 +1380,10 @@ class TestNetworkTasks(base.TestCase):
         AMP_ID = uuidutils.generate_uuid()
         mock_driver = mock.MagicMock()
         mock_get_net_driver.return_value = mock_driver
+        amphora_config_mock = mock.MagicMock()
+        mock_driver.get_network_configs.return_value = {
+            "amphora_uuid1": amphora_config_mock
+        }
         mock_amp_get.return_value = 'mock amphora'
         mock_lb_get.return_value = 'mock load balancer'
 
@@ -1391,6 +1395,9 @@ class TestNetworkTasks(base.TestCase):
             'mock load balancer', amphora='mock amphora')
         mock_amp_get.assert_called_once_with(mock_get_session(), id=AMP_ID)
         mock_lb_get.assert_called_once_with(mock_get_session(), id=LB_ID)
+        amphora_config_mock.to_dict.assert_called_once_with(
+            recurse=True, calling_classes=[o_data_models.LoadBalancer]
+        )
 
     @mock.patch('octavia.db.repositories.LoadBalancerRepository.get')
     @mock.patch('octavia.db.api.get_session', return_value=_session_mock)
@@ -1399,10 +1406,17 @@ class TestNetworkTasks(base.TestCase):
         mock_driver = mock.MagicMock()
         mock_lb_get.return_value = LB
         mock_get_net_driver.return_value = mock_driver
+        amphora_config_mock = mock.MagicMock()
+        mock_driver.get_network_configs.return_value = {
+            "amphora_uuid1": amphora_config_mock
+        }
         lb = o_data_models.LoadBalancer()
         net_task = network_tasks.GetAmphoraeNetworkConfigs()
         net_task.execute(self.load_balancer_mock)
         mock_driver.get_network_configs.assert_called_once_with(lb)
+        amphora_config_mock.to_dict.assert_called_once_with(
+            recurse=True, calling_classes=[o_data_models.LoadBalancer]
+        )
 
     def test_retrieve_portids_on_amphora_except_lb_network(
             self, mock_get_net_driver):
@@ -1526,6 +1540,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):
@@ -1670,7 +1735,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)
@@ -1678,7 +1747,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()
@@ -804,6 +804,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

@@ -1071,7 +1071,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-14.0.0.0rc1.dist-info → octavia-14.0.2.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>
@@ -145,6 +147,7 @@ Martin Chlumsky <martin.chlumsky@ubisoft.com>
 Masayuki Igawa <masayuki@igawa.io>
 Matt Alline <matt.alline@gmail.com>
 Maximilian Stinsky <maximilian.stinsky@gec.io>
+Michael Johnson <johnosmor@gmail.com>
 Michael Johnson <johnsom@hp.com>
 Michael Johnson <johnsomor@gmail.com>
 Michal Arbet <michal.arbet@ultimum.io>
@@ -188,6 +191,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>