[openstack-nova] suppress deprecation warnings with db sync at install (#801302)

[Pádraig Brady]

commit f35989635b9fe2da4df8e85656f304838b1923a5
Author: Pádraig Brady <P at draigBrady.com>
Date:   Fri Mar 16 23:10:56 2012 +0000

    suppress deprecation warnings with db sync at install (#801302)

 0008-fix-useexisting-deprecation-warnings.patch |   49 +++++++++++++++++++++++
 openstack-nova.spec                             |    3 +
 2 files changed, 52 insertions(+), 0 deletions(-)
---
diff --git a/0008-fix-useexisting-deprecation-warnings.patch b/0008-fix-useexisting-deprecation-warnings.patch
new file mode 100644
index 0000000..b5098ef
--- /dev/null
+++ b/0008-fix-useexisting-deprecation-warnings.patch
@@ -0,0 +1,49 @@
+From 4cc6c5b4ee74b822ac4ae4b65465435f53289533 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?P=C3=A1draig=20Brady?= <pbrady at 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')
+ 
diff --git a/openstack-nova.spec b/openstack-nova.spec
index b84c78d..1580254 100644
--- a/openstack-nova.spec
+++ b/openstack-nova.spec
@@ -41,6 +41,7 @@ Patch0004: 0004-Allows-new-style-config-to-be-used-for-flagfile.patch
 Patch0005: 0005-Fix-_sync_power_states-to-obtain-correct-state.patch
 Patch0006: 0006-nonblocking-libvirt-mode-using-tpool.patch
 Patch0007: 0007-Fixes-xml-representation-of-ext_srv_attr-extension.patch
+Patch0008: 0008-fix-useexisting-deprecation-warnings.patch
 
 BuildArch:        noarch
 BuildRequires:    intltool
@@ -183,6 +184,7 @@ This package contains documentation files for nova.
 %patch0005 -p1
 %patch0006 -p1
 %patch0007 -p1
+%patch0008 -p1
 
 find . \( -name .gitignore -o -name .placeholder \) -delete
 
@@ -377,6 +379,7 @@ fi
 - Include an upstream fix for errors logged when syncing power states
 - Support non blocking libvirt operations
 - Fix an exception when querying a server through the API (#803905)
+- Suppress deprecation warnings with db sync at install (#801302)
 
 * Fri Mar  6 2012 Alan Pevec <apevec at redhat.com> - 2012.1-0.7.e4
 - Fixup permissions on nova config files