Merge "Add catching image exceptions when validating os_distro"

Author: Zuul

magnum/api/validation.py

@@ -17,6 +17,7 @@
 
 import pecan
 
+from glanceclient import exc as glance_exception
 from keystoneauth1 import exceptions as ka_exception
 
 from magnum.api import utils as api_utils
@@ -78,6 +79,10 @@ def wrapper(func, *args, **kwargs):
                                                          'images')
                 cluster_distro = image.get('os_distro')
                 driver_name = image.get('magnum_driver')
+            except (glance_exception.NotFound, exception.ResourceNotFound):
+                raise exception.ImageNotFound(image_id=image_id)
+            except glance_exception.HTTPForbidden:
+                raise exception.ImageNotAuthorized(image_id=image_id)
             except Exception:
                 pass
         cluster_type = (cluster_template.server_type,

magnum/tests/unit/api/test_validation.py

@@ -16,6 +16,8 @@
 import importlib
 from unittest import mock
 
+from glanceclient import exc as glance_exception
+
 from magnum.api import validation as v
 from magnum.common import exception
 import magnum.conf
@@ -384,3 +386,61 @@ def test_validate_cluster_properties(self):
             else:
                 self.assertRaises(exception.InvalidParameterValue,
                                   v.validate_cluster_properties, set([field]))
+
+    @mock.patch('pecan.request')
+    @mock.patch('magnum.common.clients.OpenStackClients')
+    @mock.patch('magnum.api.utils.get_openstack_resource')
+    def test_enforce_driver_supported_image_not_found(
+            self, mock_get_resource, mock_os_clients, mock_pecan_request):
+
+        @v.enforce_driver_supported()
+        def test(self, cluster_template):
+            pass
+
+        mock_get_resource.side_effect = exception.ResourceNotFound(
+            name='image', id='test-image-id')
+        cluster_template = mock.MagicMock()
+        cluster_template.cluster_distro = None
+        cluster_template.driver = None
+        cluster_template.image_id = 'test-image-id'
+
+        self.assertRaises(exception.ImageNotFound,
+                          test, self, cluster_template)
+
+    @mock.patch('pecan.request')
+    @mock.patch('magnum.common.clients.OpenStackClients')
+    @mock.patch('magnum.api.utils.get_openstack_resource')
+    def test_enforce_driver_supported_image_not_found_glance(
+            self, mock_get_resource, mock_os_clients, mock_pecan_request):
+
+        @v.enforce_driver_supported()
+        def test(self, cluster_template):
+            pass
+
+        mock_get_resource.side_effect = glance_exception.NotFound()
+        cluster_template = mock.MagicMock()
+        cluster_template.cluster_distro = None
+        cluster_template.driver = None
+        cluster_template.image_id = 'test-image-id'
+
+        self.assertRaises(exception.ImageNotFound,
+                          test, self, cluster_template)
+
+    @mock.patch('pecan.request')
+    @mock.patch('magnum.common.clients.OpenStackClients')
+    @mock.patch('magnum.api.utils.get_openstack_resource')
+    def test_enforce_driver_supported_image_forbidden(
+            self, mock_get_resource, mock_os_clients, mock_pecan_request):
+
+        @v.enforce_driver_supported()
+        def test(self, cluster_template):
+            pass
+
+        mock_get_resource.side_effect = glance_exception.HTTPForbidden()
+        cluster_template = mock.MagicMock()
+        cluster_template.cluster_distro = None
+        cluster_template.driver = None
+        cluster_template.image_id = 'test-image-id'
+
+        self.assertRaises(exception.ImageNotAuthorized,
+                          test, self, cluster_template)