[Libstoragemgmt-devel] [PATCH 6/6] _data.py: PEP8 Fixes

[Tony Asleson]

Signed-off-by: Tony Asleson <***@redhat.com>
---
python_binding/lsm/_data.py | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/python_binding/lsm/_data.py b/python_binding/lsm/_data.py
index 51626bd..ff5065f 100644
--- a/python_binding/lsm/_data.py
+++ b/python_binding/lsm/_data.py
@@ -451,7 +451,8 @@ class Pool(IData):
Will return Pool.MEMBER_TYPE_DISK as failback.
"""
# Invert dict. Assumes values are unique.
- inv_dict = dict((v,k) for k, v in Pool._MEMBER_TYPE_2_DISK_TYPE.iteritems())
+ inv_dict = dict((v, k)
+ for k, v in Pool._MEMBER_TYPE_2_DISK_TYPE.iteritems())
return inv_dict.get(disk_type, Pool.MEMBER_TYPE_DISK)

THINP_TYPE_UNKNOWN = 0
@@ -855,11 +856,11 @@ class Capabilities(IData):
integer => string name
"""
lsm_cap_to_str_conv = dict()
- for cap_str, cap_int in Capabilities.__dict__.items():
- if type(cap_str) == str and type(cap_int) == int and \
- cap_str[0] != '_' and \
- Capabilities._CAP_NUM_BEGIN <= cap_int <= Capabilities._NUM:
- lsm_cap_to_str_conv[cap_int] = cap_str
+ for c_str, c_int in Capabilities.__dict__.items():
+ if type(c_str) == str and type(c_int) == int and \
+ c_str[0] != '_' and \
+ Capabilities._CAP_NUM_BEGIN <= c_int <= Capabilities._NUM:
+ lsm_cap_to_str_conv[c_int] = c_str
return lsm_cap_to_str_conv

def get_supported(self, all_cap=False):

[Tony Asleson]

Signed-off-by: Tony Asleson <***@redhat.com>
---
test/cmdtest.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/cmdtest.py b/test/cmdtest.py
index f63cc4a..0dcd91c 100755
--- a/test/cmdtest.py
+++ b/test/cmdtest.py
@@ -439,8 +439,7 @@ def test_display(cap, system_id):
Crank through supported display operations making sure we get good
status for each of them
"""
- to_test = ['SYSTEMS']
- to_test.append('POOLS')
+ to_test = ['SYSTEMS', 'POOLS']

if cap['VOLUMES']:
to_test.append('VOLUMES')

[Tony Asleson]

Signed-off-by: Tony Asleson <***@redhat.com>
---
plugin/targetd/targetd.py | 2 --
1 file changed, 2 deletions(-)

diff --git a/plugin/targetd/targetd.py b/plugin/targetd/targetd.py
index 6ecc0dc..597ee7d 100644
--- a/plugin/targetd/targetd.py
+++ b/plugin/targetd/targetd.py
@@ -98,8 +98,6 @@ class TargetdStorage(IStorageAreaNetwork, INfs):
@handle_errors
def capabilities(self, system, flags=0):
cap = Capabilities()
- cap.set(Capabilities.BLOCK_SUPPORT)
- cap.set(Capabilities.FS_SUPPORT)
cap.set(Capabilities.VOLUMES)
cap.set(Capabilities.VOLUME_CREATE)
cap.set(Capabilities.VOLUME_REPLICATE)

[Tony Asleson]

Signed-off-by: Tony Asleson <***@redhat.com>
---
tools/lsmcli/cmdline.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/lsmcli/cmdline.py b/tools/lsmcli/cmdline.py
index 4909ae8..3f68d05 100644
--- a/tools/lsmcli/cmdline.py
+++ b/tools/lsmcli/cmdline.py
@@ -27,7 +27,7 @@ from collections import OrderedDict
from argparse import ArgumentParser
from argparse import RawTextHelpFormatter

-from lsm import (Client, Pool, VERSION, LsmError, Capabilities, Disk,
+from lsm import (Client, Pool, VERSION, LsmError, Disk,
Volume, JobStatus, ErrorNumber, BlockRange,
uri_parse, Proxy, size_human_2_size_bytes,
AccessGroup, FileSystem, NfsExport, TargetPort)

[Tony Asleson]

Signed-off-by: Tony Asleson <***@redhat.com>
---
plugin/v7k/ibmv7k.py | 1 -
1 file changed, 1 deletion(-)

diff --git a/plugin/v7k/ibmv7k.py b/plugin/v7k/ibmv7k.py
index b94bfe0..7a0c2d6 100644
--- a/plugin/v7k/ibmv7k.py
+++ b/plugin/v7k/ibmv7k.py
@@ -287,7 +287,6 @@ class IbmV7k(IStorageAreaNetwork):
# NOTE: Add more capabilities as more cli's are supported
def capabilities(self, system, flags=0):
cap = Capabilities()
- cap.set(Capabilities.BLOCK_SUPPORT)
cap.set(Capabilities.VOLUMES)
cap.set(Capabilities.VOLUME_CREATE)
cap.set(Capabilities.VOLUME_DELETE)