From 8d437fa8ed6571dc8746a35d9adeed6b4b8bef9b Mon Sep 17 00:00:00 2001 From: Steve Lewis Date: Tue, 18 Nov 2014 14:09:55 -0800 Subject: [PATCH] Add image V2 service version No resources introduced yet. Change-Id: I175a5577ce48db50c0b708618c3c86dceddec51b --- openstack/image/image_service.py | 5 ++++- openstack/image/v2/__init__.py | 0 openstack/tests/image/test_image_service.py | 4 +++- openstack/tests/image/v2/__init__.py | 0 4 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 openstack/image/v2/__init__.py create mode 100644 openstack/tests/image/v2/__init__.py diff --git a/openstack/image/image_service.py b/openstack/image/image_service.py index 8eb6a8fbc..58ddfd632 100644 --- a/openstack/image/image_service.py +++ b/openstack/image/image_service.py @@ -16,7 +16,10 @@ from openstack.auth import service_filter class ImageService(service_filter.ServiceFilter): """The image service.""" - valid_versions = [service_filter.ValidVersion('v1')] + valid_versions = [ + service_filter.ValidVersion('v1'), + service_filter.ValidVersion('v2'), + ] def __init__(self): """Create an image service.""" diff --git a/openstack/image/v2/__init__.py b/openstack/image/v2/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/openstack/tests/image/test_image_service.py b/openstack/tests/image/test_image_service.py index 8346888a3..f93b662da 100644 --- a/openstack/tests/image/test_image_service.py +++ b/openstack/tests/image/test_image_service.py @@ -23,6 +23,8 @@ class TestImageService(testtools.TestCase): self.assertEqual('public', sot.visibility) self.assertIsNone(sot.region) self.assertIsNone(sot.service_name) - self.assertEqual(1, len(sot.valid_versions)) + self.assertEqual(2, len(sot.valid_versions)) self.assertEqual('v1', sot.valid_versions[0].module) self.assertEqual('v1', sot.valid_versions[0].path) + self.assertEqual('v2', sot.valid_versions[1].module) + self.assertEqual('v2', sot.valid_versions[1].path) diff --git a/openstack/tests/image/v2/__init__.py b/openstack/tests/image/v2/__init__.py new file mode 100644 index 000000000..e69de29bb