[Libstoragemgmt-devel] [PATCH] Targetd plugin: Fix TargetdError handling and remove Volume.STATUS_OK

[Gris Ge]

1. Fix python syntax error when handling TargetdError:
% te.errno, te.reason)
% (te.errno, te.reason))
^ ^
2. Fix the error got when creating volume as missing Volume.STATUS_OK.
Volume.STATUS_OK is removed from library in previous patch
and its functionality was replaced by ADMIN_STATE_ENABLED.
In targetd, we always mark volume as Volume.ADMIN_STATE_ENABLED.

Signed-off-by: Gris Ge <***@redhat.com>
---
plugin/targetd/targetd.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugin/targetd/targetd.py b/plugin/targetd/targetd.py
index ddd3a39..6d5d565 100644
--- a/plugin/targetd/targetd.py
+++ b/plugin/targetd/targetd.py
@@ -43,7 +43,7 @@ def handle_errors(method):
except TargetdError as te:
raise LsmError(ErrorNumber.PLUGIN_BUG,
"Got error %d from targetd: %s"
- % te.errno, te.reason)
+ % (te.errno, te.reason))
except LsmError:
raise
except Exception as e:
@@ -308,7 +308,9 @@ class TargetdStorage(IStorageAreaNetwork, INfs):
if v['name'] == volume_name][0]

return Volume(vol['uuid'], vol['name'], vol['uuid'], 512,
- vol['size'] / 512, Volume.STATUS_OK, self.system.id,
+ vol['size'] / 512,
+ Volume.ADMIN_STATE_ENABLED,
+ self.system.id,
pool_id)

def _get_fs(self, pool_id, fs_name):

[Tony Asleson]

Patch committed.

Thanks!
-Tony

Post by Gris Ge
% te.errno, te.reason)
% (te.errno, te.reason))
^ ^
2. Fix the error got when creating volume as missing Volume.STATUS_OK.
Volume.STATUS_OK is removed from library in previous patch
and its functionality was replaced by ADMIN_STATE_ENABLED.
In targetd, we always mark volume as Volume.ADMIN_STATE_ENABLED.
---
plugin/targetd/targetd.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/plugin/targetd/targetd.py b/plugin/targetd/targetd.py
index ddd3a39..6d5d565 100644
--- a/plugin/targetd/targetd.py
+++ b/plugin/targetd/targetd.py
raise LsmError(ErrorNumber.PLUGIN_BUG,
"Got error %d from targetd: %s"
- % te.errno, te.reason)
+ % (te.errno, te.reason))
raise
if v['name'] == volume_name][0]
return Volume(vol['uuid'], vol['name'], vol['uuid'], 512,
- vol['size'] / 512, Volume.STATUS_OK, self.system.id,
+ vol['size'] / 512,
+ Volume.ADMIN_STATE_ENABLED,
+ self.system.id,
pool_id)