[Libstoragemgmt-devel] [PATCH V2] add POOLS as support capability

[Ma Shimiao]

Just handle POOLS with plugins. I will send more patches to
handle pool related capabilities.

Signed-off-by: Ma Shimiao <***@cn.fujitsu.com>
---
include/libstoragemgmt/libstoragemgmt_capabilities.h | 9 +++++----
lsm/lsm/_data.py | 9 +++++----
lsm/lsm/ibmv7k.py | 1 +
lsm/lsm/nstor.py | 1 +
lsm/lsm/ontap.py | 1 +
lsm/lsm/targetd.py | 1 +
6 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/include/libstoragemgmt/libstoragemgmt_capabilities.h b/include/libstoragemgmt/libstoragemgmt_capabilities.h
index a02baa6..59bf507 100644
--- a/include/libstoragemgmt/libstoragemgmt_capabilities.h
+++ b/include/libstoragemgmt/libstoragemgmt_capabilities.h
@@ -108,10 +108,11 @@ typedef enum {
LSM_CAP_EXPORT_REMOVE = 123, /**< Remove an export */
LSM_CAP_EXPORT_CUSTOM_PATH = 124, /**< Plug-in allows user to define custome export path */

- LSM_CAP_POOL_CREATE = 130, /**< Pool create support */
- LSM_CAP_POOL_CREATE_FROM_DISKS = 131, /**< Pool create from disks */
- LSM_CAP_POOL_CREATE_FROM_VOLUMES = 132, /**< Pool create from volumes */
- LSM_CAP_POOL_CREATE_FROM_POOL = 133, /**< Pool create from pool */
+ LSM_CAP_POOLS = 130, /**< List pools */
+ LSM_CAP_POOL_CREATE = 131, /**< Pool create support */
+ LSM_CAP_POOL_CREATE_FROM_DISKS = 132, /**< Pool create from disks */
+ LSM_CAP_POOL_CREATE_FROM_VOLUMES = 133, /**< Pool create from volumes */
+ LSM_CAP_POOL_CREATE_FROM_POOL = 134, /**< Pool create from pool */

LSM_CAP_POOL_CREATE_DISK_RAID_0 = 140,
LSM_CAP_POOL_CREATE_DISK_RAID_1 = 141,
diff --git a/lsm/lsm/_data.py b/lsm/lsm/_data.py
index f3523f8..05f50bd 100644
--- a/lsm/lsm/_data.py
+++ b/lsm/lsm/_data.py
@@ -1483,10 +1483,11 @@ class Capabilities(IData):
EXPORT_CUSTOM_PATH = 124

#Pool
- POOL_CREATE = 130
- POOL_CREATE_FROM_DISKS = 131
- POOL_CREATE_FROM_VOLUMES = 132
- POOL_CREATE_FROM_POOL = 133
+ POOLS = 130
+ POOL_CREATE = 131
+ POOL_CREATE_FROM_DISKS = 132
+ POOL_CREATE_FROM_VOLUMES = 133
+ POOL_CREATE_FROM_POOL = 134

POOL_CREATE_DISK_RAID_0 = 140
POOL_CREATE_DISK_RAID_1 = 141
diff --git a/lsm/lsm/ibmv7k.py b/lsm/lsm/ibmv7k.py
index 37c3243..99c0940 100644
--- a/lsm/lsm/ibmv7k.py
+++ b/lsm/lsm/ibmv7k.py
@@ -418,6 +418,7 @@ class IbmV7k(IStorageAreaNetwork):
cap.set(Capabilities.INITIATORS_GRANTED_TO_VOLUME)
cap.set(Capabilities.VOLUME_INITIATOR_GRANT)
cap.set(Capabilities.VOLUME_INITIATOR_REVOKE)
+ cap.set(Capabilities.POOLS)
return cap

def plugin_info(self, flags=0):
diff --git a/lsm/lsm/nstor.py b/lsm/lsm/nstor.py
index 172fe43..616046d 100644
--- a/lsm/lsm/nstor.py
+++ b/lsm/lsm/nstor.py
@@ -205,6 +205,7 @@ class NexentaStor(INfs, IStorageAreaNetwork):
def capabilities(self, system, flags=0):
c = Capabilities()

+ c.set(Capabilities.POOLS)
#Array wide
# c.set(Capabilities.BLOCK_SUPPORT)
c.set(Capabilities.FS_SUPPORT)
diff --git a/lsm/lsm/ontap.py b/lsm/lsm/ontap.py
index d52b3e4..40424bb 100644
--- a/lsm/lsm/ontap.py
+++ b/lsm/lsm/ontap.py
@@ -471,6 +471,7 @@ class Ontap(IStorageAreaNetwork, INfs):
cap.set(Capabilities.EXPORT_FS)
cap.set(Capabilities.EXPORT_REMOVE)
cap.set(Capabilities.EXPORT_CUSTOM_PATH)
+ cap.set(Capabilities.POOLS)
return cap

@handle_ontap_errors
diff --git a/lsm/lsm/targetd.py b/lsm/lsm/targetd.py
index 3f0a5cf..7c51980 100644
--- a/lsm/lsm/targetd.py
+++ b/lsm/lsm/targetd.py
@@ -126,6 +126,7 @@ class TargetdStorage(IStorageAreaNetwork, INfs):
cap.set(Capabilities.EXPORTS)
cap.set(Capabilities.EXPORT_FS)
cap.set(Capabilities.EXPORT_REMOVE)
+ cap.set(Capabilities.POOLS)
return cap

@handle_errors