Fix broken gate jobs

This patch aims at fixing the broken gate jobs because of
cinder and glance patches [1], [2], [3] and [4].

* Remove parameter `--source-replicated` to drop volume
  replication v1 support
* Address some timing issues with volume transfer requests
* Only run Image v1 tests when the test cloud has v1 available
* Get tolerant of unexpected additional attributes being
  returned in Image data

[1].https://review.openstack.org/#/c/586293/
[2].https://review.openstack.org/#/c/532503/
[3].https://review.openstack.org/#/c/533564/
[4].https://review.openstack.org/#/c/578755/

Co-Authored-By: Dean Troyer <dtroyer@gmail.com>
Co-Authored-By: Monty Taylor <mordred@inaugust.com>
Depends-on: https://review.openstack.org/588664
Change-Id: I2a785750e92155185d3344e6116c7f5c6fdd3cbe
Signed-off-by: Fan Zhang <zh.f@outlook.com>

1 files changed, 0 insertions, 47 deletions

diff --git a/openstackclient/tests/unit/volume/v2/test_volume.py b/openstackclient/tests/unit/volume/v2/test_volume.py
index 304aa91c..971567cb 100644
--- a/openstackclient/tests/unit/volume/v2/test_volume.py
+++ b/openstackclient/tests/unit/volume/v2/test_volume.py
@@ -133,7 +133,6 @@ class TestVolumeCreate(TestVolume):
             imageRef=None,
             source_volid=None,
             consistencygroup_id=None,
-            source_replica=None,
             multiattach=False,
             scheduler_hints=None,
         )
@@ -185,7 +184,6 @@ class TestVolumeCreate(TestVolume):
             imageRef=None,
             source_volid=None,
             consistencygroup_id=consistency_group.id,
-            source_replica=None,
             multiattach=True,
             scheduler_hints={'k': 'v'},
         )
@@ -231,7 +229,6 @@ class TestVolumeCreate(TestVolume):
             imageRef=None,
             source_volid=None,
             consistencygroup_id=None,
-            source_replica=None,
             multiattach=False,
             scheduler_hints=None,
         )
@@ -277,7 +274,6 @@ class TestVolumeCreate(TestVolume):
             imageRef=None,
             source_volid=None,
             consistencygroup_id=None,
-            source_replica=None,
             multiattach=False,
             scheduler_hints=None,
         )
@@ -317,7 +313,6 @@ class TestVolumeCreate(TestVolume):
             imageRef=None,
             source_volid=None,
             consistencygroup_id=None,
-            source_replica=None,
             multiattach=False,
             scheduler_hints=None,
         )
@@ -359,7 +354,6 @@ class TestVolumeCreate(TestVolume):
             imageRef=image.id,
             source_volid=None,
             consistencygroup_id=None,
-            source_replica=None,
             multiattach=False,
             scheduler_hints=None,
         )
@@ -401,7 +395,6 @@ class TestVolumeCreate(TestVolume):
             imageRef=image.id,
             source_volid=None,
             consistencygroup_id=None,
-            source_replica=None,
             multiattach=False,
             scheduler_hints=None,
         )
@@ -442,7 +435,6 @@ class TestVolumeCreate(TestVolume):
             imageRef=None,
             source_volid=None,
             consistencygroup_id=None,
-            source_replica=None,
             multiattach=False,
             scheduler_hints=None,
         )
@@ -484,7 +476,6 @@ class TestVolumeCreate(TestVolume):
             imageRef=None,
             source_volid=None,
             consistencygroup_id=None,
-            source_replica=None,
             multiattach=False,
             scheduler_hints=None,
         )
@@ -530,7 +521,6 @@ class TestVolumeCreate(TestVolume):
             imageRef=None,
             source_volid=None,
             consistencygroup_id=None,
-            source_replica=None,
             multiattach=False,
             scheduler_hints=None,
         )
@@ -585,7 +575,6 @@ class TestVolumeCreate(TestVolume):
             imageRef=None,
             source_volid=None,
             consistencygroup_id=None,
-            source_replica=None,
             multiattach=False,
             scheduler_hints=None,
         )
@@ -598,40 +587,6 @@ class TestVolumeCreate(TestVolume):
         self.volumes_mock.update_readonly_flag.assert_called_with(
             self.new_volume.id, True)
 
-    def test_volume_create_with_source_replicated(self):
-        self.volumes_mock.get.return_value = self.new_volume
-        arglist = [
-            '--source-replicated', self.new_volume.id,
-            self.new_volume.name,
-        ]
-        verifylist = [
-            ('source_replicated', self.new_volume.id),
-            ('name', self.new_volume.name),
-        ]
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
-        columns, data = self.cmd.take_action(parsed_args)
-        self.volumes_mock.create.assert_called_once_with(
-            size=None,
-            snapshot_id=None,
-            name=self.new_volume.name,
-            description=None,
-            volume_type=None,
-            user_id=None,
-            project_id=None,
-            availability_zone=None,
-            metadata=None,
-            imageRef=None,
-            source_volid=None,
-            consistencygroup_id=None,
-            source_replica=self.new_volume.id,
-            multiattach=False,
-            scheduler_hints=None,
-        )
-
-        self.assertEqual(self.columns, columns)
-        self.assertEqual(self.datalist, data)
-
     def test_volume_create_without_size(self):
         arglist = [
             self.new_volume.name,
@@ -649,7 +604,6 @@ class TestVolumeCreate(TestVolume):
             '--image', 'source_image',
             '--source', 'source_volume',
             '--snapshot', 'source_snapshot',
-            '--source-replicated', 'source_replicated_volume',
             '--size', str(self.new_volume.size),
             self.new_volume.name,
         ]
@@ -657,7 +611,6 @@ class TestVolumeCreate(TestVolume):
             ('image', 'source_image'),
             ('source', 'source_volume'),
             ('snapshot', 'source_snapshot'),
-            ('source-replicated', 'source_replicated_volume'),
             ('size', self.new_volume.size),
             ('name', self.new_volume.name),
         ]