openstack
/
octavia
Code Issues Proposed changes

Merge "Handle listener not found during loadbalancer status update" into stable/victoria

This commit is contained in:
Zuul 2021-01-14 14:47:05 +00:00 committed by Gerrit Code Review
parent e893549a2b b0b3086680
commit 6835663db5
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
octavia/db/repositories.py
View File

@ -1148,6 +1148,9 @@ class ListenerRepository(BaseRepository):
resource.tags = tags
listener_db = session.query(self.model_class).filter_by(
id=id).first()
if not listener_db:
raise exceptions.NotFound(
resource=data_models.Listener._name(), id=id)
# Verify any newly specified default_pool_id exists
default_pool_id = model_kwargs.get('default_pool_id')
if default_pool_id:

4
octavia/tests/functional/db/test_repositories.py
View File

@ -2952,6 +2952,10 @@ class TestListenerRepositoryTest(BaseRepositoryTest):
new_listener = self.listener_repo.get(self.session, id=listener.id)
self.assertIn(container1_dm, new_listener.sni_containers)
def test_update_bad_id(self):
self.assertRaises(exceptions.NotFound, self.listener_repo.update,
self.session, id=uuidutils.generate_uuid())
def test_delete(self):
listener = self.create_listener(self.FAKE_UUID_1, 80)
self.listener_repo.delete(self.session, id=listener.id)