Merge lp:~james-page/cinder/hpclients-fixup into lp:~ubuntu-server-dev/cinder/icehouse

[James Page]

Update BD's to fix FTBFS

[James Page (james-page)]

Please take a look.

=== modified file 'debian/changelog'
--- debian/changelog	2014-02-13 15:36:59 +0000
+++ debian/changelog	2014-02-24 12:12:39 +0000
@@ -8,7 +8,10 @@
     packaged yet.
 
   [ James Page ]
-  * debian/patches/fix-requirements.patch: Refreshed.
+  * d/p/fix-requirements.patch: Refreshed.
+  * d/control,d/p/series/skip-tests.patch: Add BD on python-hplefthandclient,
+    bump version requirement on python-hp3parclient to >= 3.0.0 and drop
+    patch that skips hplefthandclient tests.
 
  -- James Page <[e-mail]>  Mon, 10 Feb 2014 18:33:54 +0200
 

=== modified file 'debian/control'
--- debian/control	2014-02-03 15:54:05 +0000
+++ debian/control	2014-02-24 12:12:39 +0000
@@ -13,7 +13,8 @@
  python-fixtures (>= 0.3.14),
  python-glanceclient (>= 1:0.9.0),
  python-greenlet (>= 0.3.2),
- python-hp3parclient (>= 2.0.0),
+ python-hp3parclient (>= 3.0.0),
+ python-hplefthandclient (>= 1.0.0),
  python-iso8601,
  python-keystoneclient (>= 1:0.4.2),
  python-kombu (>= 2.5.12),

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-02-13 15:36:59 +0000
+++ debian/patches/series	2014-02-24 12:12:39 +0000
@@ -1,2 +1,1 @@
 fix-requirements.patch
-skip-tests.patch

=== removed file 'debian/patches/skip-tests.patch'
--- debian/patches/skip-tests.patch	2014-02-13 15:46:07 +0000
+++ debian/patches/skip-tests.patch	1970-01-01 00:00:00 +0000
@@ -1,40 +0,0 @@
-Description: Temporarily skip hplefthand tests.
-Author: Chuck Short <[e-mail]>
-Fowarded: Not Needed
-diff --git a/cinder/tests/test_hplefthand.py b/cinder/tests/test_hplefthand.py
-index 7d3b395..af171eb 100644
---- a/cinder/tests/test_hplefthand.py
-+++ b/cinder/tests/test_hplefthand.py
-@@ -16,7 +16,10 @@
- """Unit tests for OpenStack Cinder volume drivers."""
- import mock
- 
--from hplefthandclient import exceptions as hpexceptions
-+try:
-+    from hplefthandclient import exceptions as hpexceptions
-+except ImportError:
-+    hptlefthandclient = None
- 
- from cinder import exception
- from cinder.openstack.common import log as logging
-@@ -330,6 +333,8 @@ class TestHPLeftHandCLIQISCSIDriver(HPLeftHandBaseDriver, test.TestCase):
-         return verbs[verb](cliq_args)
- 
-     def setUp(self):
-+        if hplefthandclient is None:
-+            self.skipTest('hplefthandclient is not installed')
-         super(TestHPLeftHandCLIQISCSIDriver, self).setUp()
- 
-         self.properties = {
-@@ -583,6 +588,8 @@ class TestHPLeftHandRESTISCSIDriver(HPLeftHandBaseDriver, test.TestCase):
-         mock.call.getCluster(1)]
- 
-     def setUp(self):
-+        if hplefthandclient is None:
-+            self.skipTest('hplefthandclient is not installed')
-         super(TestHPLeftHandRESTISCSIDriver, self).setUp()
- 
-     def tearDown(self):
--- 
-1.8.3.2
-