commit 8f7ea46e09b179bd4be54e6090ec3b0178ced676
Author: Jakub Ruzicka <jruzicka at redhat.com>
Date: Thu Dec 19 17:20:07 2013 +0100
Add search_opts into the method list() for VolumeTypeManager
Resolves: rhbz#1048326
...opts-into-the-method-list-for-VolumeTypeM.patch | 49 ++++++++++++++++++++
python-cinderclient.spec | 7 ++-
2 files changed, 55 insertions(+), 1 deletions(-)
---
diff --git a/0003-Add-search_opts-into-the-method-list-for-VolumeTypeM.patch b/0003-Add-search_opts-into-the-method-list-for-VolumeTypeM.patch
new file mode 100644
index 0000000..d14e1ec
--- /dev/null
+++ b/0003-Add-search_opts-into-the-method-list-for-VolumeTypeM.patch
@@ -0,0 +1,49 @@
+From 576d79bfd897e737dafaacd919fdf917b312f75b Mon Sep 17 00:00:00 2001
+From: Vincent Hou <sbhou at cn.ibm.com>
+Date: Wed, 20 Nov 2013 04:34:38 -0500
+Subject: [PATCH] Add search_opts into the method list() for VolumeTypeManager
+
+Since the method base.ManagerWithFind.findall has been modified by
+adding the search_opts for all tenants support, the parameter
+search_opts should also be added to all the manager classes, which
+can be called whithin this method. volumetypemanager does not have
+this parameter for its method list(). Adding search_opts will resolve
+this issue.
+
+Closes-Bug: #1252665
+
+Change-Id: I526500625f1b5483cb5d88ea15e6ac8485a66ae3
+
+Conflicts:
+ doc/source/index.rst
+---
+ cinderclient/v1/volume_types.py | 2 +-
+ cinderclient/v2/volume_types.py | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cinderclient/v1/volume_types.py b/cinderclient/v1/volume_types.py
+index 12c4612..e8b2c39 100644
+--- a/cinderclient/v1/volume_types.py
++++ b/cinderclient/v1/volume_types.py
+@@ -80,7 +80,7 @@ class VolumeTypeManager(base.ManagerWithFind):
+ """
+ resource_class = VolumeType
+
+- def list(self):
++ def list(self, search_opts=None):
+ """
+ Get a list of all volume types.
+
+diff --git a/cinderclient/v2/volume_types.py b/cinderclient/v2/volume_types.py
+index bc382bd..3d76302 100644
+--- a/cinderclient/v2/volume_types.py
++++ b/cinderclient/v2/volume_types.py
+@@ -70,7 +70,7 @@ class VolumeTypeManager(base.ManagerWithFind):
+ """Manage :class:`VolumeType` resources."""
+ resource_class = VolumeType
+
+- def list(self):
++ def list(self, search_opts=None):
+ """Get a list of all volume types.
+
+ :rtype: list of :class:`VolumeType`.
diff --git a/python-cinderclient.spec b/python-cinderclient.spec
index dd0e7cc..86d9023 100644
--- a/python-cinderclient.spec
+++ b/python-cinderclient.spec
@@ -1,6 +1,6 @@
Name: python-cinderclient
Version: 1.0.7
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Python API and CLI for OpenStack Cinder
Group: Development/Languages
@@ -13,6 +13,7 @@ Source0: http://pypi.python.org/packages/source/p/%{name}/%{name}-%{ver
#
Patch0001: 0001-Remove-runtime-dependency-on-python-pbr.patch
Patch0002: 0002-Stop-pbr-from-installing-requirements-during-build.patch
+Patch0003: 0003-Add-search_opts-into-the-method-list-for-VolumeTypeM.patch
BuildArch: noarch
@@ -52,6 +53,7 @@ This package contains auto-generated documentation.
%patch0001 -p1
%patch0002 -p1
+%patch0003 -p1
# We provide version like this in order to remove runtime dep on pbr.
sed -i s/REDHATCINDERCLIENTVERSION/%{version}/ cinderclient/__init__.py
@@ -94,6 +96,9 @@ rm -fr html/.doctrees html/.buildinfo
%doc html
%changelog
+* Thu Dec 19 2013 Jakub Ruzicka <jruzicka at redhat.com> 1.0.7-2
+- Add search_opts into the method list() for VolumeTypeManager (rhbz#1048326)
+
* Wed Nov 06 2013 Jakub Ruzicka <jruzicka at redhat.com> 1.0.7-1
- Update to upstream version 1.0.7