Optimize "open" method with context manager

Replace the classic open() with opening context manager to open
files which is in the create_iscsi_target methods of volume targets.

Change-Id: I12e19801a21b1279308983fd0257dae9c9653641

diff --git a/cinder/volume/targets/cxt.py b/cinder/volume/targets/cxt.py
index 9a4b4c4cfe07ca7e9b42ddb64149deb7b88c030a..c08974f21fd6e26923b07940f504d7e578da14f8 100644 (file)
--- a/cinder/volume/targets/cxt.py
+++ b/cinder/volume/targets/cxt.py
@@ -130,9 +130,8 @@ class CxtAdm(iscsi.ISCSITarget):
         if os.path.exists(volume_path):
             LOG.warning(_LW('Persistence file already exists for volume, '
                             'found file at: %s'), volume_path)
-        f = open(volume_path, 'w+')
-        f.write(volume_conf)
-        f.close()
+        with open(volume_path, 'w+') as f:
+            f.write(volume_conf)
         LOG.debug('Created volume path %(vp)s,\n'
                   'content: %(vc)s',
                   {'vp': volume_path, 'vc': volume_conf})

diff --git a/cinder/volume/targets/tgt.py b/cinder/volume/targets/tgt.py
index ad93713b01ec2a29733375c21c5684b7adbcb477..57c02efd6ad70f1fbe97577b9e5478218b9fc37f 100644 (file)
--- a/cinder/volume/targets/tgt.py
+++ b/cinder/volume/targets/tgt.py
@@ -165,9 +165,8 @@ class TgtAdm(iscsi.ISCSITarget):
         if os.path.exists(volume_path):
             LOG.warning(_LW('Persistence file already exists for volume, '
                             'found file at: %s'), volume_path)
-        f = open(volume_path, 'w+')
-        f.write(volume_conf)
-        f.close()
+        with open(volume_path, 'w+') as f:
+            f.write(volume_conf)
         LOG.debug(('Created volume path %(vp)s,\n'
                    'content: %(vc)s'),
                   {'vp': volume_path, 'vc': volume_conf})