Merge "Fix broken gate jobs"

Author: Zuul

doc/source/cli/command-objects/volume.rst

@@ -15,7 +15,7 @@ Create new volume
     openstack volume create
         [--size <size>]
         [--type <volume-type>]
-        [--image <image> | --snapshot <snapshot> | --source <volume> | --source-replicated <replicated-volume>]
+        [--image <image> | --snapshot <snapshot> | --source <volume> ]
         [--description <description>]
         [--user <user>]
         [--project <project>]
@@ -31,7 +31,7 @@ Create new volume
 .. option:: --size <size>
 
     Volume size in GB
-    (Required unless --snapshot or --source or --source-replicated is specified)
+    (Required unless --snapshot or --source is specified)
 
 .. option:: --type <volume-type>
 
@@ -54,10 +54,6 @@ Create new volume
 
     Volume to clone (name or ID)
 
-.. option:: --source-replicated <replicated-volume>
-
-    Replicated volume to clone (name or ID)
-
 .. option:: --description <description>
 
     Volume description

openstackclient/tests/functional/image/base.py

@@ -0,0 +1,24 @@
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+from openstackclient.tests.functional import base
+
+
+class BaseImageTests(base.TestCase):
+    """Functional tests for Image commands"""
+
+    @classmethod
+    def setUpClass(cls):
+        super(BaseImageTests, cls).setUpClass()
+        # TODO(dtroyer): maybe do image API discovery here to determine
+        #                what is available, it isn't in the service catalog
+        cls.haz_v1_api = False

openstackclient/tests/functional/image/v1/test_image.py

@@ -15,50 +15,47 @@
 
 import fixtures
 
-from openstackclient.tests.functional import base
+from openstackclient.tests.functional.image import base
 
 
-class ImageTests(base.TestCase):
-    """Functional tests for image. """
+class ImageTests(base.BaseImageTests):
+    """Functional tests for Image commands"""
 
-    NAME = uuid.uuid4().hex
-    OTHER_NAME = uuid.uuid4().hex
+    def setUp(self):
+        super(ImageTests, self).setUp()
+        if not self.haz_v1_api:
+            self.skipTest('No Image v1 API present')
 
-    @classmethod
-    def setUpClass(cls):
-        super(ImageTests, cls).setUpClass()
-        json_output = json.loads(cls.openstack(
+        self.name = uuid.uuid4().hex
+        json_output = json.loads(self.openstack(
             '--os-image-api-version 1 '
             'image create -f json ' +
-            cls.NAME
+            self.name
         ))
-        cls.image_id = json_output["id"]
-        cls.assertOutput(cls.NAME, json_output['name'])
+        self.image_id = json_output["id"]
+        self.assertOutput(self.name, json_output['name'])
+
+        ver_fixture = fixtures.EnvironmentVariable(
+            'OS_IMAGE_API_VERSION', '1'
+        )
+        self.useFixture(ver_fixture)
 
-    @classmethod
-    def tearDownClass(cls):
+    def tearDown(self):
         try:
-            cls.openstack(
+            self.openstack(
                 '--os-image-api-version 1 '
                 'image delete ' +
-                cls.image_id
+                self.image_id
             )
         finally:
-            super(ImageTests, cls).tearDownClass()
-
-    def setUp(self):
-        super(ImageTests, self).setUp()
-        ver_fixture = fixtures.EnvironmentVariable(
-            'OS_IMAGE_API_VERSION', '1'
-        )
-        self.useFixture(ver_fixture)
+            super(ImageTests, self).tearDown()
 
     def test_image_list(self):
         json_output = json.loads(self.openstack(
             'image list -f json '
         ))
         self.assertIn(
-            self.NAME,
+            self.name,
             [img['Name'] for img in json_output]
         )
 
@@ -72,11 +69,11 @@ def test_image_attributes(self):
             '--min-ram 5 ' +
             '--disk-format qcow2 ' +
             '--public ' +
-            self.NAME
+            self.name
         )
         json_output = json.loads(self.openstack(
             'image show -f json ' +
-            self.NAME
+            self.name
         ))
         self.assertEqual(
             4,
@@ -100,11 +97,11 @@ def test_image_attributes(self):
             '--property a=b ' +
             '--property c=d ' +
             '--public ' +
-            self.NAME
+            self.name
         )
         json_output = json.loads(self.openstack(
             'image show -f json ' +
-            self.NAME
+            self.name
         ))
         self.assertEqual(
             "a='b', c='d'",