diff options
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 16 | ||||
| -rw-r--r-- | nova/tests/test_db_api.py | 3 |
2 files changed, 7 insertions, 12 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index 9213b36b3..d5f4c8e6f 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -727,7 +727,7 @@ def floating_ip_bulk_destroy(context, ips): @require_context -def floating_ip_create(context, values, session=None): +def floating_ip_create(context, values): floating_ip_ref = models.FloatingIp() floating_ip_ref.update(values) try: @@ -887,13 +887,10 @@ def floating_ip_get_by_fixed_address(context, fixed_address): @require_context -def floating_ip_get_by_fixed_ip_id(context, fixed_ip_id, session=None): - if not session: - session = get_session() - - return model_query(context, models.FloatingIp, session=session).\ - filter_by(fixed_ip_id=fixed_ip_id).\ - all() +def floating_ip_get_by_fixed_ip_id(context, fixed_ip_id): + return model_query(context, models.FloatingIp).\ + filter_by(fixed_ip_id=fixed_ip_id).\ + all() @require_context @@ -1918,8 +1915,7 @@ def instance_floating_address_get_all(context, instance_uuid): floating_ips = [] for fixed_ip in fixed_ips: - _floating_ips = floating_ip_get_by_fixed_ip_id(context, - fixed_ip['id']) + _floating_ips = floating_ip_get_by_fixed_ip_id(context, fixed_ip['id']) floating_ips += _floating_ips return floating_ips diff --git a/nova/tests/test_db_api.py b/nova/tests/test_db_api.py index e298b7e03..cfed3ab3b 100644 --- a/nova/tests/test_db_api.py +++ b/nova/tests/test_db_api.py @@ -2752,8 +2752,7 @@ class FloatingIpTestCase(test.TestCase, ModelsObjectComparatorMixin): ctxt = context.RequestContext(user_id='a', project_id='abc', is_admin=False) self.assertRaises(exception.NotAuthorized, - db.floating_ip_count_by_project, - ctxt, 'def', 'does_not_matter') + db.floating_ip_count_by_project, ctxt, 'def') def _create_fixed_ip(self, params): default_params = {'address': '192.168.0.1'} |