x/vmware-nsx
Code Issues Proposed changes

Merge "Fix typo"

Browse Source
This commit is contained in:
Jenkins 2013-03-10 18:58:47 +00:00 committed by Gerrit Code Review
commit b25090a4c4
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
quantum/plugins/services/agent_loadbalancer/plugin.py
View File

@ -267,7 +267,6 @@ class LoadBalancerPlugin(loadbalancer_db.LoadBalancerPluginDb):
vip = self.get_vip(context, id) vip = self.get_vip(context, id)
super(LoadBalancerPlugin, self).delete_vip(context, id) super(LoadBalancerPlugin, self).delete_vip(context, id)
self.agent_rpc.destroy_pool(context, vip['pool_id']) self.agent_rpc.destroy_pool(context, vip['pool_id'])
pass
def create_pool(self, context, pool): def create_pool(self, context, pool):
p = super(LoadBalancerPlugin, self).create_pool(context, pool) p = super(LoadBalancerPlugin, self).create_pool(context, pool)

4
quantum/tests/unit/services/agent_loadbalancer/test_plugin.py
View File

@ -250,13 +250,13 @@ class TestLoadBalancerPluginNotificationWrapper(TestLoadBalancerPluginBase):
constants.PENDING_UPDATE constants.PENDING_UPDATE
) )
def t2est_delete_vip(self): def test_delete_vip(self):
with self.subnet() as subnet: with self.subnet() as subnet:
with self.pool(subnet=subnet) as pool: with self.pool(subnet=subnet) as pool:
with self.vip(pool=pool, subnet=subnet, no_delete=True) as vip: with self.vip(pool=pool, subnet=subnet, no_delete=True) as vip:
self.mock_api.reset_mock() self.mock_api.reset_mock()
ctx = context.get_admin_context() ctx = context.get_admin_context()
self.plugin_instance.delete_vip(context, vip['vip']['id']) self.plugin_instance.delete_vip(ctx, vip['vip']['id'])
self.mock_api.destroy_pool.assert_called_once_with( self.mock_api.destroy_pool.assert_called_once_with(
mock.ANY, mock.ANY,
vip['vip']['pool_id'] vip['vip']['pool_id']