Merge lp:~zulcss/cinder/cinder-fix-ftbfs into lp:~ubuntu-server-dev/cinder/havana

[Chuck Short]

- Rediffed patch
- Bump python-noavclient to >= 2.15.0

=== modified file 'debian/changelog'
--- debian/changelog	2013-09-19 18:36:21 +0000
+++ debian/changelog	2013-09-24 13:28:29 +0000
@@ -12,7 +12,7 @@
       python-lxml, python-webob, python-oslo.config, python-sqlalchemy,
       python-fixtures, python-testtools, and python-fixtures
     - Bumped versioned dependencies for python-eventlet, python-hp3parclient,
-      and python-keystoneclient, 
+      python-keystoneclient, and python-novaclient
 
  -- Chuck Short <[e-mail]>  Tue, 10 Sep 2013 11:45:33 -0400
 
 
=== modified file 'debian/control'
--- debian/control	2013-09-20 13:35:06 +0000
+++ debian/control	2013-09-24 13:28:29 +0000
@@ -24,7 +24,7 @@
  python-mox,
  python-mysqldb,
  python-netaddr,
- python-novaclient (>= 1:2.12.0),
+ python-novaclient (>= 1:2.15.0),
  python-oslo.config (>= 1:1.1.0),
  python-paramiko (>= 1.8),
  python-paste,
 
=== modified file 'debian/patches/fix-sqlalchemy-requirements.patch'
--- debian/patches/fix-sqlalchemy-requirements.patch	2013-09-10 16:54:59 +0000
+++ debian/patches/fix-sqlalchemy-requirements.patch	2013-09-24 13:28:29 +0000
@@ -1,5 +1,5 @@
 diff --git a/cinder/tests/db/test_finish_migration.py b/cinder/tests/db/test_finish_migration.py
-index 459dfea..716d76f 100644
+index 4fba2a9..0d701aa 100644
 --- a/cinder/tests/db/test_finish_migration.py
 +++ b/cinder/tests/db/test_finish_migration.py
 @@ -41,8 +41,11 @@ class FinishVolumeMigrationTestCase(test.TestCase):
@@ -14,13 +14,13 @@
 +        except:
 +            self.skipTest('Test fails with sqlalchemy 0.9.8')
  
-         self.assertRaises(exception.VolumeNotFound, db.volume_get, ctxt,
-                           dest_volume['id'])
+         src_volume = db.volume_get(ctxt, src_volume['id'])
+         expected_name = 'volume-%s' % dest_volume['id']
 diff --git a/cinder/tests/test_volume.py b/cinder/tests/test_volume.py
-index f9b505e..730fd9a 100644
+index 8ce5b73..dc02ee6 100644
 --- a/cinder/tests/test_volume.py
 +++ b/cinder/tests/test_volume.py
-@@ -1663,8 +1663,11 @@ class VolumeTestCase(BaseVolumeTestCase):
+@@ -1728,8 +1728,11 @@ class VolumeTestCase(BaseVolumeTestCase):
          volume = tests_utils.create_volume(self.context, size=0,
                                             host=CONF.host)
          host_obj = {'host': 'newhost', 'capabilities': {}}
@@ -35,10 +35,10 @@
          self.assertEqual(volume['host'], 'newhost')
          self.assertEqual(volume['migration_status'], None)
 diff --git a/requirements.txt b/requirements.txt
-index 01a80be..801736f 100644
+index 01ec2e6..97d79d8 100644
 --- a/requirements.txt
 +++ b/requirements.txt
-@@ -19,7 +19,7 @@ python-keystoneclient>=0.3.0
+@@ -20,7 +20,7 @@ python-novaclient>=2.15.0
  python-swiftclient>=1.5
  Routes>=1.12.3
  six
@@ -47,4 +47,3 @@
  sqlalchemy-migrate>=0.7.2
  stevedore>=0.10
  suds>=0.4
-