[Libstoragemgmt-devel] [PATCH] pep8 cleanup

[Ma Shimiao]

Signed-off-by: Ma Shimiao <***@cn.fujitsu.com>
---
lsm/lsm/__init__.py | 12 +++++++-----
lsm/lsm/cmdline.py | 2 +-
lsm/lsm/ibmv7k.py | 15 ++++++++++-----
lsm/lsm/nstor.py | 2 +-
lsm/lsm/smisproxy.py | 1 -
5 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/lsm/lsm/__init__.py b/lsm/lsm/__init__.py
index 39c99f7..3c3f0b9 100644
--- a/lsm/lsm/__init__.py
+++ b/lsm/lsm/__init__.py
@@ -10,11 +10,13 @@ __all__ = ["client",

from client import Client
from cmdline import ArgError, CmdLine
-from common import Error, Info, SocketEOF, LsmError, ErrorLevel, ErrorNumber, \
- JobStatus
-from data import DataEncoder, DataDecoder, IData, Initiator, Disk, Volume, Pool, \
- System, FileSystem, Snapshot, NfsExport, BlockRange, AccessGroup, OptionalData
-from iplugin import IPlugin, IStorageAreaNetwork, INetworkAttachedStorage, INfs
+from common import Error, Info, SocketEOF, LsmError, ErrorLevel, \
+ ErrorNumber, JobStatus
+from data import DataEncoder, DataDecoder, IData, Initiator, Disk, \
+ Volume, Pool, System, FileSystem, Snapshot, NfsExport, BlockRange, \
+ AccessGroup, OptionalData
+from iplugin import IPlugin, IStorageAreaNetwork, INetworkAttachedStorage, \
+ INfs

from pluginrunner import PluginRunner
from simulator import SimPlugin
diff --git a/lsm/lsm/cmdline.py b/lsm/lsm/cmdline.py
index 183c5b6..59a6c01 100644
--- a/lsm/lsm/cmdline.py
+++ b/lsm/lsm/cmdline.py
@@ -1648,7 +1648,7 @@ class CmdLine:
args.member_type)
if member_type == data.Pool.MEMBER_TYPE_UNKNOWN:
raise ArgError("Unkonwn member type specified: %s" %
- args.member_type)
+ args.member_type)

