Merge "implement blueprint floating-ip-notification."

openstack/nova

Code Issues Proposed changes

Browse Source

This commit is contained in:

Jenkins

2012年05月09日 20:32:56 +00:00

committed by Gerrit Code Review

parent 51dc42ff41 7b641e9c07

commit 27873b4196

2 changed files with 31 additions and 4 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

27
nova/network/manager.py

View File

@@ -62,6 +62,7 @@ from nova import log as logging

from nova import manager

from nova.network import api as network_api

from nova.network import model as network_model

from nova.notifier import api as notifier

from nova.openstack.common import cfg

from nova.openstack.common import importutils

import nova.policy

@@ -402,9 +403,16 @@ class FloatingIP(object):

context.project_id)

raise exception.QuotaError(code='AddressLimitExceeded')

pool = pool or FLAGS.default_floating_pool

return self.db.floating_ip_allocate_address(context,

floating_ip = self.db.floating_ip_allocate_address(context,

project_id,

pool)

payload = dict(project_id=project_id, floating_ip=floating_ip)

notifier.notify(context,

notifier.publisher_id("network"),

'network.floating_ip.allocate',

notifier.INFO, payload)

return floating_ip

@wrap_check_policy

def deallocate_floating_ip(self, context, address,

@@ -427,6 +435,12 @@ class FloatingIP(object):

# clean up any associated DNS entries

self._delete_all_entries_for_ip(context,

floating_ip['address'])

payload = dict(project_id=floating_ip['project_id'],

floating_ip=floating_ip['address'])

notifier.notify(context,

notifier.publisher_id("network"),

'network.floating_ip.deallocate',

notifier.INFO, payload=payload)

self.db.floating_ip_deallocate(context, address)

@@ -494,6 +508,12 @@ class FloatingIP(object):

if "Cannot find device" in str(e):

LOG.error(_('Interface %(interface)s not found'), locals())

raise exception.NoFloatingIpInterface(interface=interface)

payload = dict(project_id=context.project_id,

floating_ip=floating_address)

notifier.notify(context,

notifier.publisher_id("network"),

'network.floating_ip.associate',

notifier.INFO, payload=payload)

@wrap_check_policy

def disassociate_floating_ip(self, context, address,

@@ -546,6 +566,11 @@ class FloatingIP(object):

# go go driver time

self.l3driver.remove_floating_ip(address, fixed_address, interface)

payload = dict(project_id=context.project_id, floating_ip=address)

notifier.notify(context,

notifier.publisher_id("network"),

'network.floating_ip.disassociate',

notifier.INFO, payload=payload)

@wrap_check_policy

def get_floating_ip(self, context, id):

8
nova/tests/network/test_manager.py

View File

@@ -552,7 +552,7 @@ class VlanNetworkTestCase(test.TestCase):

is_admin=False)

def fake1(*args, **kwargs):

return {'address': '10.0.0.1'}

return {'address': '10.0.0.1', 'project_id': ctxt.project_id}

def fake2(*args, **kwargs):

return 25

@@ -584,7 +584,8 @@ class VlanNetworkTestCase(test.TestCase):

return {'address': '10.0.0.1', 'fixed_ip_id': 1}

def fake3(*args, **kwargs):

return {'address': '10.0.0.1', 'fixed_ip_id': None}

return {'address': '10.0.0.1', 'fixed_ip_id': None,

'project_id': ctxt.project_id}

self.stubs.Set(self.network.db, 'floating_ip_deallocate', fake1)

self.stubs.Set(self.network, '_floating_ip_owned_by_project', fake1)

@@ -740,7 +741,8 @@ class VlanNetworkTestCase(test.TestCase):

return {'address': '10.0.0.1',

'pool': 'nova',

'interface': 'eth0',

'fixed_ip_id': 1}

'fixed_ip_id': 1,

'project_id': ctxt.project_id}

# fixed ip with remote host

def fake4(*args, **kwargs):