Merge lp:~zulcss/nova/sqlalchemy-fixes-0.8 into lp:~ubuntu-server-dev/nova/havana

[Chuck Short]

sqlalchemy 0.8 fixes.

[lp:~zulcss/nova/sqlalchemy-fixes-0.8]

600. By Chuck Short on 2013-07-30

Update patch

=== modified file 'debian/changelog'
--- debian/changelog	2013-07-19 19:03:40 +0000
+++ debian/changelog	2013-07-30 18:36:36 +0000
@@ -1,3 +1,14 @@
+nova (1:2013.2.a2367.gb404bfd-0ubuntu1) UNRELEASED; urgency=low
+
+  * New usptream release. 
+  * debian/patches/avoid_requirements_cheetah.patch: Dropped
+  * debian/patches/fix-sqlalchemy-0.7.9-usage.patch: Dropped
+  * debian/patches/fix-requirements.patch: Refreshed.
+  * debian/patches/remove-deprecated-sqlalchemy-option.patch: Remove
+    deprecated option with sqlalchemy.
+
+ -- Chuck Short <[e-mail]>  Tue, 30 Jul 2013 13:05:37 +0000
+
 nova (1:2013.2~b2-0ubuntu2) saucy; urgency=low
 
   * debian/control: Fix python-sqlalchemy dependency. 

=== removed file 'debian/patches/avoid_requirements_cheetah.patch'
--- debian/patches/avoid_requirements_cheetah.patch	2013-06-20 01:03:56 +0000
+++ debian/patches/avoid_requirements_cheetah.patch	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-From: Adam Gandelman <[e-mail]>
-Date: Wed May 29 12:13:38 PDT 2013
-Subject: Avoid Cheetah dependency.
-Ubuntu-bug: https://bugs.launchpad.net/ubuntu/+source/cheetah/+bug/1183634
-Until Cheetah's dependencies have been MIR'd into Main, avoid it
-being listed in requirements.txt and requiring it as a runtime
-dependency.
-
-
-Index: nova-src/requirements.txt
-===================================================================
---- nova-src.orig/requirements.txt	2013-06-19 18:03:08.469447733 -0700
-+++ nova-src/requirements.txt	2013-06-19 18:03:08.465447733 -0700
-@@ -1,7 +1,6 @@
- d2to1>=0.2.10,<0.3
- pbr>=0.5.16,<0.6
- SQLAlchemy>=0.7.8,<0.7.99
--Cheetah>=2.4.4
- amqplib>=0.6.1
- anyjson>=0.2.4
- argparse

=== modified file 'debian/patches/fix-requirements.patch'
--- debian/patches/fix-requirements.patch	2013-07-16 23:03:19 +0000
+++ debian/patches/fix-requirements.patch	2013-07-30 18:36:36 +0000
@@ -1,15 +1,16 @@
-diff -Naurp nova-2013.2.a2069.gf8d3ff8.orig/requirements.txt nova-2013.2.a2069.gf8d3ff8/requirements.txt
---- nova-2013.2.a2069.gf8d3ff8.orig/requirements.txt	2013-07-16 19:00:34.034600924 -0400
-+++ nova-2013.2.a2069.gf8d3ff8/requirements.txt	2013-07-16 19:01:26.494602175 -0400
-@@ -1,6 +1,6 @@
+diff -Naurp nova-2013.2.a2367.gb404bfd.orig/requirements.txt nova-2013.2.a2367.gb404bfd/requirements.txt
+--- nova-2013.2.a2367.gb404bfd.orig/requirements.txt	2013-07-30 13:01:25.000000000 +0000
++++ nova-2013.2.a2367.gb404bfd/requirements.txt	2013-07-30 13:51:46.198948311 +0000
+@@ -1,7 +1,6 @@
  d2to1>=0.2.10,<0.3
  pbr>=0.5.16,<0.6
 -SQLAlchemy>=0.7.8,<0.7.99
+-Cheetah>=2.4.4
 +SQLAlchemy>=0.7.8,<0.8.99
  amqplib>=0.6.1
  anyjson>=0.2.4
  argparse
