From bf7f18bf91718babb30e8ded89410667bc940320 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <pbrady@redhat.com>
Date: Thu, 8 Mar 2012 16:32:30 +0000
Subject: [PATCH] fix useexisting deprecation warnings

Fixes deprecation warnings when using sqlalchemy >= 0.7.0
Fixes bug 941951

Change-Id: Iaa57153f99c60c67a14c1dca849188937bdc5dee
---
 .../075_convert_bw_usage_to_store_network_id.py    |    4 ++--
 .../versions/081_drop_instance_id_bw_cache.py      |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nova/db/sqlalchemy/migrate_repo/versions/075_convert_bw_usage_to_store_network_id.py b/nova/db/sqlalchemy/migrate_repo/versions/075_convert_bw_usage_to_store_network_id.py
index b275524..4ff3d99 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/075_convert_bw_usage_to_store_network_id.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/075_convert_bw_usage_to_store_network_id.py
@@ -46,7 +46,7 @@ def upgrade(migrate_engine):
                 Column('last_refreshed', DateTime(timezone=False)),
                 Column('bw_in', BigInteger()),
                 Column('bw_out', BigInteger()),
-                useexisting=True)
+                extend_existing=True)
     mac_column = Column('mac', String(255))
     bw_usage_cache.create_column(mac_column)
 
@@ -81,7 +81,7 @@ def downgrade(migrate_engine):
                 Column('last_refreshed', DateTime(timezone=False)),
                 Column('bw_in', BigInteger()),
                 Column('bw_out', BigInteger()),
-                useexisting=True)
+                extend_existing=True)
 
     network_label_column = Column('network_label', String(255))
     bw_usage_cache.create_column(network_label_column)
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/081_drop_instance_id_bw_cache.py b/nova/db/sqlalchemy/migrate_repo/versions/081_drop_instance_id_bw_cache.py
index c6687ac..a607ed3 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/081_drop_instance_id_bw_cache.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/081_drop_instance_id_bw_cache.py
@@ -37,7 +37,7 @@ def upgrade(migrate_engine):
         Column('last_refreshed', DateTime(timezone=False)),
         Column('bw_in', BigInteger()),
         Column('bw_out', BigInteger()),
-        useexisting=True)
+        extend_existing=True)
 
     bw_usage_cache.drop_column('instance_id')