pool = self._wait_for_it("pool-create",
*self.c.pool_create(self.args.sys,
diff --git a/lsm/lsm/ibmv7k.py b/lsm/lsm/ibmv7k.py
index c6972c8..dd2fde6 100644
--- a/lsm/lsm/ibmv7k.py
+++ b/lsm/lsm/ibmv7k.py
@@ -332,7 +332,8 @@ class IbmV7k(IStorageAreaNetwork):
except LsmError as le:
if le.code == ErrorNumber.NOT_FOUND_INITIATOR:
# Auto add the initiator
- exit_code, stdout, stderr = self._initiator_create(init_id, init_type)
+ exit_code, stdout, stderr = self._initiator_create(init_id,
+ init_type)
if self._initiator_create_is_success(stdout):
# If success, get the v7k id for the new init
# This should not cause an exception this time!
@@ -378,7 +379,8 @@ class IbmV7k(IStorageAreaNetwork):
self.tmo = timeout
self.up = uri_parse(uri)

- self.ssh = SSHClient(self.up['host'], self.up['username'], self.password, self.tmo)
+ self.ssh = SSHClient(self.up['host'], self.up['username'],
+ self.password, self.tmo)

si = self._get_system_info()
self.sys_info = System(si['id'], si['name'], System.STATUS_OK)
@@ -386,7 +388,8 @@ class IbmV7k(IStorageAreaNetwork):
def set_time_out(self, ms, flags=0):
self.tmo = ms
self.ssh.close()
- self.ssh = SSHClient(self.up['host'], self.up['username'], self.password, self.tmo)
+ self.ssh = SSHClient(self.up['host'], self.up['username'],
+ self.password, self.tmo)

def get_time_out(self, flags=0):
return self.tmo
@@ -495,8 +498,10 @@ class IbmV7k(IStorageAreaNetwork):
raise LsmError(ErrorNumber.NO_SUPPORT,
"Only RW access to the volume is supported")

- exit_code, stdout, stderr = self._initiator_grant(initiator_id, initiator_type,
- volume.id, force=True)
+ exit_code, stdout, stderr = self._initiator_grant(initiator_id,
+ initiator_type,
+ volume.id,
+ force=True)
return self._initiator_grant_is_success(stdout)

def initiator_revoke(self, initiator, volume, flags=0):
diff --git a/lsm/lsm/nstor.py b/lsm/lsm/nstor.py
index 36cbe1f..5fcf473 100644
--- a/lsm/lsm/nstor.py
+++ b/lsm/lsm/nstor.py
@@ -644,7 +644,7 @@ class NexentaStor(INfs, IStorageAreaNetwork):
self._request("create_initiator", "iscsitarget",
[initiator.name,
{'initiatorchapuser': in_user,
- 'initiatorchapsecret': in_password}])
+ 'initiatorchapsecret': in_password}])
except:
self._request("modify_initiator", "iscsitarget",
[initiator.name,
diff --git a/lsm/lsm/smisproxy.py b/lsm/lsm/smisproxy.py
index 905b13f..9533389 100644
--- a/lsm/lsm/smisproxy.py
+++ b/lsm/lsm/smisproxy.py
@@ -33,7 +33,6 @@ class SmisProxy(common.Proxy):
def plugin_info(self, flags=0):
return "Generic SMI-S support", VERSION

-
def startup(self, uri, password, timeout, flags=0):
"""
We will provide a concrete implementation of this to get the process

[Tony Asleson]

Patch pushed, thanks!

-Tony

Post by Ma Shimiao
---
lsm/lsm/__init__.py | 12 +++++++-----
lsm/lsm/cmdline.py | 2 +-
lsm/lsm/ibmv7k.py | 15 ++++++++++-----
lsm/lsm/nstor.py | 2 +-
lsm/lsm/smisproxy.py | 1 -
5 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/lsm/lsm/__init__.py b/lsm/lsm/__init__.py
index 39c99f7..3c3f0b9 100644
--- a/lsm/lsm/__init__.py
+++ b/lsm/lsm/__init__.py
@@ -10,11 +10,13 @@ __all__ = ["client",
from client import Client
from cmdline import ArgError, CmdLine
-from common import Error, Info, SocketEOF, LsmError, ErrorLevel, ErrorNumber, \
- JobStatus
-from data import DataEncoder, DataDecoder, IData, Initiator, Disk, Volume, Pool, \
- System, FileSystem, Snapshot, NfsExport, BlockRange, AccessGroup, OptionalData
-from iplugin import IPlugin, IStorageAreaNetwork, INetworkAttachedStorage, INfs
+from common import Error, Info, SocketEOF, LsmError, ErrorLevel, \
+ ErrorNumber, JobStatus
+from data import DataEncoder, DataDecoder, IData, Initiator, Disk, \
+ Volume, Pool, System, FileSystem, Snapshot, NfsExport, BlockRange, \
+ AccessGroup, OptionalData
+from iplugin import IPlugin, IStorageAreaNetwork, INetworkAttachedStorage, \
+ INfs
from pluginrunner import PluginRunner
from simulator import SimPlugin
diff --git a/lsm/lsm/cmdline.py b/lsm/lsm/cmdline.py
index 183c5b6..59a6c01 100644
--- a/lsm/lsm/cmdline.py
+++ b/lsm/lsm/cmdline.py
args.member_type)
raise ArgError("Unkonwn member type specified: %s" %
- args.member_type)
+ args.member_type)
pool = self._wait_for_it("pool-create",
*self.c.pool_create(self.args.sys,
diff --git a/lsm/lsm/ibmv7k.py b/lsm/lsm/ibmv7k.py
index c6972c8..dd2fde6 100644
--- a/lsm/lsm/ibmv7k.py
+++ b/lsm/lsm/ibmv7k.py
# Auto add the initiator
- exit_code, stdout, stderr = self._initiator_create(init_id, init_type)
+ exit_code, stdout, stderr = self._initiator_create(init_id,
+ init_type)
# If success, get the v7k id for the new init
# This should not cause an exception this time!
self.tmo = timeout
self.up = uri_parse(uri)
- self.ssh = SSHClient(self.up['host'], self.up['username'], self.password, self.tmo)
+ self.ssh = SSHClient(self.up['host'], self.up['username'],
+ self.password, self.tmo)
si = self._get_system_info()
self.sys_info = System(si['id'], si['name'], System.STATUS_OK)
self.tmo = ms
self.ssh.close()
- self.ssh = SSHClient(self.up['host'], self.up['username'], self.password, self.tmo)
+ self.ssh = SSHClient(self.up['host'], self.up['username'],
+ self.password, self.tmo)
return self.tmo
raise LsmError(ErrorNumber.NO_SUPPORT,
"Only RW access to the volume is supported")
- exit_code, stdout, stderr = self._initiator_grant(initiator_id, initiator_type,
- volume.id, force=True)
+ exit_code, stdout, stderr = self._initiator_grant(initiator_id,
+ initiator_type,
+ volume.id,
+ force=True)
return self._initiator_grant_is_success(stdout)
diff --git a/lsm/lsm/nstor.py b/lsm/lsm/nstor.py
index 36cbe1f..5fcf473 100644
--- a/lsm/lsm/nstor.py
+++ b/lsm/lsm/nstor.py
self._request("create_initiator", "iscsitarget",
[initiator.name,
{'initiatorchapuser': in_user,
- 'initiatorchapsecret': in_password}])
+ 'initiatorchapsecret': in_password}])
self._request("modify_initiator", "iscsitarget",
[initiator.name,
diff --git a/lsm/lsm/smisproxy.py b/lsm/lsm/smisproxy.py
index 905b13f..9533389 100644
--- a/lsm/lsm/smisproxy.py
+++ b/lsm/lsm/smisproxy.py
return "Generic SMI-S support", VERSION
-
"""
We will provide a concrete implementation of this to get the process