openstack/neutron
Code Issues Proposed changes

Merge "LBaaS: add delete_health_monitor() to driver API"

Browse Source
This commit is contained in:
Jenkins 2013-07-23 19:24:43 +00:00 committed by Gerrit Code Review
commit f10777b398
5 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
neutron/services/loadbalancer/drivers/abstract_driver.py
View File

@ -120,6 +120,13 @@ class LoadBalancerAbstractDriver(object):
pool_id):
pass
@abc.abstractmethod
def delete_health_monitor(self, context, health_monitor):
"""Driver may call the code below in order to delete the monitor.
self.plugin._delete_db_health_monitor(context, health_monitor["id"])
"""
pass
@abc.abstractmethod
def create_pool_health_monitor(self, context,
health_monitor,

3
neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py
View File

@ -357,5 +357,8 @@ class HaproxyOnHostPluginDriver(abstract_driver.LoadBalancerAbstractDriver):
def create_health_monitor(self, context, health_monitor):
pass
def delete_health_monitor(self, context, health_monitor):
self.plugin._delete_db_health_monitor(context, health_monitor["id"])
def stats(self, context, pool_id):
pass

4
neutron/services/loadbalancer/drivers/noop/noop_driver.py
View File

@ -89,6 +89,10 @@ class NoopLbaaSDriver(abstract_driver.LoadBalancerAbstractDriver):
pool_association):
pass
@log.log
def delete_health_monitor(self, context, health_monitor):
self.plugin._delete_db_health_monitor(context, health_monitor["id"])
@log.log
def create_pool_health_monitor(self, context,
health_monitor, pool_id):

4
neutron/services/loadbalancer/plugin.py
View File

@ -185,6 +185,9 @@ class LoadBalancerPlugin(loadbalancer_db.LoadBalancerPluginDb,
hm_id,
pool_id)
def _delete_db_health_monitor(self, context, id):
super(LoadBalancerPlugin, self).delete_health_monitor(context, id)
def delete_health_monitor(self, context, id):
with context.session.begin(subtransactions=True):
hm = self.get_health_monitor(context, id)
@ -195,6 +198,7 @@ class LoadBalancerPlugin(loadbalancer_db.LoadBalancerPluginDb,
self.driver.delete_pool_health_monitor(context,
hm,
assoc['pool_id'])
self.driver.delete_health_monitor(context, hm)
def create_pool_health_monitor(self, context, health_monitor, pool_id):
retval = super(LoadBalancerPlugin, self).create_pool_health_monitor(

8
neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py
View File

@ -859,10 +859,18 @@ class TestLoadBalancer(LoadBalancerPluginDbTestCase):
def test_delete_healthmonitor(self):
with self.health_monitor(no_delete=True) as monitor:
ctx = context.get_admin_context()
qry = ctx.session.query(ldb.HealthMonitor)
qry = qry.filter_by(id=monitor['health_monitor']['id'])
self.assertIsNotNone(qry.first())
req = self.new_delete_request('health_monitors',
monitor['health_monitor']['id'])
res = req.get_response(self.ext_api)
self.assertEqual(res.status_int, 204)
qry = ctx.session.query(ldb.HealthMonitor)
qry = qry.filter_by(id=monitor['health_monitor']['id'])
self.assertIsNone(qry.first())
def test_delete_healthmonitor_cascade_deletion_of_associations(self):
with self.health_monitor(type='HTTP', no_delete=True) as monitor: