openstack
/
octavia
Code Issues Proposed changes

Merge "Use unique SNI identifier when building data model"

This commit is contained in:
Jenkins 2016-02-25 02:10:23 +00:00 committed by Gerrit Code Review
parent 29a151ded0 428fee9748
commit 70b8f78447
3 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
octavia/db/base_models.py
View File

@ -34,12 +34,15 @@ class OctaviaBase(models.ModelBase):
return obj.__class__.__name__ + obj.id
elif obj.__class__.__name__ in ['SessionPersistence', 'HealthMonitor']:
return obj.__class__.__name__ + obj.pool_id
elif obj.__class__.__name__ in ['ListenerStatistics', 'SNI']:
elif obj.__class__.__name__ in ['ListenerStatistics']:
return obj.__class__.__name__ + obj.listener_id
elif obj.__class__.__name__ in ['VRRPGroup', 'Vip']:
return obj.__class__.__name__ + obj.load_balancer_id
elif obj.__class__.__name__ in ['AmphoraHealth']:
return obj.__class__.__name__ + obj.amphora_id
elif obj.__class__.__name__ in ['SNI']:
return (obj.__class__.__name__ +
obj.listener_id + obj.tls_container_id)
else:
raise NotImplementedError

7
octavia/tests/functional/db/test_models.py
View File

@ -780,10 +780,10 @@ class L7RuleModelTest(base.OctaviaDBTestBase, ModelTestMixin):
self.assertIsInstance(new_l7rule.l7policy, models.L7Policy)
class DataModelConversionTest(base.OctaviaDBTestBase, ModelTestMixin):
class TestDataModelConversionTest(base.OctaviaDBTestBase, ModelTestMixin):
def setUp(self):
super(DataModelConversionTest, self).setUp()
super(TestDataModelConversionTest, self).setUp()
self.lb = self.create_load_balancer(self.session)
self.pool = self.create_pool(self.session, load_balancer_id=self.lb.id)
self.hm = self.create_health_monitor(self.session, self.pool.id)
@ -822,6 +822,9 @@ class DataModelConversionTest(base.OctaviaDBTestBase, ModelTestMixin):
return obj.__class__.__name__ + obj.load_balancer_id
elif obj.__class__.__name__ in ['AmphoraHealth']:
return obj.__class__.__name__ + obj.amphora_id
elif obj.__class__.__name__ in ['SNI']:
return (obj.__class__.__name__ +
obj.listener_id + obj.tls_container_id)
else:
raise NotImplementedError

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

@ -647,6 +647,20 @@ class ListenerRepositoryTest(BaseRepositoryTest):
self.assertRaises(exceptions.NotFound, self.create_listener,
self.FAKE_UUID_1, 80, default_pool_id=pool.id)
def test_create_2_sni_containers(self):
listener = self.create_listener(self.FAKE_UUID_1, 80)
container1 = {'listener_id': listener.id,
'tls_container_id': self.FAKE_UUID_1}
container2 = {'listener_id': listener.id,
'tls_container_id': self.FAKE_UUID_2}
container1_dm = models.SNI(**container1)
container2_dm = models.SNI(**container2)
self.sni_repo.create(self.session, **container1)
self.sni_repo.create(self.session, **container2)
new_listener = self.listener_repo.get(self.session, id=listener.id)
self.assertIn(container1_dm, new_listener.sni_containers)
self.assertIn(container2_dm, new_listener.sni_containers)
def test_update(self):
name_change = "new_listener_name"
listener = self.create_listener(self.FAKE_UUID_1, 80)