Merge "Remove volumes.promote and volumes.reenable action from cinder"

This commit is contained in:
Zuul 2019-09-27 19:01:39 +00:00 committed by Gerrit Code Review
commit 4f0c4c8c2a
2 changed files with 3 additions and 5 deletions

View File

@ -235,7 +235,7 @@ class NeutronAction(base.OpenStackAction):
class CinderAction(base.OpenStackAction): class CinderAction(base.OpenStackAction):
_service_type = 'volumev2' _service_type = 'volumev3'
@classmethod @classmethod
def _get_client_class(cls): def _get_client_class(cls):
@ -268,7 +268,7 @@ class CinderAction(base.OpenStackAction):
@classmethod @classmethod
def _get_fake_client(cls): def _get_fake_client(cls):
return cls._get_client_class()('2') return cls._get_client_class()('3')
class MistralAction(base.OpenStackAction): class MistralAction(base.OpenStackAction):

View File

@ -632,7 +632,7 @@
"update_vpnservice": "update_vpnservice" "update_vpnservice": "update_vpnservice"
}, },
"cinder": { "cinder": {
"_comment": "It uses cinderclient.v2.", "_comment": "It uses cinderclient.v3.",
"availability_zones_find": "availability_zones.find", "availability_zones_find": "availability_zones.find",
"availability_zones_findall": "availability_zones.findall", "availability_zones_findall": "availability_zones.findall",
"availability_zones_list": "availability_zones.list", "availability_zones_list": "availability_zones.list",
@ -746,8 +746,6 @@
"volumes_manage": "volumes.manage", "volumes_manage": "volumes.manage",
"volumes_migrate_volume": "volumes.migrate_volume", "volumes_migrate_volume": "volumes.migrate_volume",
"volumes_migrate_volume_completion": "volumes.migrate_volume_completion", "volumes_migrate_volume_completion": "volumes.migrate_volume_completion",
"volumes_promote": "volumes.promote",
"volumes_reenable": "volumes.reenable",
"volumes_reserve": "volumes.reserve", "volumes_reserve": "volumes.reserve",
"volumes_reset_state": "volumes.reset_state", "volumes_reset_state": "volumes.reset_state",
"volumes_retype": "volumes.retype", "volumes_retype": "volumes.retype",