Merge "Add image V2 service version"

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."""

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)