openstack
/
deb-python-os-cloud-config
Code Issues Proposed changes

Fix usage of glanceclient exceptions 

openstack.common code was remove from glanceclient in
Ib3ac09743ce761ab0186e99e1c9de02517f89510, but we were still importing
an old exceptions module. This commit updates the code to use a
different exception class from glanceclient that still exists.

Change-Id: Ia366e94e7724234f7ec879a6f100925f265e420f
This commit is contained in:
James Slagle 2017-01-25 15:28:17 -05:00
parent 0ae5fc4f77
commit 60ef21f450
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
os_cloud_config/glance.py
View File

@ -16,7 +16,7 @@
import collections
import logging
from glanceclient.openstack.common.apiclient import exceptions
from glanceclient import exc
LOG = logging.getLogger(__name__)
@ -51,7 +51,7 @@ def _upload_file(glanceclient, name, path, disk_format, type_name,
image_tuple = collections.namedtuple('image', ['id'])
try:
image = glanceclient.images.find(name=name, disk_format=disk_format)
except exceptions.NotFound:
except exc.HTTPNotFound:
if path:
image = glanceclient.images.create(
name=name, disk_format=disk_format, is_public=True,

14
os_cloud_config/tests/test_glance.py
View File

@ -16,7 +16,7 @@
import collections
import tempfile
from glanceclient.openstack.common.apiclient import exceptions
from glanceclient import exc
import mock
import testtools
@ -41,7 +41,7 @@ class GlanceTest(base.TestCase):
def test_raise_exception_kernel(self):
client = mock.MagicMock()
client.images.find.side_effect = exceptions.NotFound
client.images.find.side_effect = exc.HTTPNotFound
message = "Kernel image not found in Glance, and no path specified."
with testtools.ExpectedException(ValueError, message):
glance.create_or_find_kernel_and_ramdisk(client, 'bm-kernel',
@ -50,7 +50,7 @@ class GlanceTest(base.TestCase):
def test_raise_exception_ramdisk(self):
client = mock.MagicMock()
client.images.find.side_effect = (self.image('aaa'),
exceptions.NotFound)
exc.HTTPNotFound)
message = "Ramdisk image not found in Glance, and no path specified."
with testtools.ExpectedException(ValueError, message):
glance.create_or_find_kernel_and_ramdisk(client, 'bm-kernel',
@ -58,7 +58,7 @@ class GlanceTest(base.TestCase):
def test_skip_missing_no_kernel(self):
client = mock.MagicMock()
client.images.find.side_effect = (exceptions.NotFound,
client.images.find.side_effect = (exc.HTTPNotFound,
self.image('bbb'))
expected = {'kernel': None, 'ramdisk': 'bbb'}
ids = glance.create_or_find_kernel_and_ramdisk(
@ -68,7 +68,7 @@ class GlanceTest(base.TestCase):
def test_skip_missing_no_ramdisk(self):
client = mock.MagicMock()
client.images.find.side_effect = (self.image('aaa'),
exceptions.NotFound)
exc.HTTPNotFound)
expected = {'kernel': 'aaa', 'ramdisk': None}
ids = glance.create_or_find_kernel_and_ramdisk(
client, 'bm-kernel', 'bm-ramdisk', skip_missing=True)
@ -76,7 +76,7 @@ class GlanceTest(base.TestCase):
def test_skip_missing_kernel_and_ramdisk(self):
client = mock.MagicMock()
client.images.find.side_effect = exceptions.NotFound
client.images.find.side_effect = exc.HTTPNotFound
expected = {'kernel': None, 'ramdisk': None}
ids = glance.create_or_find_kernel_and_ramdisk(
client, 'bm-kernel', 'bm-ramdisk', skip_missing=True)
@ -84,7 +84,7 @@ class GlanceTest(base.TestCase):
def test_create_kernel_and_ramdisk(self):
client = mock.MagicMock()
client.images.find.side_effect = exceptions.NotFound
client.images.find.side_effect = exc.HTTPNotFound
client.images.create.side_effect = (self.image('aaa'),
self.image('zzz'))
expected = {'kernel': 'aaa', 'ramdisk': 'zzz'}