openstack
/
cinder
Code Issues Proposed changes

Merge "Remove usage of taskflow 'utils.misc' module"

This commit is contained in:
Jenkins 2015-01-23 23:34:21 +00:00 committed by Gerrit Code Review
parent 9906718cc2 bb6b19c9dc
commit c963fbb6f2
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cinder/volume/flows/api/create_volume.py
View File

@ -16,7 +16,7 @@ from oslo_utils import timeutils
from oslo_utils import units
import taskflow.engines
from taskflow.patterns import linear_flow
from taskflow.utils import misc
from taskflow.types import failure as ft
from cinder import exception
from cinder import flow_utils
@ -510,7 +510,7 @@ class EntryCreateTask(flow_utils.CinderTask):
def revert(self, context, result, optional_args, **kwargs):
# We never produced a result and therefore can't destroy anything.
if isinstance(result, misc.Failure):
if isinstance(result, ft.Failure):
return
if optional_args['is_quota_committed']:
@ -595,7 +595,7 @@ class QuotaReserveTask(flow_utils.CinderTask):
def revert(self, context, result, optional_args, **kwargs):
# We never produced a result and therefore can't destroy anything.
if isinstance(result, misc.Failure):
if isinstance(result, ft.Failure):
return
if optional_args['is_quota_committed']:
@ -641,7 +641,7 @@ class QuotaCommitTask(flow_utils.CinderTask):
def revert(self, context, result, **kwargs):
# We never produced a result and therefore can't destroy anything.
if isinstance(result, misc.Failure):
if isinstance(result, ft.Failure):
return
volume = result['volume_properties']
try:
@ -749,7 +749,7 @@ class VolumeCastTask(flow_utils.CinderTask):
self._cast_create_volume(context, request_spec, filter_properties)
def revert(self, context, result, flow_failures, **kwargs):
if isinstance(result, misc.Failure):
if isinstance(result, ft.Failure):
return
# Restore the source volume status and set the volume to error status.

6
cinder/volume/flows/manager/create_volume.py
View File

@ -17,7 +17,7 @@ from oslo_config import cfg
from oslo_utils import timeutils
import taskflow.engines
from taskflow.patterns import linear_flow
from taskflow.utils import misc
from taskflow.types import failure as ft
from cinder import exception
from cinder import flow_utils
@ -184,7 +184,7 @@ class ExtractVolumeRefTask(flow_utils.CinderTask):
return volume_ref
def revert(self, context, volume_id, result, **kwargs):
if isinstance(result, misc.Failure):
if isinstance(result, ft.Failure):
return
common.error_out_volume(context, self.db, volume_id)
@ -287,7 +287,7 @@ class ExtractVolumeSpecTask(flow_utils.CinderTask):
return specs
def revert(self, context, result, **kwargs):
if isinstance(result, misc.Failure):
if isinstance(result, ft.Failure):
return
volume_spec = result.get('volume_spec')
# Restore the source volume status and set the volume to error status.