diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-01-03 19:11:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-01-03 19:11:43 +0000 |
| commit | 02f1b50fb21e6f314d69bc7888bee1c7dabaf9af (patch) | |
| tree | 28ba9084111a5a8b1767851d42b02596c6f7f921 | |
| parent | 8e217208e0ccc90ab2eb876d1662817f9346f9a2 (diff) | |
| parent | 8582a3168a309df737a345ae8895734760ed8d57 (diff) | |
Merge "Every string does not need to be internationalized"
| -rw-r--r-- | nova/db/sqlalchemy/migrate_repo/versions/059_split_rxtx_quota_into_network.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/059_split_rxtx_quota_into_network.py b/nova/db/sqlalchemy/migrate_repo/versions/059_split_rxtx_quota_into_network.py index 277c83ead..122b60d2f 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/059_split_rxtx_quota_into_network.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/059_split_rxtx_quota_into_network.py @@ -34,12 +34,12 @@ def upgrade(migrate_engine): instance_types.create_column(rxtx_factor) networks.create_column(rxtx_base) - base = migrate_engine.execute(_("select min(rxtx_cap) as min_rxtx from "\ - "instance_types where rxtx_cap > 0"))\ - .scalar() + base = migrate_engine.execute("select min(rxtx_cap) as min_rxtx from "\ + "instance_types where rxtx_cap > 0")\ + .scalar() base = base if base > 1 else 1 - update_i_type_sql = _("update instance_types set rxtx_factor = rxtx_cap"\ - "/%s where rxtx_cap > 0" % base) + update_i_type_sql = "update instance_types set rxtx_factor = rxtx_cap"\ + "/%s where rxtx_cap > 0" % base migrate_engine.execute(update_i_type_sql) migrate_engine.execute("update networks set rxtx_base = %s" % base) @@ -55,12 +55,12 @@ def downgrade(migrate_engine): instance_types.create_column(rxtx_quota) instance_types.create_column(rxtx_cap) - base = migrate_engine.execute(_("select min(rxtx_base) from networks "\ - "where rxtx_base > 0")).scalar() + base = migrate_engine.execute("select min(rxtx_base) from networks "\ + "where rxtx_base > 0").scalar() base = base if base > 1 else 1 - update_i_type_sql = (_("update instance_types set rxtx_cap = " \ - "rxtx_factor * %s" % base)) + update_i_type_sql = "update instance_types set rxtx_cap = "\ + "rxtx_factor * %s" % base migrate_engine.execute(update_i_type_sql) instance_types.c.rxtx_factor.drop() |