Merge lp:~zulcss/python-cinderclient/1248519 into lp:~ubuntu-server-dev/python-cinderclient/icehouse

[Chuck Short]

Fix for search_opts bug.

[James Page (james-page)]

review: Approve

[Chuck Short (zulcss)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

=== modified file 'debian/changelog'
--- debian/changelog	2013-12-03 18:36:34 +0000
+++ debian/changelog	2014-01-30 14:10:07 +0000
@@ -1,3 +1,10 @@
+python-cinderclient (1:1.0.7-0ubuntu2) trusty; urgency=medium
+
+  * debian/patches/fix-search-opts.patch: Fix 'search_opts' unexpected keyword
+    argument error (LP: #1248519)
+
+ -- Chuck Short <[e-mail]>  Thu, 30 Jan 2014 08:52:32 -0500
+
 python-cinderclient (1:1.0.7-0ubuntu1) trusty; urgency=low
 
   * New upstream release.
 
=== added directory 'debian/patches'
=== added file 'debian/patches/fix-search-opts.patch'
--- debian/patches/fix-search-opts.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-search-opts.patch	2014-01-30 14:10:07 +0000
@@ -0,0 +1,67 @@
+commit 2f0863b7d4d20198f496534d5ffef85e68ff45fc
+Author: Xiao Chen <[e-mail]>
+Date:   Mon Jan 20 15:29:55 2014 +0800
+
+    Fix 'search_opts' unexpected keyword argument error
+    
+    When executing 'encryption-type-create' command using resource
+    name, it will use the findall() in base.py, then error will
+    occur because list() in findall() used 'search_opts' argument
+    which list() in VolumeEncryptionTypeManager did not have. Some
+    other command like 'transfer-delete' met same issue.
+    
+    This patch will add 'search_opts' argument in list() function
+    in child class to avoid the bug.
+    
+    Closes-Bug: #1248519
+    Related-Bug: #1252665
+    
+    Change-Id: If1cd8b812af21335e5d4351766539a927a8fbdf4
+diff -Naurp python-cinderclient-1.0.7.orig/cinderclient/v1/volume_encryption_types.py python-cinderclient-1.0.7/cinderclient/v1/volume_encryption_types.py
+--- python-cinderclient-1.0.7.orig/cinderclient/v1/volume_encryption_types.py	2013-10-31 11:15:54.000000000 -0400
++++ python-cinderclient-1.0.7/cinderclient/v1/volume_encryption_types.py	2014-01-30 09:04:23.585394428 -0500
+@@ -36,7 +36,7 @@ class VolumeEncryptionTypeManager(base.M
+     """
+     resource_class = VolumeEncryptionType
+ 
+-    def list(self):
++    def list(self, search_opts=None):
+         """
+         List all volume encryption types.
+ 
+diff -Naurp python-cinderclient-1.0.7.orig/cinderclient/v1/volume_transfers.py python-cinderclient-1.0.7/cinderclient/v1/volume_transfers.py
+--- python-cinderclient-1.0.7.orig/cinderclient/v1/volume_transfers.py	2013-10-31 11:15:54.000000000 -0400
++++ python-cinderclient-1.0.7/cinderclient/v1/volume_transfers.py	2014-01-30 09:04:23.585394428 -0500
+@@ -64,7 +64,7 @@ class VolumeTransferManager(base.Manager
+         """
+         return self._get("/os-volume-transfer/%s" % transfer_id, "transfer")
+ 
+-    def list(self, detailed=True):
++    def list(self, detailed=True, search_opts=None):
+         """Get a list of all volume transfer.
+ 
+         :rtype: list of :class:`VolumeTransfer`
+diff -Naurp python-cinderclient-1.0.7.orig/cinderclient/v2/volume_encryption_types.py python-cinderclient-1.0.7/cinderclient/v2/volume_encryption_types.py
+--- python-cinderclient-1.0.7.orig/cinderclient/v2/volume_encryption_types.py	2013-10-31 11:15:54.000000000 -0400
++++ python-cinderclient-1.0.7/cinderclient/v2/volume_encryption_types.py	2014-01-30 09:04:23.585394428 -0500
+@@ -36,7 +36,7 @@ class VolumeEncryptionTypeManager(base.M
+     """
+     resource_class = VolumeEncryptionType
+ 
+-    def list(self):
++    def list(self, search_opts=None):
+         """
+         List all volume encryption types.
+ 
+diff -Naurp python-cinderclient-1.0.7.orig/cinderclient/v2/volume_transfers.py python-cinderclient-1.0.7/cinderclient/v2/volume_transfers.py
+--- python-cinderclient-1.0.7.orig/cinderclient/v2/volume_transfers.py	2013-10-31 11:15:54.000000000 -0400
++++ python-cinderclient-1.0.7/cinderclient/v2/volume_transfers.py	2014-01-30 09:04:23.589394428 -0500
+@@ -64,7 +64,7 @@ class VolumeTransferManager(base.Manager
+         """
+         return self._get("/os-volume-transfer/%s" % transfer_id, "transfer")
+ 
+-    def list(self, detailed=True):
++    def list(self, detailed=True, search_opts=None):
+         """Get a list of all volume transfer.
+ 
+         :rtype: list of :class:`VolumeTransfer`
 
=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2014-01-30 14:10:07 +0000
@@ -0,0 +1,1 @@
+fix-search-opts.patch