Merge ~zioproto/ubuntu/+source/python-cinderclient:stable/newton into ~ubuntu-server-dev/ubuntu/+source/python-cinderclient:stable/newton

[Saverio Proto]

[Corey Bryant (corey.bryant)]

-1 only because this particular merge proposal is for yakkety, which is EOL. I'm sponsoring this for xenial however. Thanks Saverio!

review: Disapprove

Unmerged commits

ae72775... by Saverio Proto <email address hidden> on 2017-06-26

Handle error response for webob>=1.6.0

* Handle error response for webob>=1.6.0
  - LP #1559072
  - d/p/review-462204.patch

diff --git a/debian/changelog b/debian/changelog
index 36ec2e4..f803103 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+python-cinderclient (1:1.9.0-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Handle error response for webob>=1.6.0
+    - LP #1559072
+    - d/p/review-462204.patch
+
+ -- Saverio Proto <[e-mail]>  Mon, 26 Jun 2017 11:55:31 +0000
+
 python-cinderclient (1:1.9.0-0ubuntu1) yakkety; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/review-462204.patch b/debian/patches/review-462204.patch
new file mode 100644
index 0000000..22a3b08
--- /dev/null
+++ b/debian/patches/review-462204.patch
@@ -0,0 +1,46 @@
+commit b20d9fd6563c1ef295e8a260742f2b3e0b8ee327
+Author: Akira KAMIO <[e-mail]>
+Date:   Tue Dec 6 14:10:38 2016 +0900
+
+    Handle error response for webob>=1.6.0
+    
+    WebOb change https://github.com/Pylons/webob/pull/230 changed
+    the way in which the error response body is formatted such that
+    it's no longer a nested dict. So we have to handle both the
+    old convention of an error message key to the response body error
+    dict and the new way with just the error body dict.
+    
+    This was reported upstream:
+    
+    https://github.com/Pylons/webob/issues/235
+    
+    But given this was apparently implemented as a long-overdue change
+    in WebOb the behavior is not likely to change.Handle error response for
+    webob>=1.6.0
+    
+    Change-Id: I7d589415aa024588faf77c8234ac026110f6c3cd
+    Closes-Bug: #1559072
+    (cherry picked from commit 19befa69651a41534c7d25b1a0d3a0cd407afb44)
+
+diff --git a/cinderclient/exceptions.py b/cinderclient/exceptions.py
+index 23b31b1..43ae5a4 100644
+--- a/cinderclient/exceptions.py
++++ b/cinderclient/exceptions.py
+@@ -242,9 +242,14 @@ def from_response(response, body):
+         message = "n/a"
+         details = "n/a"
+         if hasattr(body, 'keys'):
+-            error = body[list(body)[0]]
+-            message = error.get('message', message)
+-            details = error.get('details', details)
++            # Only in webob>=1.6.0
++            if 'message' in body:
++                message = body.get('message')
++                details = body.get('details')
++            else:
++                error = body[list(body)[0]]
++                message = error.get('message', message)
++                details = error.get('details', details)
+         return cls(code=response.status_code, message=message, details=details,
+                    request_id=request_id, response=response)
+     else:
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..62fd61c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+review-462204.patch