diff options
| author | Cerberus <matt.dietz@rackspace.com> | 2010-12-20 18:00:26 -0600 |
|---|---|---|
| committer | Cerberus <matt.dietz@rackspace.com> | 2010-12-20 18:00:26 -0600 |
| commit | 7f83b9d963fee2d65b267542c7cd8c48df23a1ef (patch) | |
| tree | 9d351ad5389eb8e6b50e7fd0301db40bb52220f2 /nova/db | |
| parent | f3f5b58f395794b3933cc3489ff37ce08002de89 (diff) | |
| parent | 086f2d87be3c56ac8dafaf4551096868d57454db (diff) | |
| download | nova-7f83b9d963fee2d65b267542c7cd8c48df23a1ef.tar.gz nova-7f83b9d963fee2d65b267542c7cd8c48df23a1ef.tar.xz nova-7f83b9d963fee2d65b267542c7cd8c48df23a1ef.zip | |
Merge from trunk
Diffstat (limited to 'nova/db')
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index 0614c14e8..e9a87944d 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -528,6 +528,8 @@ def fixed_ip_update(context, address, values): #TODO(gundlach): instance_create and volume_create are nearly identical #and should be refactored. I expect there are other copy-and-paste #functions between the two of them as well. + + @require_context def instance_create(context, values): """Create a new Instance record in the database. @@ -913,6 +915,8 @@ def network_get(context, network_id, session=None): # NOTE(vish): pylint complains because of the long method name, but # it fits with the names of the rest of the methods # pylint: disable-msg=C0103 + + @require_admin_context def network_get_associated_fixed_ips(context, network_id): session = get_session() |