summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-08-15 07:56:07 +0000
committerGerrit Code Review <review@openstack.org>2012-08-15 07:56:07 +0000
commit47e612fec834b60fd0c9dfb945ae90a708bcf386 (patch)
treeea38786fff3aa742f9f1f4206ca2fd7a90d6c887
parentefdc248d15cf2a0308b215dccb90d0b7da6926b7 (diff)
parent55175f5cd91e8b5c87805c65cbbd89cc12c66752 (diff)
downloadnova-47e612fec834b60fd0c9dfb945ae90a708bcf386.tar.gz
nova-47e612fec834b60fd0c9dfb945ae90a708bcf386.tar.xz
nova-47e612fec834b60fd0c9dfb945ae90a708bcf386.zip
Merge "Remove assigned, but unused variables from nova/db/sqlalchemy/api.py"
-rw-r--r--nova/db/sqlalchemy/api.py4
1 files changed, 0 insertions, 4 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 5adb633e6..1c8248a53 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -729,7 +729,6 @@ def floating_ip_get(context, id):
@require_context
def floating_ip_get_pools(context):
- session = get_session()
pools = []
for result in model_query(context, models.FloatingIp.pool).distinct():
pools.append({'name': result[0]})
@@ -4496,8 +4495,6 @@ def volume_type_create(context, values):
except exception.VolumeTypeNotFoundByName:
pass
try:
- specs = values.get('extra_specs')
-
values['extra_specs'] = _metadata_refs(values.get('extra_specs'),
models.VolumeTypeExtraSpecs)
volume_type_ref = models.VolumeTypes()
@@ -4766,7 +4763,6 @@ def sm_backend_conf_get(context, sm_backend_id):
@require_admin_context
def sm_backend_conf_get_by_sr(context, sr_uuid):
- session = get_session()
result = model_query(context, models.SMBackendConf, read_deleted="yes").\
filter_by(sr_uuid=sr_uuid).\
first()