-@@ -20,14 +20,13 @@ paramiko
+@@ -21,14 +20,13 @@ paramiko
  pyasn1
  Babel>=0.9.6
  iso8601>=0.1.4
@@ -20,7 +21,7 @@
  python-glanceclient>=0.9.0
  python-keystoneclient>=0.2.0
  six
- stevedore>=0.9
+ stevedore>=0.10
 -websockify<0.4
  pyparsing>=1.5.7,<2.0 # order-dependent python-quantumclient req, bug 1191866
  

=== removed file 'debian/patches/fix-sqlalchemy-0.7.9-usage.patch'
--- debian/patches/fix-sqlalchemy-0.7.9-usage.patch	2013-07-16 15:16:30 +0000
+++ debian/patches/fix-sqlalchemy-0.7.9-usage.patch	1970-01-01 00:00:00 +0000
@@ -1,133 +0,0 @@
-Description: Fix tests failing with sqlalachemy 0.7.9
-Author: Chuck Short <[e-mail]>
-Fowarded: No
-diff -Naurp nova-2013.2.a2028.gd612ed9.orig/nova/db/sqlalchemy/migrate_repo/versions/186_new_bdm_format.py nova-2013.2.a2028.gd612ed9/nova/db/sqlalchemy/migrate_repo/versions/186_new_bdm_format.py
---- nova-2013.2.a2028.gd612ed9.orig/nova/db/sqlalchemy/migrate_repo/versions/186_new_bdm_format.py	2013-07-16 09:01:23.000000000 -0400
-+++ nova-2013.2.a2028.gd612ed9/nova/db/sqlalchemy/migrate_repo/versions/186_new_bdm_format.py	2013-07-16 10:49:47.661898868 -0400
-@@ -249,12 +249,9 @@ def _downgrade_bdm_v2(meta, bdm_table):
-             (bdm_table.c.source_type == 'blank')
-         ).order_by(bdm_table.c.id.asc())
- 
--        blanks = [
--            dict(zip(('id', 'source', 'format'), row))
--            for row in bdm_q.execute().fetchall()
--        ]
-+        blanks = [dict(row) for row in bdm_q.execute().fetchall()]
- 
--        swap = [dev for dev in blanks if dev['format'] == 'swap']
-+        swap = [dev for dev in blanks if dev['guest_format'] == 'swap']
-         assert len(swap) < 2
-         ephemerals = [dev for dev in blanks if dev not in swap]
- 
-diff -Naurp nova-2013.2.a2028.gd612ed9.orig/nova/db/sqlalchemy/types.py nova-2013.2.a2028.gd612ed9/nova/db/sqlalchemy/types.py
---- nova-2013.2.a2028.gd612ed9.orig/nova/db/sqlalchemy/types.py	2013-07-16 09:01:23.000000000 -0400
-+++ nova-2013.2.a2028.gd612ed9/nova/db/sqlalchemy/types.py	2013-07-16 10:49:40.465898696 -0400
-@@ -25,7 +25,14 @@ from nova import utils
- 
- class IPAddress(types.TypeDecorator):
-     """An SQLAlchemy type representing an IP-address."""
--    impl = types.String(39).with_variant(postgresql.INET(), 'postgresql')
-+
-+    impl = types.String
-+
-+    def load_dialect_impl(self, dialect):
-+        if dialect.name == 'postgresql':
-+            return dialect.type_descriptor(postgresql.INET())
-+        else:
-+            return dialect.type_descriptor(types.String(39))
- 
-     def process_bind_param(self, value, dialect):
-         """Process/Formats the value before insert it into the db."""
-@@ -40,7 +47,14 @@ class IPAddress(types.TypeDecorator):
- 
- class CIDR(types.TypeDecorator):
-     """An SQLAlchemy type representing a CIDR definition."""
--    impl = types.String(43).with_variant(postgresql.INET(), 'postgresql')
-+
-+    impl = types.String
-+
-+    def load_dialect_impl(self, dialect):
-+        if dialect.name == 'postgresql':
-+            return dialect.type_descriptor(postgresql.INET())
-+        else:
-+            return dialect.type_descriptor(types.String(43))
- 
-     def process_bind_param(self, value, dialect):
-         """Process/Formats the value before insert it into the db."""
-diff -Naurp nova-2013.2.a2028.gd612ed9.orig/nova/tests/db/test_migrations.py nova-2013.2.a2028.gd612ed9/nova/tests/db/test_migrations.py
---- nova-2013.2.a2028.gd612ed9.orig/nova/tests/db/test_migrations.py	2013-07-16 09:01:23.000000000 -0400
-+++ nova-2013.2.a2028.gd612ed9/nova/tests/db/test_migrations.py	2013-07-16 10:49:47.661898868 -0400
-@@ -46,6 +46,7 @@ import commands
- import ConfigParser
- import datetime
- import glob
-+import operator
- import os
- import urlparse
- import uuid
-@@ -64,6 +65,7 @@ from nova.openstack.common import log as
- from nova.openstack.common import timeutils
- from nova.openstack.common import uuidutils
- from nova import test
-+from nova.tests import matchers
- from nova import utils
- import nova.virt.baremetal.db.sqlalchemy.migrate_repo
- 
-@@ -1466,7 +1468,7 @@ class TestNovaMigrations(BaseMigrationTe
-         self._unique_constraint_check_migrate_185(engine)
- 
-     def _pre_upgrade_186(self, engine):
--        fake_instances = [
-+        self.mig186_fake_instances = [
-             dict(uuid='mig186_uuid-1', image_ref='fake_image_1',
-                  root_device_name='/dev/vda'),
-             dict(uuid='mig186_uuid-2', image_ref='',
-@@ -1475,7 +1477,7 @@ class TestNovaMigrations(BaseMigrationTe
-                  root_device_name='/dev/vda'),
-         ]
- 
--        fake_bdms = [
-+        self.mig186_fake_bdms = [
-             # Instance 1 - image, volume and swap
-             dict(instance_uuid='mig186_uuid-1', device_name='/dev/vdc',
-                  volume_id='fake_volume_1'),
-@@ -1497,11 +1499,11 @@ class TestNovaMigrations(BaseMigrationTe
- 
-         instances = db_utils.get_table(engine, 'instances')
-         block_device = db_utils.get_table(engine, 'block_device_mapping')
--        engine.execute(instances.insert(), fake_instances)
--        for fake_bdm in fake_bdms:
-+        engine.execute(instances.insert(), self.mig186_fake_instances)
-+        for fake_bdm in self.mig186_fake_bdms:
-             engine.execute(block_device.insert(), fake_bdm)
- 
--        return fake_instances, fake_bdms
-+        return self.mig186_fake_instances, self.mig186_fake_bdms
- 
-     def _check_186(self, engine, data):
-         block_device = db_utils.get_table(engine, 'block_device_mapping')
-@@ -1587,6 +1589,24 @@ class TestNovaMigrations(BaseMigrationTe
-         self.assertEqual(bdm_3s[3].image_id, 'fake_image_2')
-         self.assertEqual(bdm_3s[3].boot_index, 0)
- 
-+    def _post_downgrade_186(self, engine):
-+        block_device = db_utils.get_table(engine, 'block_device_mapping')
-+
-+        q = block_device.select().where(
-+            sqlalchemy.or_(
-+                block_device.c.instance_uuid == 'mig186_uuid-1',
-+                block_device.c.instance_uuid == 'mig186_uuid-2',
-+                block_device.c.instance_uuid == 'mig186_uuid-3'))\
-+            .order_by(block_device.c.device_name.asc())
-+
-+        expected_bdms = sorted(self.mig186_fake_bdms,
-+                               key=operator.itemgetter('device_name'))
-+        got_bdms = [bdm for bdm in q.execute()]
-+
-+        self.assertEquals(len(expected_bdms), len(got_bdms))
-+        for expected, got in zip(expected_bdms, got_bdms):
-+            self.assertThat(expected, matchers.IsSubDictOf(dict(got)))
-+
-     # addition of the vm instance groups
-     def _check_no_group_instance_tables(self, engine):
-         self.assertRaises(sqlalchemy.exc.NoSuchTableError,

=== added file 'debian/patches/remove-deprecated-sqlalchemy-option.patch'
--- debian/patches/remove-deprecated-sqlalchemy-option.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/remove-deprecated-sqlalchemy-option.patch	2013-07-30 18:36:36 +0000
@@ -0,0 +1,63 @@
+Description: Remove deprecated sqlalchemy assert_unicode.
+Author: Chuck Short <[e-mail]>
+Forwarded: Yes (https://review.openstack.org/#/c/39296/)
+diff -Naurp nova-2013.2.a2367.gb404bfd.orig/nova/db/sqlalchemy/migrate_repo/versions/203_make_user_quotas_key_and_value.py nova-2013.2.a2367.gb404bfd/nova/db/sqlalchemy/migrate_repo/versions/203_make_user_quotas_key_and_value.py
+--- nova-2013.2.a2367.gb404bfd.orig/nova/db/sqlalchemy/migrate_repo/versions/203_make_user_quotas_key_and_value.py	2013-07-30 13:01:25.000000000 +0000
++++ nova-2013.2.a2367.gb404bfd/nova/db/sqlalchemy/migrate_repo/versions/203_make_user_quotas_key_and_value.py	2013-07-30 13:44:02.410948311 +0000
+@@ -35,7 +35,7 @@ def upgrade(migrate_engine):
+     quota_usages = utils.get_table(migrate_engine, 'quota_usages')
+     user_id = Column('user_id',
+                      String(length=255, convert_unicode=False,
+-                            assert_unicode=None, unicode_error=None,
++                            unicode_error=None,
+                             _warn_on_bytestring=False))
+     quota_usages.create_column(user_id)
+ 
+@@ -43,7 +43,7 @@ def upgrade(migrate_engine):
+                                 db._SHADOW_TABLE_PREFIX + 'quota_usages')
+     user_id = Column('user_id',
+                      String(length=255, convert_unicode=False,
+-                            assert_unicode=None, unicode_error=None,
++                            unicode_error=None,
+                             _warn_on_bytestring=False))
+     shadow_quota_usages.create_column(user_id)
+ 
+@@ -51,7 +51,7 @@ def upgrade(migrate_engine):
+     reservations = utils.get_table(migrate_engine, 'reservations')
+     user_id = Column('user_id',
+                      String(length=255, convert_unicode=False,
+-                            assert_unicode=None, unicode_error=None,
++                            unicode_error=None,
+                             _warn_on_bytestring=False))
+     reservations.create_column(user_id)
+ 
+@@ -59,7 +59,7 @@ def upgrade(migrate_engine):
+                                 db._SHADOW_TABLE_PREFIX + 'reservations')
+     user_id = Column('user_id',
+                      String(length=255, convert_unicode=False,
+-                            assert_unicode=None, unicode_error=None,
++                            unicode_error=None,
+                             _warn_on_bytestring=False))
+     shadow_reservations.create_column(user_id)
+ 
+@@ -83,17 +83,17 @@ def upgrade(migrate_engine):
+                         Column('deleted', Integer),
+                         Column('user_id',
+                                String(length=255, convert_unicode=False,
+-                                      assert_unicode=None, unicode_error=None,
++                                      unicode_error=None,
+                                       _warn_on_bytestring=False),
+                                nullable=False),
+                         Column('project_id',
+                                String(length=255, convert_unicode=False,
+-                                      assert_unicode=None, unicode_error=None,
++                                      unicode_error=None,
+                                       _warn_on_bytestring=False),
+                                nullable=False),
+                         Column('resource',
+                                String(length=255, convert_unicode=False,
+-                                      assert_unicode=None, unicode_error=None,
++                                      unicode_error=None,
+                                       _warn_on_bytestring=False),
+                                nullable=False),
+                         Column('hard_limit', Integer, nullable=True),

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-07-16 15:16:30 +0000
+++ debian/patches/series	2013-07-30 18:36:36 +0000
@@ -1,7 +1,6 @@
 # Ubuntu specific patches below here. Note these can be dropped eventually.
-avoid_requirements_cheetah.patch
 path-to-the-xenhost.conf-fixup.patch
 fix-docs-build-without-network.patch
 fix-requirements.patch
-fix-sqlalchemy-0.7.9-usage.patch
 avoid-failing-test.patch
+remove-deprecated-sqlalchemy-option.patch