diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-10-30 21:24:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-10-30 21:24:48 +0000 |
| commit | 4ee5f93589168427f5168dc8198fc50f85bb9440 (patch) | |
| tree | 6a7664cd921c3489dfc43f1ea559f23801004fd0 | |
| parent | 9fa9ab181836f71f0054af41807772a209c44480 (diff) | |
| parent | 88ac5d532dfdbeeed5a5c7e295e3a5962a792e41 (diff) | |
| download | nova-4ee5f93589168427f5168dc8198fc50f85bb9440.tar.gz nova-4ee5f93589168427f5168dc8198fc50f85bb9440.tar.xz nova-4ee5f93589168427f5168dc8198fc50f85bb9440.zip | |
Merge "remove session parameter from fixed_ip_get"
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index b68b6f4cb..d68c39f6e 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -837,11 +837,17 @@ def floating_ip_destroy(context, address): def floating_ip_disassociate(context, address): session = get_session() with session.begin(): - floating_ip_ref = floating_ip_get_by_address(context, - address, - session=session) - fixed_ip_ref = fixed_ip_get(context, - floating_ip_ref['fixed_ip_id']) + floating_ip_ref = model_query(context, + models.FloatingIp, + session=session).\ + filter_by(address=address).\ + first() + if not floating_ip_ref: + raise exception.FloatingIpNotFoundForAddress(address=address) + + fixed_ip_ref = model_query(context, models.FixedIp, session=session).\ + filter_by(id=floating_ip_ref['fixed_ip_id']).\ + first() if fixed_ip_ref: fixed_ip_address = fixed_ip_ref['address'] else: @@ -1156,8 +1162,8 @@ def fixed_ip_disassociate_all_by_timeout(context, host, time): @require_context -def fixed_ip_get(context, id, session=None): - result = model_query(context, models.FixedIp, session=session).\ +def fixed_ip_get(context, id): + result = model_query(context, models.FixedIp).\ filter_by(id=id).\ first() if not result: @@ -1167,8 +1173,7 @@ def fixed_ip_get(context, id, session=None): # results? if is_user_context(context) and result['instance_uuid'] is not None: instance = instance_get_by_uuid(context.elevated(read_deleted='yes'), - result['instance_uuid'], - session) + result['instance_uuid']) authorize_project_context(context, instance.project_id) return result |