From: John Griffith <john.griffith@solidfire.com>
Date: Thu, 7 May 2015 22:27:05 +0000 (-0600)
Subject: Fix xxx=\n pep8 errors in volume_utils.py
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=09fbf1d5e524fb3a9f9dd0286e4ee9f8f913df6f;p=openstack-build%2Fcinder-build.git

Fix xxx=\n pep8 errors in volume_utils.py

Newer versions of pep8 will catch this and complain,
rather than continuing to ignore in my editor just fix
them up real quick.

Change-Id: Ib19b11cad3508d879059a22b4a81aa024b5d9a30
---

diff --git a/cinder/volume/utils.py b/cinder/volume/utils.py
index d24211858..07d9ebb1b 100644
--- a/cinder/volume/utils.py
+++ b/cinder/volume/utils.py
@@ -43,26 +43,22 @@ def null_safe_str(s):
 
 
 def _usage_from_volume(context, volume_ref, **kw):
-    usage_info = dict(tenant_id=volume_ref['project_id'],
-                      host=volume_ref['host'],
-                      user_id=volume_ref['user_id'],
-                      availability_zone=volume_ref['availability_zone'],
-                      volume_id=volume_ref['id'],
-                      volume_type=volume_ref['volume_type_id'],
-                      display_name=volume_ref['display_name'],
-                      launched_at=timeutils.isotime(at=
-                                                    volume_ref['launched_at']),
-                      created_at=timeutils.isotime(at=
-                                                   volume_ref['created_at']),
-                      status=volume_ref['status'],
-                      snapshot_id=volume_ref['snapshot_id'],
-                      size=volume_ref['size'],
-                      replication_status=volume_ref['replication_status'],
-                      replication_extended_status=
-                      volume_ref['replication_extended_status'],
-                      replication_driver_data=
-                      volume_ref['replication_driver_data'],
-                      )
+    usage_info = dict(
+        tenant_id=volume_ref['project_id'],
+        host=volume_ref['host'],
+        user_id=volume_ref['user_id'],
+        availability_zone=volume_ref['availability_zone'],
+        volume_id=volume_ref['id'],
+        volume_type=volume_ref['volume_type_id'],
+        display_name=volume_ref['display_name'],
+        launched_at=timeutils.isotime(at=volume_ref['launched_at']),
+        created_at=timeutils.isotime(at=volume_ref['created_at']),
+        status=volume_ref['status'],
+        snapshot_id=volume_ref['snapshot_id'],
+        size=volume_ref['size'],
+        replication_status=volume_ref['replication_status'],
+        replication_extended_status=volume_ref['replication_extended_status'],
+        replication_driver_data=volume_ref['replication_driver_data'],)
 
     usage_info.update(kw)
     return usage_info