Replace dict(obj.iteritems() with dict(obj)
Since oslo.db 1.10, it's possible to convert directly a SQLAlchemy object to a dictionary using dict(obj) instead of having to write dict(obj.iteritems()). dict(obj) works also on regular dictionaries to duplicate a dictionary. Blueprint cinder-python3 Change-Id: I868a055d5bbfe6646aad3e36e1bf6c7a1ad7b449
This commit is contained in:
parent
55eca11e07
commit
a4f087b7a1
|
@ -272,7 +272,7 @@ class BackupsController(wsgi.Controller):
|
|||
except exception.ServiceNotFound as error:
|
||||
raise exc.HTTPInternalServerError(explanation=error.msg)
|
||||
|
||||
retval = self._view_builder.summary(req, dict(new_backup.iteritems()))
|
||||
retval = self._view_builder.summary(req, dict(new_backup))
|
||||
return retval
|
||||
|
||||
@wsgi.response(202)
|
||||
|
@ -316,7 +316,7 @@ class BackupsController(wsgi.Controller):
|
|||
explanation=error.msg, headers={'Retry-After': 0})
|
||||
|
||||
retval = self._view_builder.restore_summary(
|
||||
req, dict(new_restore.iteritems()))
|
||||
req, dict(new_restore))
|
||||
return retval
|
||||
|
||||
@wsgi.response(200)
|
||||
|
@ -334,7 +334,7 @@ class BackupsController(wsgi.Controller):
|
|||
raise exc.HTTPBadRequest(explanation=error.msg)
|
||||
|
||||
retval = self._view_builder.export_summary(
|
||||
req, dict(backup_info.iteritems()))
|
||||
req, dict(backup_info))
|
||||
LOG.debug('export record output: %s.', retval)
|
||||
return retval
|
||||
|
||||
|
@ -370,7 +370,7 @@ class BackupsController(wsgi.Controller):
|
|||
except exception.ServiceNotFound as error:
|
||||
raise exc.HTTPInternalServerError(explanation=error.msg)
|
||||
|
||||
retval = self._view_builder.summary(req, dict(new_backup.iteritems()))
|
||||
retval = self._view_builder.summary(req, dict(new_backup))
|
||||
LOG.debug('import record output: %s.', retval)
|
||||
return retval
|
||||
|
||||
|
|
|
@ -196,7 +196,7 @@ class CgsnapshotsController(wsgi.Controller):
|
|||
|
||||
retval = self._view_builder.summary(
|
||||
req,
|
||||
dict(new_cgsnapshot.iteritems()))
|
||||
dict(new_cgsnapshot))
|
||||
|
||||
return retval
|
||||
|
||||
|
|
|
@ -248,7 +248,7 @@ class ConsistencyGroupsController(wsgi.Controller):
|
|||
|
||||
retval = self._view_builder.summary(
|
||||
req,
|
||||
dict(new_consistencygroup.iteritems()))
|
||||
dict(new_consistencygroup))
|
||||
return retval
|
||||
|
||||
@wsgi.response(202)
|
||||
|
@ -300,7 +300,7 @@ class ConsistencyGroupsController(wsgi.Controller):
|
|||
|
||||
retval = self._view_builder.summary(
|
||||
req,
|
||||
dict(new_consistencygroup.iteritems()))
|
||||
dict(new_consistencygroup))
|
||||
return retval
|
||||
|
||||
@wsgi.serializers(xml=ConsistencyGroupTemplate)
|
||||
|
|
|
@ -62,8 +62,7 @@ class VolumeImageMetadataController(wsgi.Controller):
|
|||
except Exception:
|
||||
return
|
||||
if image_meta:
|
||||
resp_volume['volume_image_metadata'] = dict(
|
||||
image_meta.iteritems())
|
||||
resp_volume['volume_image_metadata'] = dict(image_meta)
|
||||
|
||||
@wsgi.extends
|
||||
def show(self, req, resp_obj, id):
|
||||
|
|
|
@ -145,7 +145,7 @@ class VolumeManageController(wsgi.Controller):
|
|||
msg = _("Service not found.")
|
||||
raise exc.HTTPNotFound(explanation=msg)
|
||||
|
||||
new_volume = dict(new_volume.iteritems())
|
||||
new_volume = dict(new_volume)
|
||||
utils.add_visible_admin_metadata(new_volume)
|
||||
|
||||
return self._view_builder.detail(req, new_volume)
|
||||
|
|
|
@ -175,7 +175,7 @@ class VolumeTransferController(wsgi.Controller):
|
|||
raise exc.HTTPNotFound(explanation=error.msg)
|
||||
|
||||
transfer = self._view_builder.create(req,
|
||||
dict(new_transfer.iteritems()))
|
||||
dict(new_transfer))
|
||||
return transfer
|
||||
|
||||
@wsgi.response(202)
|
||||
|
@ -211,7 +211,7 @@ class VolumeTransferController(wsgi.Controller):
|
|||
|
||||
transfer = \
|
||||
self._view_builder.summary(req,
|
||||
dict(accepted_transfer.iteritems()))
|
||||
dict(accepted_transfer))
|
||||
return transfer
|
||||
|
||||
def delete(self, req, id):
|
||||
|
|
|
@ -292,7 +292,7 @@ class VolumeController(wsgi.Controller):
|
|||
filters=search_opts,
|
||||
viewable_admin_meta=True)
|
||||
|
||||
volumes = [dict(vol.iteritems()) for vol in volumes]
|
||||
volumes = [dict(vol) for vol in volumes]
|
||||
|
||||
for volume in volumes:
|
||||
utils.add_visible_admin_metadata(volume)
|
||||
|
@ -401,7 +401,7 @@ class VolumeController(wsgi.Controller):
|
|||
# TODO(vish): Instance should be None at db layer instead of
|
||||
# trying to lazy load, but for now we turn it into
|
||||
# a dict to avoid an error.
|
||||
new_volume = dict(new_volume.iteritems())
|
||||
new_volume = dict(new_volume)
|
||||
|
||||
retval = _translate_volume_detail_view(context, new_volume, image_uuid)
|
||||
|
||||
|
|
|
@ -256,7 +256,7 @@ class VolumeController(wsgi.Controller):
|
|||
filters=filters,
|
||||
viewable_admin_meta=True)
|
||||
|
||||
volumes = [dict(vol.iteritems()) for vol in volumes]
|
||||
volumes = [dict(vol) for vol in volumes]
|
||||
|
||||
for volume in volumes:
|
||||
utils.add_visible_admin_metadata(volume)
|
||||
|
@ -442,7 +442,7 @@ class VolumeController(wsgi.Controller):
|
|||
# TODO(vish): Instance should be None at db layer instead of
|
||||
# trying to lazy load, but for now we turn it into
|
||||
# a dict to avoid an error.
|
||||
new_volume = dict(new_volume.iteritems())
|
||||
new_volume = dict(new_volume)
|
||||
retval = self._view_builder.detail(req, new_volume)
|
||||
|
||||
return retval
|
||||
|
|
|
@ -61,7 +61,7 @@ class API(base.Base):
|
|||
def get(self, context, backup_id):
|
||||
check_policy(context, 'get')
|
||||
rv = self.db.backup_get(context, backup_id)
|
||||
return dict(rv.iteritems())
|
||||
return dict(rv)
|
||||
|
||||
def delete(self, context, backup_id):
|
||||
"""Make the RPC call to delete a volume backup."""
|
||||
|
|
|
@ -580,7 +580,7 @@ class API(base.Base):
|
|||
|
||||
def get(self, context, group_id):
|
||||
rv = self.db.consistencygroup_get(context, group_id)
|
||||
group = dict(rv.iteritems())
|
||||
group = dict(rv)
|
||||
check_policy(context, 'get', group)
|
||||
return group
|
||||
|
||||
|
@ -676,7 +676,7 @@ class API(base.Base):
|
|||
def get_cgsnapshot(self, context, cgsnapshot_id):
|
||||
check_policy(context, 'get_cgsnapshot')
|
||||
rv = self.db.cgsnapshot_get(context, cgsnapshot_id)
|
||||
return dict(rv.iteritems())
|
||||
return dict(rv)
|
||||
|
||||
def get_all_cgsnapshots(self, context, search_opts=None):
|
||||
check_policy(context, 'get_all_cgsnapshots')
|
||||
|
|
|
@ -69,7 +69,7 @@ def _create_facade_lazily():
|
|||
if _FACADE is None:
|
||||
_FACADE = db_session.EngineFacade(
|
||||
CONF.database.connection,
|
||||
**dict(CONF.database.iteritems())
|
||||
**dict(CONF.database)
|
||||
)
|
||||
|
||||
if CONF.profiler.profiler_enabled:
|
||||
|
|
|
@ -495,12 +495,12 @@ class HostManager(object):
|
|||
host_state = self.host_state_cls(host,
|
||||
capabilities=capabilities,
|
||||
service=
|
||||
dict(service.iteritems()))
|
||||
dict(service))
|
||||
self.host_state_map[host] = host_state
|
||||
# update capabilities and attributes in host_state
|
||||
host_state.update_from_volume_capability(capabilities,
|
||||
service=
|
||||
dict(service.iteritems()))
|
||||
dict(service))
|
||||
active_hosts.add(host)
|
||||
|
||||
self._no_capabilities_hosts = no_capabilities_hosts
|
||||
|
|
|
@ -2883,7 +2883,7 @@ class VolumeTestCase(BaseVolumeTestCase):
|
|||
snapshot_obj = objects.Snapshot.get_by_id(self.context, snapshot_id)
|
||||
|
||||
snap = db.snapshot_get(context.get_admin_context(), snapshot_id)
|
||||
result_dict = dict(snap.iteritems())
|
||||
result_dict = dict(snap)
|
||||
result_meta = {
|
||||
result_dict['snapshot_metadata'][0].key:
|
||||
result_dict['snapshot_metadata'][0].value}
|
||||
|
|
|
@ -56,7 +56,7 @@ class API(base.Base):
|
|||
|
||||
def get(self, context, transfer_id):
|
||||
rv = self.db.transfer_get(context, transfer_id)
|
||||
return dict(rv.iteritems())
|
||||
return dict(rv)
|
||||
|
||||
def delete(self, context, transfer_id):
|
||||
"""Make the RPC call to delete a volume transfer."""
|
||||
|
|
|
@ -408,7 +408,7 @@ class API(base.Base):
|
|||
else:
|
||||
ctxt = context
|
||||
rv = self.db.volume_get(ctxt, volume_id)
|
||||
volume = dict(rv.iteritems())
|
||||
volume = dict(rv)
|
||||
try:
|
||||
check_policy(context, 'get', volume)
|
||||
except exception.PolicyNotAuthorized:
|
||||
|
@ -501,7 +501,7 @@ class API(base.Base):
|
|||
check_policy(context, 'get_volume')
|
||||
vref = self.db.volume_get(context, volume_id)
|
||||
LOG.info(_LI("Volume retrieved successfully."), resource=vref)
|
||||
return dict(vref.iteritems())
|
||||
return dict(vref)
|
||||
|
||||
def get_all_snapshots(self, context, search_opts=None):
|
||||
check_policy(context, 'get_all_snapshots')
|
||||
|
@ -941,7 +941,7 @@ class API(base.Base):
|
|||
rv = self.db.volume_metadata_get(context, volume['id'])
|
||||
LOG.info(_LI("Get volume metadata completed successfully."),
|
||||
resource=volume)
|
||||
return dict(rv.iteritems())
|
||||
return dict(rv)
|
||||
|
||||
@wrap_check_policy
|
||||
def delete_volume_metadata(self, context, volume, key):
|
||||
|
@ -1011,7 +1011,7 @@ class API(base.Base):
|
|||
rv = self.db.volume_admin_metadata_get(context, volume['id'])
|
||||
LOG.info(_LI("Get volume admin metadata completed successfully."),
|
||||
resource=volume)
|
||||
return dict(rv.iteritems())
|
||||
return dict(rv)
|
||||
|
||||
@wrap_check_policy
|
||||
def delete_volume_admin_metadata(self, context, volume, key):
|
||||
|
|
Loading…
Reference in New Issue