Merge "Handle 403 forbidden on download"

4 files changed, 46 insertions, 2 deletions

diff --git a/glanceclient/common/utils.py b/glanceclient/common/utils.py
index e7c0992..878c1a5 100644
--- a/glanceclient/common/utils.py
+++ b/glanceclient/common/utils.py
@@ -283,7 +283,7 @@ def import_versioned_module(version, submodule=None):
 
 def exit(msg='', exit_code=1):
     if msg:
-        print(encodeutils.safe_decode(msg), file=sys.stderr)
+        print_err(msg)
     sys.exit(exit_code)
 
 
diff --git a/glanceclient/tests/unit/v2/test_images.py b/glanceclient/tests/unit/v2/test_images.py
index 8ed1bb3..b095634 100644
--- a/glanceclient/tests/unit/v2/test_images.py
+++ b/glanceclient/tests/unit/v2/test_images.py
@@ -872,6 +872,15 @@ class TestController(testtools.TestCase):
         body = self.controller.data('image_id')
         self.assertIsNone(body)
 
+    def test_download_forbidden(self):
+        self.controller.http_client.get = mock.Mock(
+            side_effect=exc.HTTPForbidden())
+        try:
+            self.controller.data('image_id')
+            self.fail('No forbidden exception raised.')
+        except exc.HTTPForbidden:
+            pass
+
     def test_update_replace_prop(self):
         image_id = '3a4560a1-e585-443e-9b39-553b46ec92d1'
         params = {'name': 'pong'}
diff --git a/glanceclient/tests/unit/v2/test_shell_v2.py b/glanceclient/tests/unit/v2/test_shell_v2.py
index a9b12ed..cddb925 100644
--- a/glanceclient/tests/unit/v2/test_shell_v2.py
+++ b/glanceclient/tests/unit/v2/test_shell_v2.py
@@ -653,6 +653,36 @@ class ShellV2Test(testtools.TestCase):
             self.assert_exits_with_msg(func=test_shell.do_image_delete,
                                        func_args=args)
 
+    @mock.patch.object(utils, 'print_err')
+    def test_do_image_download_with_forbidden_id(self, mocked_print_err):
+        args = self._make_args({'id': 'IMG-01', 'file': None,
+                                'progress': False})
+        with mock.patch.object(self.gc.images, 'data') as mocked_data:
+            mocked_data.side_effect = exc.HTTPForbidden
+            try:
+                test_shell.do_image_download(self.gc, args)
+                self.fail('Exit not called')
+            except SystemExit:
+                pass
+
+            self.assertEqual(1, mocked_data.call_count)
+            self.assertEqual(1, mocked_print_err.call_count)
+
+    @mock.patch.object(utils, 'print_err')
+    def test_do_image_download_with_500(self, mocked_print_err):
+        args = self._make_args({'id': 'IMG-01', 'file': None,
+                                'progress': False})
+        with mock.patch.object(self.gc.images, 'data') as mocked_data:
+            mocked_data.side_effect = exc.HTTPInternalServerError
+            try:
+                test_shell.do_image_download(self.gc, args)
+                self.fail('Exit not called')
+            except SystemExit:
+                pass
+
+            self.assertEqual(1, mocked_data.call_count)
+            self.assertEqual(1, mocked_print_err.call_count)
+
     def test_do_member_list(self):
         args = self._make_args({'image_id': 'IMG-01'})
         with mock.patch.object(self.gc.image_members, 'list') as mocked_list:
diff --git a/glanceclient/v2/shell.py b/glanceclient/v2/shell.py
index 821febf..eaae374 100644
--- a/glanceclient/v2/shell.py
+++ b/glanceclient/v2/shell.py
@@ -276,7 +276,12 @@ def do_explain(gc, args):
            help=_('Show download progress bar.'))
 def do_image_download(gc, args):
     """Download a specific image."""
-    body = gc.images.data(args.id)
+    try:
+        body = gc.images.data(args.id)
+    except (exc.HTTPForbidden, exc.HTTPException) as e:
+        msg = "Unable to download image '%s'. (%s)" % (args.id, e)
+        utils.exit(msg)
+
     if body is None:
         msg = ('Image %s has no data.' % args.id)
         utils.exit(msg)