diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-10-24 15:20:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-10-24 15:20:27 +0000 |
| commit | 9e35b2bbca552b303ab4d478c4174e815eb56600 (patch) | |
| tree | 8933b8096e357161a78c90713be31df552b55363 /nova/db | |
| parent | df1fb2978c854beb58646406796c2bef2bfb047f (diff) | |
| parent | c39dbb53bcbc0df82d9052248ee8029613858813 (diff) | |
Merge "Fix and enable pep8 E502, E712"
Diffstat (limited to 'nova/db')
3 files changed, 5 insertions, 5 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index a70488bd8..e7156e6fa 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -1146,7 +1146,7 @@ def fixed_ip_disassociate_all_by_timeout(context, host, time): join((models.Network, models.Network.id == models.FixedIp.network_id)).\ join((models.Instance, - models.Instance.uuid == \ + models.Instance.uuid == models.FixedIp.instance_uuid)).\ filter(host_filter).\ all() @@ -4393,7 +4393,7 @@ def _instance_type_extra_specs_get_query(context, flavor_id, subquery() return model_query(context, models.InstanceTypeExtraSpecs, session=session, read_deleted="no").\ - filter(models.InstanceTypeExtraSpecs.\ + filter(models.InstanceTypeExtraSpecs. instance_type_id.in_(t)) diff --git a/nova/db/sqlalchemy/migrate_repo/versions/089_add_volume_id_mappings.py b/nova/db/sqlalchemy/migrate_repo/versions/089_add_volume_id_mappings.py index 1dd47aec2..d878e250b 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/089_add_volume_id_mappings.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/089_add_volume_id_mappings.py @@ -82,7 +82,7 @@ def upgrade(migrate_engine): if migrate_engine.name == "mysql": migrate_engine.execute("ALTER TABLE volume_id_mappings Engine=InnoDB") - migrate_engine.execute("ALTER TABLE snapshot_id_mappings "\ + migrate_engine.execute("ALTER TABLE snapshot_id_mappings " "Engine=InnoDB") volumes = Table('volumes', meta, autoload=True) diff --git a/nova/db/sqlalchemy/migrate_repo/versions/112_update_deleted_instance_data.py b/nova/db/sqlalchemy/migrate_repo/versions/112_update_deleted_instance_data.py index e491e08fe..27ad13e91 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/112_update_deleted_instance_data.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/112_update_deleted_instance_data.py @@ -30,7 +30,7 @@ def upgrade(migrate_engine): meta.bind = migrate_engine instances = Table('instances', meta, autoload=True) - instance_list = list(instances.select().\ + instance_list = list(instances.select(). where(instances.c.deleted == True).execute()) for table_name in TABLES: table = Table(table_name, meta, autoload=True) @@ -55,7 +55,7 @@ def downgrade(migrate_engine): meta.bind = migrate_engine instances = Table('instances', meta, autoload=True) - instance_list = list(instances.select().\ + instance_list = list(instances.select(). where(instances.c.deleted == True).execute()) for table_name in TABLES: table = Table(table_name, meta, autoload=True) |