diff options
| author |   spisarski <s.pisarski@cablelabs.com> | 2017-04-20 14:15:30 -0600 |
|---|---|---|
| committer | spisarski <s.pisarski@cablelabs.com> | 2017-04-26 09:18:20 +0200 |
| commit | becbbabc63b0eff15ed6979947aeb75ddf6819c9 (patch) | |
| tree | e88dfc06420ddaa66745df6523a25ceb80f3417f /snaps/openstack/utils/tests/glance_utils_tests.py | |
| parent | 02fa5b4fcc78e8ea7cb34acd1175ede6af48df00 (diff) | |
Added support for Glance v2
Updated copyright date on new and edited files to current year.
JIRA: SNAPS-66
Change-Id: I491157d6ced8bd9322f99272fc14e00168faaf29
Signed-off-by: spisarski <s.pisarski@cablelabs.com>
Diffstat (limited to 'snaps/openstack/utils/tests/glance_utils_tests.py')
| -rw-r--r-- | snaps/openstack/utils/tests/glance_utils_tests.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/snaps/openstack/utils/tests/glance_utils_tests.py b/snaps/openstack/utils/tests/glance_utils_tests.py index d13908b..ba7f6cf 100644 --- a/snaps/openstack/utils/tests/glance_utils_tests.py +++ b/snaps/openstack/utils/tests/glance_utils_tests.py @@ -1,4 +1,4 @@ -# Copyright (c) 2016 Cable Television Laboratories, Inc. ("CableLabs") +# Copyright (c) 2017 Cable Television Laboratories, Inc. ("CableLabs") # and others. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -19,7 +19,6 @@ import uuid from snaps import file_utils from snaps.openstack.tests import openstack_tests -from snaps.openstack.utils import nova_utils from snaps.openstack.tests import validation_utils from snaps.openstack.tests.os_source_file_test import OSComponentTestCase from snaps.openstack.utils import glance_utils @@ -65,7 +64,6 @@ class GlanceUtilsTests(OSComponentTestCase): guid = uuid.uuid4() self.image_name = self.__class__.__name__ + '-' + str(guid) self.image = None - self.nova = nova_utils.nova_client(self.os_creds) self.glance = glance_utils.glance_client(self.os_creds) self.tmp_dir = 'tmp/' + str(guid) @@ -93,7 +91,7 @@ class GlanceUtilsTests(OSComponentTestCase): self.assertEqual(self.image_name, self.image.name) - image = glance_utils.get_image(self.nova, self.glance, os_image_settings.name) + image = glance_utils.get_image(self.glance, os_image_settings.name) self.assertIsNotNone(image) validation_utils.objects_equivalent(self.image, image) @@ -110,6 +108,6 @@ class GlanceUtilsTests(OSComponentTestCase): self.assertIsNotNone(self.image) self.assertEqual(self.image_name, self.image.name) - image = glance_utils.get_image(self.nova, self.glance, file_image_settings.name) + image = glance_utils.get_image(self.glance, file_image_settings.name) self.assertIsNotNone(image) validation_utils.objects_equivalent(self.image, image) |