Tony Asleson
2014-08-27 19:40:04 UTC
Using Gris's check_const.pl script I re-worked the code base
so that the constants match as expected. I also removed a couple
of fields from the C error structure that we weren't really
leveraging: error level and error domain. Some other constants
were removed as well. The check_const.pl script has been
incorporated into the `make check` process and will fail the
build if the script detects any inconsistencies.
Signed-off-by: Tony Asleson <***@redhat.com>
---
c_binding/include/libstoragemgmt/libstoragemgmt.h | 2 +-
.../include/libstoragemgmt/libstoragemgmt_error.h | 36 +-
.../libstoragemgmt/libstoragemgmt_plug_interface.h | 25 +-
.../include/libstoragemgmt/libstoragemgmt_types.h | 51 +-
c_binding/lsm_datatypes.cpp | 37 +-
c_binding/lsm_datatypes.hpp | 4 +-
c_binding/lsm_mgmt.cpp | 5 +-
c_binding/lsm_plugin_ipc.cpp | 6 +-
configure.ac | 6 +
packaging/libstoragemgmt.spec.in | 2 +-
plugin/ontap/ontap.py | 4 +-
plugin/sim/simarray.py | 10 +-
plugin/simc/simc_lsmplugin.c | 28 +-
plugin/smispy/smis.py | 8 +-
python_binding/lsm/__init__.py | 2 +-
python_binding/lsm/_client.py | 6 +
python_binding/lsm/_common.py | 7 -
python_binding/lsm/_data.py | 10 +-
test/runtests.sh | 3 +
test/tester.c | 513 ++++++++++-----------
tools/Makefile.am | 2 +-
tools/lsmcli/data_display.py | 10 +-
tools/utility/Makefile.am | 1 +
23 files changed, 348 insertions(+), 430 deletions(-)
create mode 100644 tools/utility/Makefile.am
diff --git a/c_binding/include/libstoragemgmt/libstoragemgmt.h b/c_binding/include/libstoragemgmt/libstoragemgmt.h
index c0ac404..85b8e4e 100644
--- a/c_binding/include/libstoragemgmt/libstoragemgmt.h
+++ b/c_binding/include/libstoragemgmt/libstoragemgmt.h
@@ -287,7 +287,7 @@ extern "C" {
*/
int LSM_DLL_EXPORT lsm_volume_create(lsm_connect *conn, lsm_pool *pool,
const char *volume_name, uint64_t size,
- lsm_provision_type provisioning,
+ lsm_volume_provision_type provisioning,
lsm_volume **new_volume, char **job,
lsm_flag flags);
diff --git a/c_binding/include/libstoragemgmt/libstoragemgmt_error.h b/c_binding/include/libstoragemgmt/libstoragemgmt_error.h
index 2bd0143..42e5547 100644
--- a/c_binding/include/libstoragemgmt/libstoragemgmt_error.h
+++ b/c_binding/include/libstoragemgmt/libstoragemgmt_error.h
@@ -28,18 +28,7 @@ extern "C" {
/** @file libstoragemgmt_error.h */
-/**< \enum lsm_error_level Severity of the error. */
-typedef enum {
- LSM_ERR_LEVEL_NONE = 0,
- LSM_ERR_LEVEL_WARNING = 1,
- LSM_ERR_LEVEL_ERROR = 2
-} lsm_error_level;
-
-/**< \enum lsm_error_domain Where the error took place */
-typedef enum {
- LSM_ERR_DOMAIN_FRAME_WORK = 0, /**< Frame work */
- LSM_ERR_DOMAIN_PLUG_IN = 1 /**< Plug-in */
-} lsm_error_domain;
+
/**< \enum lsm_error_number Possible enumerated return codes from library */
typedef enum {
@@ -58,8 +47,8 @@ typedef enum {
LSM_ERR_NO_STATE_CHANGE = 125, /**< Operation completed with no change in array state */
- LSM_ERR_CONNREFUSED = 140, /**< Host on network, but not allowing connection */
- LSM_ERR_HOSTDOWN = 141, /**< Host unreachable on network */
+ LSM_ERR_NETWORK_CONNREFUSED = 140, /**< Host on network, but not allowing connection */
+ LSM_ERR_NETWORK_HOSTDOWN = 141, /**< Host unreachable on network */
LSM_ERR_NETWORK_ERROR = 142, /**< Generic network error */
LSM_ERR_NO_MEMORY = 152, /**< Memory allocation failure */
@@ -74,7 +63,6 @@ typedef enum {
LSM_ERR_NOT_FOUND_FS_SS = 204, /**< Specified snap shot not found */
LSM_ERR_NOT_FOUND_VOLUME = 205, /**< Specified volume not found */
LSM_ERR_NOT_FOUND_NFS_EXPORT = 206, /**< NFS export not found */
- LSM_ERR_NOT_FOUND_INITIATOR = 207, /**< Initiator not found */
LSM_ERR_NOT_FOUND_SYSTEM = 208, /**< System not found */
LSM_ERR_NOT_LICENSED = 226, /**< Need license for feature */
@@ -100,12 +88,12 @@ typedef enum {
LSM_ERR_TRANSPORT_INVALID_ARG = 402, /**< Parameter transported over IPC is invalid */
LSM_ERR_VOLUME_BUSY = 501, /* Volume already in use */
- ACCESS_GROUP_MASKED = 502,
+ LSM_ERR_ACCESS_GROUP_MASKED = 502,
LSM_ERR_UNSUPPORTED_SEARCH_KEY = 510, /**< Unsupport search key */
- EMPTY_ACCESS_GROUP = 511
+ LSM_ERR_EMPTY_ACCESS_GROUP = 511
} lsm_error_number;
@@ -135,20 +123,6 @@ int LSM_DLL_EXPORT lsm_error_free(lsm_error_ptr err);
lsm_error_number LSM_DLL_EXPORT lsm_error_number_get(lsm_error_ptr e);
/**
- * Retrieves the domain from the error.
- * @param e The lsm_error_ptr
- * @return -1 if e is not a valid error pointer, else error domain value.
- */
-lsm_error_domain LSM_DLL_EXPORT lsm_error_domain_get(lsm_error_ptr e);
-
-/**
- * Retrieves the error level from the error.
- * @param e The lsm_error_ptr
- * @return -1 if e is not a valid error pointer, else error level.
- */
-lsm_error_level LSM_DLL_EXPORT lsm_error_level_get(lsm_error_ptr e);
-
-/**
* Retrieves the error message from the error.
* Note: The returned value is only valid as long as the e is valid, in addition
* the function will return NULL if e is invalid. To remove the ambiguity call
diff --git a/c_binding/include/libstoragemgmt/libstoragemgmt_plug_interface.h b/c_binding/include/libstoragemgmt/libstoragemgmt_plug_interface.h
index ba5fa81..518f5c0 100644
--- a/c_binding/include/libstoragemgmt/libstoragemgmt_plug_interface.h
+++ b/c_binding/include/libstoragemgmt/libstoragemgmt_plug_interface.h
@@ -243,7 +243,7 @@ typedef int (*lsm_plug_target_port_list)( lsm_plugin_ptr c,
*/
typedef int (*lsm_plug_volume_create)(lsm_plugin_ptr c, lsm_pool *pool,
const char *volume_name, uint64_t size,
- lsm_provision_type provisioning, lsm_volume **new_volume,
+ lsm_volume_provision_type provisioning, lsm_volume **new_volume,
char **job, lsm_flag flags);
/**
@@ -319,19 +319,6 @@ typedef int (*lsm_plug_volume_resize)(lsm_plugin_ptr c, lsm_volume *volume,
*/
typedef int (*lsm_plug_volume_delete)(lsm_plugin_ptr c, lsm_volume *volume,
char **job, lsm_flag flags);
-
-/**
- * Check on the status of a volume
- * @param[in] c Valid lsm plug-in pointer
- * @param[in] v Volume to retrieve status for
- * @param[out] status Status of volume
- * @param[in] flags Reserved
- * @return LSM_ERR_OK, else error reason
- */
-typedef int (*lsm_plug_volume_status)(lsm_plugin_ptr c, lsm_volume *v,
- lsm_volume_status_type *status,
- lsm_flag flags);
-
/**
* Place a volume online, callback function signature.
* @param[in] c Valid lsm plug-in pointer
@@ -886,9 +873,7 @@ int LSM_DLL_EXPORT lsm_plugin_error_log( lsm_plugin_ptr plug, lsm_error_ptr erro
* @param debug_data_size
* @return Null on error, else valid error error record.
*/
-lsm_error_ptr LSM_DLL_EXPORT lsm_error_create( lsm_error_number code,
- lsm_error_domain domain,
- lsm_error_level level, const char* msg,
+lsm_error_ptr LSM_DLL_EXPORT lsm_error_create(lsm_error_number code, const char* msg,
const char *exception, const char *debug,
const void *debug_data, uint32_t debug_data_size);
@@ -897,13 +882,13 @@ lsm_error_ptr LSM_DLL_EXPORT lsm_error_create( lsm_error_number code,
* Plug-in macros for creating errors
*/
#define LSM_ERROR_CREATE_PLUGIN_MSG( code, msg ) \
- lsm_error_create(code, LSM_ERR_DOMAIN_PLUG_IN, LSM_ERR_LEVEL_ERROR, msg, NULL, NULL, NULL, 0)
+ lsm_error_create(code, msg, NULL, NULL, NULL, 0)
#define LSM_ERROR_CREATE_PLUGIN_EXCEPTION( code, msg, exception) \
- lsm_error_create((code), LSM_ERR_DOMAIN_PLUG_IN, LSM_ERR_LEVEL_ERROR, (msg), (exception), NULL, NULL, 0)
+ lsm_error_create((code), (msg), (exception), NULL, NULL, 0)
#define LSM_ERROR_CREATE_PLUGIN_DEBUG( code, msg, exception, debug, debug_data, debug_len) \
- lsm_error_create((code), LSM_ERR_DOMAIN_PLUG_IN, LSM_ERR_LEVEL_ERROR, (msg), (exception), (debug), (debug_data), debug_len))
+ lsm_error_create((code), (msg), (exception), (debug), (debug_data), debug_len))
/**
* Helper function to create an array of lsm_pool *
diff --git a/c_binding/include/libstoragemgmt/libstoragemgmt_types.h b/c_binding/include/libstoragemgmt/libstoragemgmt_types.h
index 053dec3..ec81bb9 100644
--- a/c_binding/include/libstoragemgmt/libstoragemgmt_types.h
+++ b/c_binding/include/libstoragemgmt/libstoragemgmt_types.h
@@ -36,7 +36,7 @@ extern "C" {
/* Just incase we want to change the flag to a different type */
typedef uint64_t lsm_flag;
-#define LSM_FLAG_RSVD 0
+#define LSM_CLIENT_FLAG_RSVD 0
/**
* Opaque data type for a connection.
@@ -126,30 +126,17 @@ typedef enum {
/**< \enum lsm_provision_type Different types of provisioning */
typedef enum {
- LSM_PROVISION_UNKNOWN = -1, /**< Unknown */
- LSM_PROVISION_THIN = 1, /**< Thin provisioning */
- LSM_PROVISION_FULL = 2, /**< Thick provisioning */
- LSM_PROVISION_DEFAULT = 3 /**< Default provisioning */
-} lsm_provision_type;
-
-/**< \enum lsm_access_type Different types of Volume access */
-typedef enum {
- LSM_VOLUME_ACCESS_READ_ONLY = 1, /**< Read only access */
- LSM_VOLUME_ACCESS_READ_WRITE = 2, /**< Read write access */
- LSM_VOLUME_ACCESS_NONE = 3 /**< No access */
-} lsm_access_type;
-
-/**< \enum lsm_volume_status_type Different states that a volume can be in */
-typedef enum {
- LSM_VOLUME_STATUS_ONLINE = 1, /**< Volume is ready to be used */
- LSM_VOLUME_STATUS_OFFLINE = 2 /**< Volume is offline, no access */
-} lsm_volume_status_type;
+ LSM_VOLUME_PROVISION_UNKNOWN = -1, /**< Unknown */
+ LSM_VOLUME_PROVISION_THIN = 1, /**< Thin provisioning */
+ LSM_VOLUME_PROVISION_FULL = 2, /**< Thick provisioning */
+ LSM_VOLUME_PROVISION_DEFAULT = 3 /**< Default provisioning */
+} lsm_volume_provision_type;
/**
* Admin state for volume, enabled or disabled
*/
-#define LSM_VOLUME_ADMIN_STATE_ENABLED 0x1 /**< Volume accessible */
-#define LSM_VOLUME_ADMIN_STATE_DISABLE 0x0 /**< Volume unaccessible */
+#define LSM_VOLUME_ADMIN_STATE_ENABLED 0x1 /**< Volume accessible */
+#define LSM_VOLUME_ADMIN_STATE_DISABLED 0x0 /**< Volume unaccessible */
/**
* Different states a system status can be in.
@@ -171,14 +158,6 @@ typedef enum {
LSM_ACCESS_GROUP_INIT_TYPE_ISCSI_WWPN_MIXED = 7 /**< More than 1 type */
} lsm_access_group_init_type;
-
-/**< \enum lsm_job_type Different types of jobs */
-typedef enum {
- LSM_JOB_VOL_CREATE = 1, /**< Volume create */
- LSM_JOB_VOL_RESIZE = 2, /**< Volume re-size */
- LSM_JOB_VOL_REPLICATE = 3 /**< Volume replicate */
-} lsm_job_type;
-
/**< \enum lsm_job_status Job states */
typedef enum {
LSM_JOB_INPROGRESS = 1, /**< Job is in progress */
@@ -190,7 +169,7 @@ typedef enum {
typedef enum {
LSM_DISK_TYPE_UNKNOWN = 0,
LSM_DISK_TYPE_OTHER = 1,
- LSM_DISL_TYPE_NOT_APPLICABLE = 2,
+ LSM_DISK_TYPE_NOT_APPLICABLE = 2,
LSM_DISK_TYPE_ATA = 3,
LSM_DISK_TYPE_SATA = 4,
LSM_DISK_TYPE_SAS = 5,
@@ -210,7 +189,7 @@ typedef enum {
#define LSM_DISK_STATUS_OTHER 0x0000000000000004
#define LSM_DISK_STATUS_PREDICTIVE_FAILURE 0x0000000000000008
#define LSM_DISK_STATUS_ERROR 0x0000000000000010
-#define LSM_DISK_STATUS_STATUS_REMOVED 0x0000000000000020
+#define LSM_DISK_STATUS_REMOVED 0x0000000000000020
#define LSM_DISK_STATUS_STARTING 0x0000000000000040
#define LSM_DISK_STATUS_STOPPING 0x0000000000000080
#define LSM_DISK_STATUS_STOPPED 0x0000000000000100
@@ -245,11 +224,11 @@ typedef enum {
#define LSM_POOL_ELEMENT_TYPE_SYS_RESERVED 0x0000000000000400
typedef enum {
- LSM_PORT_TYPE_UNKNOWN = 0,
- LSM_PORT_TYPE_OTHER = 1,
- LSM_PORT_TYPE_FC = 2,
- LSM_PORT_TYPE_FCOE = 3,
- LSM_PORT_TYPE_ISCSI = 4
+ LSM_TARGET_PORT_TYPE_UNKNOWN = 0,
+ LSM_TARGET_PORT_TYPE_OTHER = 1,
+ LSM_TARGET_PORT_TYPE_FC = 2,
+ LSM_TARGET_PORT_TYPE_FCOE = 3,
+ LSM_TARGET_PORT_TYPE_ISCSI = 4
} lsm_target_port_type;
#ifdef __cplusplus
diff --git a/c_binding/lsm_datatypes.cpp b/c_binding/lsm_datatypes.cpp
index 01247c6..a0248b2 100644
--- a/c_binding/lsm_datatypes.cpp
+++ b/c_binding/lsm_datatypes.cpp
@@ -259,21 +259,15 @@ static int connection_establish( lsm_connect *c, const char * password,
c->tp->rpc("plugin_register", p);
} catch (const ValueException &ve) {
- *e = lsm_error_create(LSM_ERR_TRANSPORT_SERIALIZATION,
- LSM_ERR_DOMAIN_FRAME_WORK,
- LSM_ERR_LEVEL_ERROR, "Error in serialization",
+ *e = lsm_error_create(LSM_ERR_TRANSPORT_SERIALIZATION, "Error in serialization",
ve.what(), NULL, NULL, 0 );
rc = LSM_ERR_TRANSPORT_SERIALIZATION;
} catch (const LsmException &le) {
- *e = lsm_error_create(LSM_ERR_TRANSPORT_COMMUNICATION,
- LSM_ERR_DOMAIN_FRAME_WORK,
- LSM_ERR_LEVEL_ERROR, "Error in communication",
+ *e = lsm_error_create(LSM_ERR_TRANSPORT_COMMUNICATION, "Error in communication",
le.what(), NULL, NULL, 0 );
rc = LSM_ERR_TRANSPORT_COMMUNICATION;
} catch (...) {
- *e = lsm_error_create(LSM_ERR_LIB_BUG,
- LSM_ERR_DOMAIN_FRAME_WORK,
- LSM_ERR_LEVEL_ERROR, "Undefined exception",
+ *e = lsm_error_create(LSM_ERR_LIB_BUG, "Undefined exception",
NULL, NULL, NULL, 0 );
rc = LSM_ERR_LIB_BUG;
}
@@ -317,17 +311,13 @@ int driver_load(lsm_connect *c, const char *plugin_name, const char *password,
}
}
} else {
- *e = lsm_error_create(LSM_ERR_PLUGIN_IPC_FAIL,
- LSM_ERR_DOMAIN_FRAME_WORK,
- LSM_ERR_LEVEL_ERROR, "Unable to connect to plugin",
+ *e = lsm_error_create(LSM_ERR_PLUGIN_IPC_FAIL, "Unable to connect to plugin",
NULL, dlerror(), NULL, 0 );
rc = LSM_ERR_PLUGIN_IPC_FAIL;
}
} else {
- *e = lsm_error_create(LSM_ERR_PLUGIN_SOCKET_PERMISSION,
- LSM_ERR_DOMAIN_FRAME_WORK,
- LSM_ERR_LEVEL_ERROR, "Unable to access plugin",
+ *e = lsm_error_create(LSM_ERR_PLUGIN_SOCKET_PERMISSION, "Unable to access plugin",
NULL, NULL, NULL, 0 );
rc = LSM_ERR_PLUGIN_SOCKET_PERMISSION;
@@ -338,8 +328,7 @@ int driver_load(lsm_connect *c, const char *plugin_name, const char *password,
return rc;
}
-lsm_error_ptr lsm_error_create(lsm_error_number code, lsm_error_domain domain,
- lsm_error_level level, const char* msg,
+lsm_error_ptr lsm_error_create(lsm_error_number code, const char* msg,
const char *exception, const char *debug,
const void *debug_data, uint32_t debug_data_size)
{
@@ -348,8 +337,6 @@ lsm_error_ptr lsm_error_create(lsm_error_number code, lsm_error_domain domain,
if (err) {
err->magic = LSM_ERROR_MAGIC;
err->code = code;
- err->domain = domain;
- err->level = level;
/* Any of these strdup calls could fail, but we will continue*/
if (msg) {
@@ -424,16 +411,6 @@ lsm_error_number lsm_error_number_get(lsm_error_ptr e)
LSM_RETURN_ERR_VAL(lsm_error_number, e, code, -1);
}
-lsm_error_domain lsm_error_domain_get(lsm_error_ptr e)
-{
- LSM_RETURN_ERR_VAL(lsm_error_domain, e, domain, -1);
-}
-
-lsm_error_level lsm_error_level_get(lsm_error_ptr e)
-{
- LSM_RETURN_ERR_VAL(lsm_error_level, e, level, -1);
-}
-
char* lsm_error_message_get( lsm_error_ptr e)
{
LSM_RETURN_ERR_VAL(char*, e, message, NULL);
@@ -1907,7 +1884,7 @@ lsm_target_port LSM_DLL_EXPORT *lsm_target_port_copy(lsm_target_port *tp)
}
MEMBER_FUNC_GET(const char *, lsm_target_port_id_get, lsm_target_port *tp, tp, LSM_IS_TARGET_PORT, id, NULL)
-MEMBER_FUNC_GET(lsm_target_port_type, lsm_target_port_type_get, lsm_target_port *tp, tp, LSM_IS_TARGET_PORT, port_type, LSM_PORT_TYPE_UNKNOWN)
+MEMBER_FUNC_GET(lsm_target_port_type, lsm_target_port_type_get, lsm_target_port *tp, tp, LSM_IS_TARGET_PORT, port_type, LSM_TARGET_PORT_TYPE_UNKNOWN)
MEMBER_FUNC_GET(const char *, lsm_target_port_service_address_get, lsm_target_port *tp, tp, LSM_IS_TARGET_PORT, service_address, NULL)
MEMBER_FUNC_GET(const char *, lsm_target_port_network_address_get, lsm_target_port *tp, tp, LSM_IS_TARGET_PORT, network_address, NULL)
MEMBER_FUNC_GET(const char *, lsm_target_port_physical_address_get, lsm_target_port *tp, tp, LSM_IS_TARGET_PORT, physical_address, NULL)
diff --git a/c_binding/lsm_datatypes.hpp b/c_binding/lsm_datatypes.hpp
index 5fbc9c1..27976db 100644
--- a/c_binding/lsm_datatypes.hpp
+++ b/c_binding/lsm_datatypes.hpp
@@ -217,9 +217,7 @@ struct LSM_DLL_LOCAL _lsm_connect {
*/
struct LSM_DLL_LOCAL _lsm_error {
uint32_t magic; /**< Magic, used for struct validation */
- lsm_error_number code; /**< Error code */
- lsm_error_domain domain; /**< Where the error occured */
- lsm_error_level level; /**< Severity of the error */
+ lsm_error_number code; /**< Error code */
uint32_t reserved; /**< Reserved */
char *message; /**< Human readable error message */
char *exception; /**< Exception message if present */
diff --git a/c_binding/lsm_mgmt.cpp b/c_binding/lsm_mgmt.cpp
index cb841d4..36f616d 100644
--- a/c_binding/lsm_mgmt.cpp
+++ b/c_binding/lsm_mgmt.cpp
@@ -206,8 +206,7 @@ static int lsmErrorLog(lsm_connect *c, lsm_error_ptr error)
static lsm_error_number logException(lsm_connect *c, lsm_error_number error,
const char *message, const char *exception_msg)
{
- lsm_error_ptr err = lsm_error_create(error, LSM_ERR_DOMAIN_FRAME_WORK,
- LSM_ERR_LEVEL_ERROR, message,
+ lsm_error_ptr err = lsm_error_create(error, message,
exception_msg, NULL,
NULL, 0);
if( err ) {
@@ -948,7 +947,7 @@ static void* parse_job_response(lsm_connect *c, Value response, int &rc,
}
int lsm_volume_create(lsm_connect *c, lsm_pool *pool, const char *volumeName,
- uint64_t size, lsm_provision_type provisioning,
+ uint64_t size, lsm_volume_provision_type provisioning,
lsm_volume **newVolume, char **job, lsm_flag flags)
{
CONN_SETUP(c);
diff --git a/c_binding/lsm_plugin_ipc.cpp b/c_binding/lsm_plugin_ipc.cpp
index 8fcca83..0d3496f 100644
--- a/c_binding/lsm_plugin_ipc.cpp
+++ b/c_binding/lsm_plugin_ipc.cpp
@@ -175,7 +175,7 @@ static lsm_plugin_ptr lsm_plugin_alloc(lsm_plugin_register reg,
rc->version = strdup(version);
if (!rc->desc || !rc->version) {
- lsm_plugin_free(rc, LSM_FLAG_RSVD);
+ lsm_plugin_free(rc, LSM_CLIENT_FLAG_RSVD);
rc = NULL;
}
}
@@ -264,7 +264,7 @@ int lsm_plugin_init_v1( int argc, char *argv[], lsm_plugin_register reg,
if (plug->tp) {
rc = lsm_plugin_run(plug);
} else {
- lsm_plugin_free(plug, LSM_FLAG_RSVD);
+ lsm_plugin_free(plug, LSM_CLIENT_FLAG_RSVD);
rc = LSM_ERR_NO_MEMORY;
}
} else {
@@ -682,7 +682,7 @@ static int handle_volume_create(lsm_plugin_ptr p, Value ¶ms, Value &response
char *job = NULL;
const char *name = v_name.asC_str();
uint64_t size = v_size.asUint64_t();
- lsm_provision_type pro = (lsm_provision_type)v_prov.asInt32_t();
+ lsm_volume_provision_type pro = (lsm_volume_provision_type)v_prov.asInt32_t();
rc = p->san_ops->vol_create(p, pool, name, size, pro, &vol, &job,
LSM_FLAG_GET_VALUE(params));
diff --git a/configure.ac b/configure.ac
index 0928c1b..92c164e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -135,6 +135,11 @@ fi
AM_CONDITIONAL([BUILD_C_UNIT], [test "x${want_c_unit}" = "xyes"])
+dnl =========================================================================
+dnl Check for perl, used for code constants checking
+dnl =========================================================================
+AC_PATH_PROGS(PERL, perl)
+
dnl ==========================================================================
dnl Check for python2 as it is needed for the base cmd line function
dnl ==========================================================================
@@ -203,6 +208,7 @@ AC_OUTPUT(libstoragemgmt.pc \
tools/Makefile \
tools/udev/Makefile \
tools/lsmcli/Makefile \
+ tools/utility/Makefile \
packaging/Makefile \
packaging/daemon/Makefile \
packaging/libstoragemgmt.spec \
diff --git a/packaging/libstoragemgmt.spec.in b/packaging/libstoragemgmt.spec.in
index 479a04d..22d1c20 100644
--- a/packaging/libstoragemgmt.spec.in
+++ b/packaging/libstoragemgmt.spec.in
@@ -15,7 +15,7 @@ URL: http://sourceforge.net/projects/libstoragemgmt/
Source0: http://sourceforge.net/projects/libstoragemgmt/files/libstoragemgmt-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: %{name}-python
-BuildRequires: autoconf automake libtool yajl-devel libxml2-devel check-devel
+BuildRequires: autoconf automake libtool yajl-devel libxml2-devel check-devel perl
BuildRequires: openssl-devel
BuildRequires: python-argparse
BuildRequires: glib2-devel
diff --git a/plugin/ontap/ontap.py b/plugin/ontap/ontap.py
index 7a2c397..5dcbcc7 100644
--- a/plugin/ontap/ontap.py
+++ b/plugin/ontap/ontap.py
@@ -1105,7 +1105,7 @@ class Ontap(IStorageAreaNetwork, INfs):
for f in fcp:
a = f['addr']
adapter = f['adapter']
- tp.append(TargetPort(md5(a), TargetPort.PORT_TYPE_FC, a, a, a,
+ tp.append(TargetPort(md5(a), TargetPort.TYPE_FC, a, a, a,
adapter, self.sys_info.id))
node_name = self.f.iscsi_node_name()
@@ -1118,7 +1118,7 @@ class Ontap(IStorageAreaNetwork, INfs):
physical_name = i['interface']
tid = md5(service_address + network_address + physical_address +
physical_name)
- tp.append(TargetPort(tid, TargetPort.PORT_TYPE_ISCSI,
+ tp.append(TargetPort(tid, TargetPort.TYPE_ISCSI,
service_address,
network_address,
physical_address,
diff --git a/plugin/sim/simarray.py b/plugin/sim/simarray.py
index f60905d..f391681 100644
--- a/plugin/sim/simarray.py
+++ b/plugin/sim/simarray.py
@@ -706,7 +706,7 @@ class SimData(object):
self.tgt_dict = {
'TGT_PORT_ID_01': {
'tgt_id': 'TGT_PORT_ID_01',
- 'port_type': TargetPort.PORT_TYPE_FC,
+ 'port_type': TargetPort.TYPE_FC,
'service_address': '50:0a:09:86:99:4b:8d:c5',
'network_address': '50:0a:09:86:99:4b:8d:c5',
'physical_address': '50:0a:09:86:99:4b:8d:c5',
@@ -715,7 +715,7 @@ class SimData(object):
},
'TGT_PORT_ID_02': {
'tgt_id': 'TGT_PORT_ID_02',
- 'port_type': TargetPort.PORT_TYPE_FCOE,
+ 'port_type': TargetPort.TYPE_FCOE,
'service_address': '50:0a:09:86:99:4b:8d:c6',
'network_address': '50:0a:09:86:99:4b:8d:c6',
'physical_address': '50:0a:09:86:99:4b:8d:c6',
@@ -724,7 +724,7 @@ class SimData(object):
},
'TGT_PORT_ID_03': {
'tgt_id': 'TGT_PORT_ID_03',
- 'port_type': TargetPort.PORT_TYPE_ISCSI,
+ 'port_type': TargetPort.TYPE_ISCSI,
'service_address': 'iqn.1986-05.com.example:sim-tgt-03',
'network_address': 'sim-iscsi-tgt-3.example.com:3260',
'physical_address': 'a4:4e:31:47:f4:e0',
@@ -733,7 +733,7 @@ class SimData(object):
},
'TGT_PORT_ID_04': {
'tgt_id': 'TGT_PORT_ID_04',
- 'port_type': TargetPort.PORT_TYPE_ISCSI,
+ 'port_type': TargetPort.TYPE_ISCSI,
'service_address': 'iqn.1986-05.com.example:sim-tgt-03',
'network_address': '10.0.0.1:3260',
'physical_address': 'a4:4e:31:47:f4:e1',
@@ -742,7 +742,7 @@ class SimData(object):
},
'TGT_PORT_ID_05': {
'tgt_id': 'TGT_PORT_ID_05',
- 'port_type': TargetPort.PORT_TYPE_ISCSI,
+ 'port_type': TargetPort.TYPE_ISCSI,
'service_address': 'iqn.1986-05.com.example:sim-tgt-03',
'network_address': '[2001:470:1f09:efe:a64e:31ff::1]:3260',
'physical_address': 'a4:4e:31:47:f4:e1',
diff --git a/plugin/simc/simc_lsmplugin.c b/plugin/simc/simc_lsmplugin.c
index b263adb..7c55337 100644
--- a/plugin/simc/simc_lsmplugin.c
+++ b/plugin/simc/simc_lsmplugin.c
@@ -344,7 +344,7 @@ static int cap(lsm_plugin_ptr c, lsm_system *system,
*cap = lsm_capability_record_alloc(NULL);
if( *cap ) {
- rc = lsm_capability_set_n(*cap, LSM_CAPABILITY_SUPPORTED,
+ rc = lsm_capability_set_n(*cap, LSM_CAP_SUPPORTED,
LSM_CAP_VOLUMES,
LSM_CAP_VOLUME_CREATE,
LSM_CAP_VOLUME_RESIZE,
@@ -618,29 +618,29 @@ static int list_targets(lsm_plugin_ptr c, const char *search_key,
if( *tp ) {
(*tp)[0] = lsm_target_port_record_alloc("TGT_PORT_ID_01",
- LSM_PORT_TYPE_FC, p0, p0, p0,
+ LSM_TARGET_PORT_TYPE_FC, p0, p0, p0,
"FC_a_0b", sys_id, NULL);
(*tp)[1] = lsm_target_port_record_alloc("TGT_PORT_ID_02",
- LSM_PORT_TYPE_FCOE, p1, p1, p1,
+ LSM_TARGET_PORT_TYPE_FCOE, p1, p1, p1,
"FC_a_0c", sys_id, NULL);
(*tp)[2] = lsm_target_port_record_alloc("TGT_PORT_ID_03",
- LSM_PORT_TYPE_ISCSI,
+ LSM_TARGET_PORT_TYPE_ISCSI,
"iqn.1986-05.com.example:sim-tgt-03",
"sim-iscsi-tgt-3.example.com:3260",
"a4:4e:31:47:f4:e0",
"iSCSI_c_0d", sys_id, NULL);
(*tp)[3] = lsm_target_port_record_alloc("TGT_PORT_ID_04",
- LSM_PORT_TYPE_ISCSI,
+ LSM_TARGET_PORT_TYPE_ISCSI,
"iqn.1986-05.com.example:sim-tgt-03",
"10.0.0.1:3260",
"a4:4e:31:47:f4:e1",
"iSCSI_c_0e", sys_id, NULL);
(*tp)[4] = lsm_target_port_record_alloc("TGT_PORT_ID_05",
- LSM_PORT_TYPE_ISCSI,
+ LSM_TARGET_PORT_TYPE_ISCSI,
"iqn.1986-05.com.example:sim-tgt-03",
"[2001:470:1f09:efe:a64e:31ff::1]:3260",
"a4:4e:31:47:f4:e1",
@@ -721,7 +721,7 @@ static struct allocated_volume * find_volume_name(struct plugin_data *pd,
static int volume_create(lsm_plugin_ptr c, lsm_pool *pool,
const char *volume_name, uint64_t size,
- lsm_provision_type provisioning, lsm_volume **new_volume,
+ lsm_volume_provision_type provisioning, lsm_volume **new_volume,
char **job, lsm_flag flags)
{
int rc = LSM_ERR_OK;
@@ -806,7 +806,7 @@ static int volume_replicate(lsm_plugin_ptr c, lsm_pool *pool,
if( find_volume(pd, lsm_volume_id_get(volume_src) )) {
rc = volume_create(c, pool_to_use, name,
lsm_volume_number_of_blocks_get(volume_src)*BS,
- LSM_PROVISION_DEFAULT, new_replicant, job, flags);
+ LSM_VOLUME_PROVISION_DEFAULT, new_replicant, job, flags);
} else {
rc = lsm_log_error_basic(c, LSM_ERR_NOT_FOUND_VOLUME,
"Volume not found!");
@@ -935,7 +935,7 @@ static int volume_delete(lsm_plugin_ptr c, lsm_volume *volume,
// Check to see if this volume is masked to any access groups, if it is we
// will return an IS_MASKED error code.
- int rc = ag_granted_to_volume(c, volume, &groups, &count, LSM_FLAG_RSVD);
+ int rc = ag_granted_to_volume(c, volume, &groups, &count, LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_OK == rc ) {
lsm_access_group_record_array_free(groups, count);
@@ -1084,7 +1084,7 @@ static int access_group_delete( lsm_plugin_ptr c,
struct plugin_data *pd = (struct plugin_data*)lsm_private_data_get(c);
const char *id = lsm_access_group_id_get(group);
- rc = vol_accessible_by_ag(c, group, &volumes, &count, LSM_FLAG_RSVD);
+ rc = vol_accessible_by_ag(c, group, &volumes, &count, LSM_CLIENT_FLAG_RSVD);
if( rc == LSM_ERR_OK && count ) {
lsm_volume_record_array_free(volumes, count);
@@ -1208,10 +1208,10 @@ static int volume_mask(lsm_plugin_ptr c,
free, free);
char *key = strdup(lsm_access_group_id_get(find->ag));
char *vol_id = strdup(lsm_volume_id_get(volume));
- lsm_access_type *val = (lsm_access_type*) malloc(sizeof(lsm_access_type));
+ int *val = (int*) malloc(sizeof(int));
if( grant && key && val && vol_id ) {
- *val = LSM_VOLUME_ACCESS_READ_WRITE;
+ *val = 1;
/* Create the association for volume id and access value */
g_hash_table_insert(grant, vol_id, val);
@@ -1235,8 +1235,8 @@ static int volume_mask(lsm_plugin_ptr c,
char *vol_id = g_hash_table_lookup(grants, lsm_volume_id_get(volume));
if( !vol_id ) {
vol_id = strdup(lsm_volume_id_get(volume));
- lsm_access_type *val =
- (lsm_access_type*) malloc(sizeof(lsm_access_type));
+ int *val = (int*) malloc(sizeof(int));
+ *val = 1;
if( vol_id && val ) {
g_hash_table_insert(grants, vol_id, val);
} else {
diff --git a/plugin/smispy/smis.py b/plugin/smispy/smis.py
index f03a257..5a7f2b2 100644
--- a/plugin/smispy/smis.py
+++ b/plugin/smispy/smis.py
@@ -169,11 +169,11 @@ def _lsm_tgt_port_type_of_cim_fc_tgt(cim_fc_tgt):
if 'PortDiscriminator' in cim_fc_tgt and \
cim_fc_tgt['PortDiscriminator'] and \
DMTF.FC_PORT_PORT_DISCRIMINATOR_FCOE in cim_fc_tgt['PortDiscriminator']:
- return TargetPort.PORT_TYPE_FCOE
+ return TargetPort.TYPE_FCOE
if 'LinkTechnology' in cim_fc_tgt and \
cim_fc_tgt['LinkTechnology'] == DMTF.NET_PORT_LINK_TECH_ETHERNET:
- return TargetPort.PORT_TYPE_FCOE
- return TargetPort.PORT_TYPE_FC
+ return TargetPort.TYPE_FCOE
+ return TargetPort.TYPE_FC
def _lsm_init_type_to_dmtf(init_type):
@@ -3579,7 +3579,7 @@ class Smis(IStorageAreaNetwork):
this method is only for iSCSI over TCP.
"""
rc = []
- port_type = TargetPort.PORT_TYPE_ISCSI
+ port_type = TargetPort.TYPE_ISCSI
plugin_data = None
cim_tcps = self._c.Associators(
cim_iscsi_pg.path,
diff --git a/python_binding/lsm/__init__.py b/python_binding/lsm/__init__.py
index 308ad15..fb1cdbd 100644
--- a/python_binding/lsm/__init__.py
+++ b/python_binding/lsm/__init__.py
@@ -2,7 +2,7 @@ __all__ = []
from version import VERSION
-from _common import error, info, LsmError, ErrorLevel, ErrorNumber, \
+from _common import error, info, LsmError, ErrorNumber, \
JobStatus, uri_parse, md5, Proxy, size_bytes_2_size_human, \
common_urllib2_error_handler, size_human_2_size_bytes
from _data import (Disk, Volume, Pool, System, FileSystem, FsSnapshot,
diff --git a/python_binding/lsm/_client.py b/python_binding/lsm/_client.py
index 6b8e111..6b58608 100644
--- a/python_binding/lsm/_client.py
+++ b/python_binding/lsm/_client.py
@@ -63,6 +63,12 @@ def _raise_no_daemon():
# parameter names. Makes the code compact, but you will break things if the
# IPlugin class does not match the method names and parameters here!
class Client(INetworkAttachedStorage):
+
+ ##
+ # Used for default flag value
+ #
+ FLAG_RSVD = 0
+
"""
Client side class used for managing storage that utilises RPC mechanism.
"""
diff --git a/python_binding/lsm/_common.py b/python_binding/lsm/_common.py
index 9281ec1..5089565 100644
--- a/python_binding/lsm/_common.py
+++ b/python_binding/lsm/_common.py
@@ -411,12 +411,6 @@ def get_class(class_name):
return m
-class ErrorLevel(object):
- NONE = 0
- WARNING = 1
- ERROR = 2
-
-
#Note: Some of these don't make sense for python, but they do for other
#Languages so we will be keeping them consistent even though we won't be
#using them.
@@ -467,7 +461,6 @@ class ErrorNumber(object):
PLUGIN_SOCKET_PERMISSION = 307 # Incorrect permission on UNIX domain
# socket used for IPC
- PLUGIN_REGISTRATION = 308
PLUGIN_NOT_EXIST = 311
NOT_ENOUGH_SPACE = 350
diff --git a/python_binding/lsm/_data.py b/python_binding/lsm/_data.py
index 9f5c723..b7f3290 100644
--- a/python_binding/lsm/_data.py
+++ b/python_binding/lsm/_data.py
@@ -556,11 +556,11 @@ class AccessGroup(IData):
class TargetPort(IData):
SUPPORTED_SEARCH_KEYS = ['id', 'system_id']
- PORT_TYPE_UNKNOWN = 0
- PORT_TYPE_OTHER = 1
- PORT_TYPE_FC = 2
- PORT_TYPE_FCOE = 3
- PORT_TYPE_ISCSI = 4
+ TYPE_UNKNOWN = 0
+ TYPE_OTHER = 1
+ TYPE_FC = 2
+ TYPE_FCOE = 3
+ TYPE_ISCSI = 4
def __init__(self, _id, _port_type, _service_address,
_network_address, _physical_address, _physical_name,
diff --git a/test/runtests.sh b/test/runtests.sh
index 93b584e..a2840e9 100755
--- a/test/runtests.sh
+++ b/test/runtests.sh
@@ -136,6 +136,9 @@ good "find $rootdir/ \( ! -regex '.*/\..*' \) -type f -name \*_lsmplugin -exec c
good "cp $bin_plugin/*_lsmplugin $plugins"
good "ls -lh $plugins"
+#Check to make sure that constants are correct
+good "perl ../tools/utility/check_const.pl"
+
#Start daemon
$LSMD_DAEMON \
--plugindir $plugins \
diff --git a/test/tester.c b/test/tester.c
index 1a27d12..d5ce169 100644
--- a/test/tester.c
+++ b/test/tester.c
@@ -129,7 +129,7 @@ lsm_pool *get_test_pool(lsm_connect *c)
lsm_pool *test_pool = NULL;
int rc = 0;
- G(rc, lsm_pool_list, c, NULL, NULL, &pools, &count, LSM_FLAG_RSVD);
+ G(rc, lsm_pool_list, c, NULL, NULL, &pools, &count, LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_OK == rc ) {
uint32_t i = 0;
@@ -168,7 +168,7 @@ void setup(void)
lsm_error_ptr e = NULL;
int rc = lsm_connect_password(plugin_to_use(), NULL, &c, 30000, &e,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_OK == rc ) {
if( getenv("LSM_DEBUG_PLUGIN") ) {
@@ -185,7 +185,7 @@ void teardown(void)
*/
if( c ) {
- lsm_connect_close(c, LSM_FLAG_RSVD);
+ lsm_connect_close(c, LSM_CLIENT_FLAG_RSVD);
c = NULL;
}
}
@@ -197,14 +197,14 @@ void wait_for_job(lsm_connect *c, char **job_id)
int rc = 0;
do {
- G(rc, lsm_job_status_get, c, *job_id, &status, &pc, LSM_FLAG_RSVD);
+ G(rc, lsm_job_status_get, c, *job_id, &status, &pc, LSM_CLIENT_FLAG_RSVD);
printf("GENERIC: Job %s in progress, %d done, status = %d\n", *job_id,
pc, status);
usleep(POLL_SLEEP);
} while( status == LSM_JOB_INPROGRESS );
- G(rc, lsm_job_free, c, job_id, LSM_FLAG_RSVD);
+ G(rc, lsm_job_free, c, job_id, LSM_CLIENT_FLAG_RSVD);
fail_unless( LSM_JOB_COMPLETE == status);
fail_unless( 100 == pc);
@@ -220,7 +220,7 @@ lsm_volume *wait_for_job_vol(lsm_connect *c, char **job_id)
do {
G(rc, lsm_job_status_volume_get, c, *job_id, &status, &pc, &vol,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
printf("VOLUME: Job %s in progress, %d done, status = %d\n",
*job_id, pc, status);
usleep(POLL_SLEEP);
@@ -230,7 +230,7 @@ lsm_volume *wait_for_job_vol(lsm_connect *c, char **job_id)
printf("Volume complete: Job %s percent %d done, status = %d, rc=%d\n",
*job_id, pc, status, rc);
- G(rc, lsm_job_free, c, job_id, LSM_FLAG_RSVD);
+ G(rc, lsm_job_free, c, job_id, LSM_CLIENT_FLAG_RSVD);
fail_unless( LSM_JOB_COMPLETE == status);
fail_unless( 100 == pc);
@@ -247,14 +247,14 @@ lsm_pool *wait_for_job_pool(lsm_connect *c, char **job_id)
do {
G(rc, lsm_job_status_pool_get, c, *job_id, &status, &pc, &pool,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
printf("POOL: Job %s in progress, %d done, status = %d\n", *job_id, pc,
status);
usleep(POLL_SLEEP);
} while( status == LSM_JOB_INPROGRESS );
- G(rc, lsm_job_free, c, job_id, LSM_FLAG_RSVD);
+ G(rc, lsm_job_free, c, job_id, LSM_CLIENT_FLAG_RSVD);
fail_unless( LSM_JOB_COMPLETE == status);
fail_unless( 100 == pc);
@@ -271,14 +271,14 @@ lsm_fs *wait_for_job_fs(lsm_connect *c, char **job_id)
do {
G(rc, lsm_job_status_fs_get, c, *job_id, &status, &pc, &fs,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
printf("FS: Job %s in progress, %d done, status = %d\n", *job_id, pc,
status);
usleep(POLL_SLEEP);
} while( status == LSM_JOB_INPROGRESS );
- G(rc, lsm_job_free, c, job_id, LSM_FLAG_RSVD);
+ G(rc, lsm_job_free, c, job_id, LSM_CLIENT_FLAG_RSVD);
fail_unless( LSM_JOB_COMPLETE == status);
fail_unless( 100 == pc);
@@ -294,14 +294,14 @@ lsm_fs_ss *wait_for_job_ss(lsm_connect *c, char **job_id)
do {
G(rc, lsm_job_status_ss_get, c, *job_id, &status, &pc, &ss,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
printf("SS: Job %s in progress, %d done, status = %d\n",
*job_id, pc, status);
usleep(POLL_SLEEP);
} while( status == LSM_JOB_INPROGRESS );
- G(rc, lsm_job_free, c, job_id, LSM_FLAG_RSVD);
+ G(rc, lsm_job_free, c, job_id, LSM_CLIENT_FLAG_RSVD);
fail_unless( LSM_JOB_COMPLETE == status);
fail_unless( 100 == pc);
@@ -346,7 +346,7 @@ void create_volumes(lsm_connect *c, lsm_pool *p, int num)
snprintf(name, sizeof(name), "test %d", i);
int vc = lsm_volume_create(c, p, name, 20000000,
- LSM_PROVISION_DEFAULT, &n, &job, LSM_FLAG_RSVD);
+ LSM_VOLUME_PROVISION_DEFAULT, &n, &job, LSM_CLIENT_FLAG_RSVD);
fail_unless( vc == LSM_ERR_OK || vc == LSM_ERR_JOB_STARTED,
"lsmVolumeCreate %d (%s)", vc, error(lsm_error_last_get(c)));
@@ -369,7 +369,7 @@ lsm_system *get_system(lsm_connect *c)
uint32_t count = 0;
int rc = 0;
- G(rc, lsm_system_list, c, &sys, &count, LSM_FLAG_RSVD);
+ G(rc, lsm_system_list, c, &sys, &count, LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_OK == rc && count) {
rc_sys = lsm_system_record_copy(sys[0]);
@@ -390,10 +390,10 @@ START_TEST(test_smoke_test)
uint32_t tmo = 0;
//Set timeout.
- G(rc, lsm_connect_timeout_set, c, set_tmo, LSM_FLAG_RSVD);
+ G(rc, lsm_connect_timeout_set, c, set_tmo, LSM_CLIENT_FLAG_RSVD);
//Get time-out.
- G(rc, lsm_connect_timeout_get, c, &tmo, LSM_FLAG_RSVD);
+ G(rc, lsm_connect_timeout_get, c, &tmo, LSM_CLIENT_FLAG_RSVD);
fail_unless( set_tmo == tmo, " %u != %u", set_tmo, tmo );
@@ -402,7 +402,7 @@ START_TEST(test_smoke_test)
int poolToUse = -1;
//Get pool list
- G(rc, lsm_pool_list, c, NULL, NULL, &pools, &poolCount, LSM_FLAG_RSVD);
+ G(rc, lsm_pool_list, c, NULL, NULL, &pools, &poolCount, LSM_CLIENT_FLAG_RSVD);
//Check pool count
count = poolCount;
@@ -437,7 +437,7 @@ START_TEST(test_smoke_test)
selectedPool = pools[poolToUse];
int vc = lsm_volume_create(c, pools[poolToUse], "test", 20000000,
- LSM_PROVISION_DEFAULT, &n, &job, LSM_FLAG_RSVD);
+ LSM_VOLUME_PROVISION_DEFAULT, &n, &job, LSM_CLIENT_FLAG_RSVD);
fail_unless( vc == LSM_ERR_OK || vc == LSM_ERR_JOB_STARTED,
"lsmVolumeCreate %d (%s)", vc, error(lsm_error_last_get(c)));
@@ -451,10 +451,10 @@ START_TEST(test_smoke_test)
uint8_t dependants = 10;
int child_depends = 0;
G(child_depends, lsm_volume_child_dependency, c, n, &dependants,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
fail_unless(dependants == 0);
- child_depends = lsm_volume_child_dependency_delete(c, n, &job, LSM_FLAG_RSVD);
+ child_depends = lsm_volume_child_dependency_delete(c, n, &job, LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_JOB_STARTED == child_depends ) {
wait_for_job(c, &job);
} else {
@@ -472,7 +472,7 @@ START_TEST(test_smoke_test)
int rep_bs = 0;
G(rep_bs, lsm_volume_replicate_range_block_size, c, system, &bs,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
fail_unless(512 == bs);
lsm_system_record_free(system);
@@ -500,7 +500,7 @@ START_TEST(test_smoke_test)
}
int rep_range = lsm_volume_replicate_range(c, LSM_VOLUME_REPLICATE_CLONE,
- n, n, range, 3, &job, LSM_FLAG_RSVD);
+ n, n, range, 3, &job, LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_JOB_STARTED == rep_range ) {
wait_for_job(c, &job);
@@ -516,12 +516,12 @@ START_TEST(test_smoke_test)
G(rc, lsm_block_range_record_array_free, range, 3);
int online = 0;
- G(online, lsm_volume_disable, c, n, LSM_FLAG_RSVD);
+ G(online, lsm_volume_disable, c, n, LSM_CLIENT_FLAG_RSVD);
- G(online, lsm_volume_enable, c, n, LSM_FLAG_RSVD);
+ G(online, lsm_volume_enable, c, n, LSM_CLIENT_FLAG_RSVD);
char *jobDel = NULL;
- int delRc = lsm_volume_delete(c, n, &jobDel, LSM_FLAG_RSVD);
+ int delRc = lsm_volume_delete(c, n, &jobDel, LSM_CLIENT_FLAG_RSVD);
fail_unless( delRc == LSM_ERR_OK || delRc == LSM_ERR_JOB_STARTED,
"lsm_volume_delete %d (%s)", rc, error(lsm_error_last_get(c)));
@@ -539,7 +539,7 @@ START_TEST(test_smoke_test)
lsm_volume **volumes = NULL;
count = 0;
/* Get a list of volumes */
- G(rc, lsm_volume_list, c, NULL, NULL, &volumes, &count, LSM_FLAG_RSVD);
+ G(rc, lsm_volume_list, c, NULL, NULL, &volumes, &count, LSM_CLIENT_FLAG_RSVD);
for (i = 0; i < count; ++i) {
printf("%s - %s - %s - %"PRIu64" - %"PRIu64" - %x\n",
@@ -562,7 +562,7 @@ START_TEST(test_smoke_test)
int resizeRc = lsm_volume_resize(c, volumes[0],
((lsm_volume_number_of_blocks_get(volumes[0]) *
- lsm_volume_block_size_get(volumes[0])) * 2), &resized, &resizeJob, LSM_FLAG_RSVD);
+ lsm_volume_block_size_get(volumes[0])) * 2), &resized, &resizeJob, LSM_CLIENT_FLAG_RSVD);
fail_unless(resizeRc == LSM_ERR_OK || resizeRc == LSM_ERR_JOB_STARTED,
"lsmVolumeResize %d (%s)", resizeRc,
@@ -578,7 +578,7 @@ START_TEST(test_smoke_test)
int repRc = lsm_volume_replicate(c, NULL, //Pool is optional
LSM_VOLUME_REPLICATE_SNAPSHOT,
volumes[0], "SNAPSHOT1",
- &rep, &job, LSM_FLAG_RSVD);
+ &rep, &job, LSM_CLIENT_FLAG_RSVD);
fail_unless(repRc == LSM_ERR_OK || repRc == LSM_ERR_JOB_STARTED,
"lsmVolumeReplicate %d (%s)", repRc,
@@ -616,14 +616,14 @@ START_TEST(test_access_groups)
system = get_system(c);
- G(rc, lsm_access_group_list, c, NULL, NULL, &groups, &count, LSM_FLAG_RSVD);
+ G(rc, lsm_access_group_list, c, NULL, NULL, &groups, &count, LSM_CLIENT_FLAG_RSVD);
fail_unless(count == 0, "Expect 0 access groups, got %"PRIu32, count);
fail_unless(groups == NULL);
G(rc, lsm_access_group_create, c, "test_access_groups",
"iqn.1994-05.com.domain:01.89bd01",
LSM_ACCESS_GROUP_INIT_TYPE_ISCSI_IQN, system,
- &group, LSM_FLAG_RSVD);
+ &group, LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_OK == rc ) {
lsm_string_list *init_list = lsm_access_group_initiator_id_get(group);
@@ -656,7 +656,7 @@ START_TEST(test_access_groups)
init_copy = NULL;
}
- G(rc, lsm_access_group_list, c, NULL, NULL, &groups, &count, LSM_FLAG_RSVD);
+ G(rc, lsm_access_group_list, c, NULL, NULL, &groups, &count, LSM_CLIENT_FLAG_RSVD);
fail_unless( 1 == count );
G(rc, lsm_access_group_record_array_free, groups, count);
groups = NULL;
@@ -666,10 +666,10 @@ START_TEST(test_access_groups)
rc = lsm_access_group_initiator_add(c, group, "iqn.1994-05.com.domain:01.89bd02",
LSM_ACCESS_GROUP_INIT_TYPE_ISCSI_IQN,
- &updated, LSM_FLAG_RSVD);
+ &updated, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_OK == rc, "Expected success on lsmAccessGroupInitiatorAdd %d %d", rc, which_plugin);
- G(rc, lsm_access_group_list, c, NULL, NULL, &groups, &count, LSM_FLAG_RSVD);
+ G(rc, lsm_access_group_list, c, NULL, NULL, &groups, &count, LSM_CLIENT_FLAG_RSVD);
fail_unless( 1 == count );
fail_unless( updated != NULL );
@@ -690,7 +690,7 @@ START_TEST(test_access_groups)
G(rc, lsm_access_group_initiator_delete, c, groups[0],
lsm_string_list_elem_get(init_list, i),
LSM_ACCESS_GROUP_INIT_TYPE_ISCSI_IQN, &updated,
- LSM_FLAG_RSVD)
+ LSM_CLIENT_FLAG_RSVD)
fail_unless(updated != NULL);
lsm_access_group_record_free(updated);
@@ -708,7 +708,7 @@ START_TEST(test_access_groups)
groups = NULL;
count = 0;
- G(rc, lsm_access_group_list, c, NULL, NULL, &groups, &count, LSM_FLAG_RSVD);
+ G(rc, lsm_access_group_list, c, NULL, NULL, &groups, &count, LSM_CLIENT_FLAG_RSVD);
fail_unless( LSM_ERR_OK == rc);
fail_unless( 1 == count );
@@ -745,11 +745,11 @@ START_TEST(test_access_groups_grant_revoke)
ISCSI_HOST[0],
LSM_ACCESS_GROUP_INIT_TYPE_ISCSI_IQN,
system,
- &group, LSM_FLAG_RSVD);
+ &group, LSM_CLIENT_FLAG_RSVD);
int vc = lsm_volume_create(c, pool, "volume_grant_test", 20000000,
- LSM_PROVISION_DEFAULT, &n, &job, LSM_FLAG_RSVD);
+ LSM_VOLUME_PROVISION_DEFAULT, &n, &job, LSM_CLIENT_FLAG_RSVD);
fail_unless( vc == LSM_ERR_OK || vc == LSM_ERR_JOB_STARTED,
"lsmVolumeCreate %d (%s)", vc, error(lsm_error_last_get(c)));
@@ -760,7 +760,7 @@ START_TEST(test_access_groups_grant_revoke)
fail_unless(n != NULL);
- rc = lsm_volume_mask(c, group, n, LSM_FLAG_RSVD);
+ rc = lsm_volume_mask(c, group, n, LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_JOB_STARTED == rc ) {
wait_for_job(c, &job);
} else {
@@ -770,7 +770,7 @@ START_TEST(test_access_groups_grant_revoke)
lsm_volume **volumes = NULL;
uint32_t v_count = 0;
G(rc, lsm_volumes_accessible_by_access_group, c, group, &volumes, &v_count,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
fail_unless(v_count == 1);
if( v_count >= 1 ) {
@@ -781,7 +781,7 @@ START_TEST(test_access_groups_grant_revoke)
lsm_access_group **groups;
uint32_t g_count = 0;
G(rc, lsm_access_groups_granted_to_volume, c, n, &groups, &g_count,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
fail_unless(g_count == 1);
@@ -790,7 +790,7 @@ START_TEST(test_access_groups_grant_revoke)
G(rc, lsm_access_group_record_array_free, groups, g_count);
}
- rc = lsm_volume_unmask(c, group, n, LSM_FLAG_RSVD);
+ rc = lsm_volume_unmask(c, group, n, LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_JOB_STARTED == rc ) {
wait_for_job(c, &job);
} else {
@@ -798,7 +798,7 @@ START_TEST(test_access_groups_grant_revoke)
rc, which_plugin);
}
- G(rc, lsm_access_group_delete, c, group, LSM_FLAG_RSVD);
+ G(rc, lsm_access_group_delete, c, group, LSM_CLIENT_FLAG_RSVD);
G(rc, lsm_access_group_record_free, group);
G(rc, lsm_volume_record_free, n);
@@ -822,10 +822,10 @@ START_TEST(test_fs)
lsm_pool *test_pool = get_test_pool(c);
- G(rc, lsm_fs_list, c, NULL, NULL, &fs_list, &fs_count, LSM_FLAG_RSVD);
+ G(rc, lsm_fs_list, c, NULL, NULL, &fs_list, &fs_count, LSM_CLIENT_FLAG_RSVD);
fail_unless(0 == fs_count);
- rc = lsm_fs_create(c, test_pool, "C_unit_test", 50000000, &nfs, &job, LSM_FLAG_RSVD);
+ rc = lsm_fs_create(c, test_pool, "C_unit_test", 50000000, &nfs, &job, LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_JOB_STARTED == rc ) {
fail_unless(NULL == nfs);
@@ -841,7 +841,7 @@ START_TEST(test_fs)
fail_unless(fs_free_space != 0);
lsm_fs *cloned_fs = NULL;
- rc = lsm_fs_clone(c, nfs, "cloned_fs", NULL, &cloned_fs, &job, LSM_FLAG_RSVD);
+ rc = lsm_fs_clone(c, nfs, "cloned_fs", NULL, &cloned_fs, &job, LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_JOB_STARTED == rc ) {
fail_unless(NULL == cloned_fs);
cloned_fs = wait_for_job_fs(c, &job);
@@ -853,7 +853,7 @@ START_TEST(test_fs)
fail_unless(LSM_ERR_OK == rc, "rc= %d", rc);
}
- rc = lsm_fs_file_clone(c, nfs, "src/file.txt", "dest/file.txt", NULL, &job, LSM_FLAG_RSVD);
+ rc = lsm_fs_file_clone(c, nfs, "src/file.txt", "dest/file.txt", NULL, &job, LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_JOB_STARTED == rc ) {
wait_for_job(c, &job);
} else {
@@ -861,13 +861,13 @@ START_TEST(test_fs)
}
- G(rc, lsm_fs_list, c, NULL, NULL, &fs_list, &fs_count, LSM_FLAG_RSVD);
+ G(rc, lsm_fs_list, c, NULL, NULL, &fs_list, &fs_count, LSM_CLIENT_FLAG_RSVD);
fail_unless(2 == fs_count, "fs_count = %d", fs_count);
G(rc, lsm_fs_record_array_free, fs_list, fs_count);
fs_list = NULL;
fs_count = 0;
- rc = lsm_fs_resize(c,nfs, 100000000, &resized_fs, &job, LSM_FLAG_RSVD);
+ rc = lsm_fs_resize(c,nfs, 100000000, &resized_fs, &job, LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_JOB_STARTED == rc ) {
fail_unless(NULL == resized_fs);
@@ -875,10 +875,10 @@ START_TEST(test_fs)
}
uint8_t yes_no = 10;
- G(rc, lsm_fs_child_dependency, c, nfs, NULL, &yes_no, LSM_FLAG_RSVD);
+ G(rc, lsm_fs_child_dependency, c, nfs, NULL, &yes_no, LSM_CLIENT_FLAG_RSVD);
fail_unless( yes_no == 0);
- rc = lsm_fs_child_dependency_delete(c, nfs, NULL, &job, LSM_FLAG_RSVD);
+ rc = lsm_fs_child_dependency_delete(c, nfs, NULL, &job, LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_JOB_STARTED == rc ) {
fail_unless(NULL != job);
wait_for_job(c, &job);
@@ -886,7 +886,7 @@ START_TEST(test_fs)
fail_unless( LSM_ERR_OK == rc);
}
- rc = lsm_fs_delete(c, resized_fs, &job, LSM_FLAG_RSVD);
+ rc = lsm_fs_delete(c, resized_fs, &job, LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_JOB_STARTED == rc ) {
wait_for_job(c, &job);
@@ -913,7 +913,7 @@ START_TEST(test_ss)
lsm_pool *test_pool = get_test_pool(c);
int rc = lsm_fs_create(c, test_pool, "test_fs", 100000000, &fs, &job,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_JOB_STARTED == rc ) {
fs = wait_for_job_fs(c, &job);
@@ -925,12 +925,12 @@ START_TEST(test_ss)
test_pool = NULL;
- G(rc, lsm_fs_ss_list, c, fs, &ss_list, &ss_count, LSM_FLAG_RSVD);
+ G(rc, lsm_fs_ss_list, c, fs, &ss_list, &ss_count, LSM_CLIENT_FLAG_RSVD);
fail_unless( NULL == ss_list);
fail_unless( 0 == ss_count );
- rc = lsm_fs_ss_create(c, fs, "test_snap", &ss, &job, LSM_FLAG_RSVD);
+ rc = lsm_fs_ss_create(c, fs, "test_snap", &ss, &job, LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_JOB_STARTED == rc ) {
printf("Waiting for snap to create!\n");
ss = wait_for_job_ss(c, &job);
@@ -940,7 +940,7 @@ START_TEST(test_ss)
fail_unless( NULL != ss);
- G(rc, lsm_fs_ss_list, c, fs, &ss_list, &ss_count, LSM_FLAG_RSVD);
+ G(rc, lsm_fs_ss_list, c, fs, &ss_list, &ss_count, LSM_CLIENT_FLAG_RSVD);
fail_unless( NULL != ss_list);
fail_unless( 1 == ss_count );
@@ -949,7 +949,7 @@ START_TEST(test_ss)
G(rc, lsm_string_list_elem_set, files, 0, "some/file/name.txt");
}
- rc = lsm_fs_ss_restore(c, fs, ss, files, files, 0, &job, LSM_FLAG_RSVD);
+ rc = lsm_fs_ss_restore(c, fs, ss, files, files, 0, &job, LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_JOB_STARTED == rc ) {
printf("Waiting for lsm_fs_ss_restore!\n");
wait_for_job(c, &job);
@@ -959,7 +959,7 @@ START_TEST(test_ss)
G(rc, lsm_string_list_free, files);
- rc = lsm_fs_ss_delete(c, fs, ss, &job, LSM_FLAG_RSVD);
+ rc = lsm_fs_ss_delete(c, fs, ss, &job, LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_JOB_STARTED == rc ) {
wait_for_job(c, &job);
}
@@ -982,7 +982,7 @@ START_TEST(test_systems)
fail_unless(c!=NULL);
- G(rc, lsm_system_list, c, &sys, &count, LSM_FLAG_RSVD);
+ G(rc, lsm_system_list, c, &sys, &count, LSM_CLIENT_FLAG_RSVD);
fail_unless(count == 1);
id = lsm_system_id_get(sys[0]);
@@ -1089,7 +1089,7 @@ START_TEST(test_nfs_exports)
if( test_pool ) {
rc = lsm_fs_create(c, test_pool, "C_unit_test_nfs_export", 50000000,
- &nfs, &job, LSM_FLAG_RSVD);
+ &nfs, &job, LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_JOB_STARTED == rc ) {
nfs = wait_for_job_fs(c, &job);
@@ -1106,7 +1106,7 @@ START_TEST(test_nfs_exports)
if( nfs ) {
- G(rc, lsm_nfs_list, c, NULL, NULL, &exports, &count, LSM_FLAG_RSVD);
+ G(rc, lsm_nfs_list, c, NULL, NULL, &exports, &count, LSM_CLIENT_FLAG_RSVD);
fail_unless(count == 0);
fail_unless(NULL == exports);
@@ -1121,7 +1121,7 @@ START_TEST(test_nfs_exports)
G(rc, lsm_nfs_export_fs, c, lsm_fs_id_get(nfs), NULL, access,
access, NULL, ANON_UID_GID_NA,
ANON_UID_GID_NA, NULL, NULL, &e,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
G(rc, lsm_nfs_export_record_free, e);
e=NULL;
@@ -1129,17 +1129,17 @@ START_TEST(test_nfs_exports)
G(rc, lsm_string_list_free, access);
access = NULL;
- G(rc, lsm_nfs_list, c, NULL, NULL, &exports, &count, LSM_FLAG_RSVD);
+ G(rc, lsm_nfs_list, c, NULL, NULL, &exports, &count, LSM_CLIENT_FLAG_RSVD);
fail_unless( exports != NULL);
fail_unless( count == 1 );
if( count ) {
- G(rc, lsm_nfs_export_delete, c, exports[0], LSM_FLAG_RSVD);
+ G(rc, lsm_nfs_export_delete, c, exports[0], LSM_CLIENT_FLAG_RSVD);
G(rc, lsm_nfs_export_record_array_free, exports, count);
exports = NULL;
G(rc, lsm_nfs_list, c, NULL, NULL, &exports, &count,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
fail_unless(count == 0);
fail_unless(NULL == exports);
@@ -1173,8 +1173,8 @@ START_TEST(test_volume_methods)
if( test_pool ) {
rc = lsm_volume_create(c, test_pool, "lsm_volume_method_test",
- 10000000, LSM_PROVISION_DEFAULT,
- &v, &job, LSM_FLAG_RSVD);
+ 10000000, LSM_VOLUME_PROVISION_DEFAULT,
+ &v, &job, LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_JOB_STARTED == rc ) {
v = wait_for_job_vol(c, &job);
@@ -1186,7 +1186,7 @@ START_TEST(test_volume_methods)
fail_unless( strcmp(lsm_volume_pool_id_get(v),
lsm_pool_id_get(test_pool)) == 0 );
- rc = lsm_volume_delete(c, v, &job, LSM_FLAG_RSVD);
+ rc = lsm_volume_delete(c, v, &job, LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_JOB_STARTED == rc ) {
wait_for_job(c, &job);
} else {
@@ -1218,101 +1218,101 @@ START_TEST(test_invalid_input)
lsm_connect *test_connect = NULL;
lsm_error_ptr test_error = NULL;
- rc = lsm_connect_password(NULL, NULL, NULL, 20000, NULL, LSM_FLAG_RSVD);
+ rc = lsm_connect_password(NULL, NULL, NULL, 20000, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc %d", rc);
rc = lsm_connect_password("INVALID_URI:\\yep", NULL, &test_connect, 20000,
- &test_error, LSM_FLAG_RSVD);
+ &test_error, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc %d", rc);
- rc = lsm_connect_close((lsm_connect *)&bad, LSM_FLAG_RSVD);
+ rc = lsm_connect_close((lsm_connect *)&bad, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
- rc = lsm_connect_close((lsm_connect *)NULL, LSM_FLAG_RSVD);
+ rc = lsm_connect_close((lsm_connect *)NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
- rc = lsm_job_status_get(c, NULL, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_job_status_get(c, NULL, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
char *job = NULL;
- rc = lsm_job_status_get(c, job, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_job_status_get(c, job, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
lsm_job_status status;
- rc = lsm_job_status_get(c, job, &status, NULL, LSM_FLAG_RSVD);
+ rc = lsm_job_status_get(c, job, &status, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
uint8_t percent_complete;
- rc = lsm_job_status_get(c, "NO_SUCH_JOB", &status, &percent_complete, LSM_FLAG_RSVD);
+ rc = lsm_job_status_get(c, "NO_SUCH_JOB", &status, &percent_complete, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_NOT_FOUND_JOB == rc, "rc %d", rc);
/* lsmJobStatusVolumeGet */
lsm_volume *vol = NULL;
- rc = lsm_job_status_volume_get(c, NULL, NULL, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_job_status_volume_get(c, NULL, NULL, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
- rc = lsm_job_status_volume_get(c, NULL, NULL, NULL, &vol, LSM_FLAG_RSVD);
+ rc = lsm_job_status_volume_get(c, NULL, NULL, NULL, &vol, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
- rc = lsm_job_status_volume_get(c, job, NULL, NULL, &vol, LSM_FLAG_RSVD);
+ rc = lsm_job_status_volume_get(c, job, NULL, NULL, &vol, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
- rc = lsm_job_status_volume_get(c, job, &status, NULL, &vol, LSM_FLAG_RSVD);
+ rc = lsm_job_status_volume_get(c, job, &status, NULL, &vol, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
- rc = lsm_job_status_volume_get(c, "NO_SUCH_JOB", &status, &percent_complete, &vol, LSM_FLAG_RSVD);
+ rc = lsm_job_status_volume_get(c, "NO_SUCH_JOB", &status, &percent_complete, &vol, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_NOT_FOUND_JOB == rc, "rc %d", rc);
/* lsmJobStatusFsGet */
lsm_fs *fs = NULL;
- rc = lsm_job_status_fs_get(c, NULL, NULL, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_job_status_fs_get(c, NULL, NULL, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
- rc = lsm_job_status_fs_get(c, NULL, NULL, NULL, &fs, LSM_FLAG_RSVD);
+ rc = lsm_job_status_fs_get(c, NULL, NULL, NULL, &fs, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
- rc = lsm_job_status_fs_get(c, job, NULL, NULL, &fs, LSM_FLAG_RSVD);
+ rc = lsm_job_status_fs_get(c, job, NULL, NULL, &fs, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
- rc = lsm_job_status_fs_get(c, job, &status, NULL, &fs, LSM_FLAG_RSVD);
+ rc = lsm_job_status_fs_get(c, job, &status, NULL, &fs, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
- rc = lsm_job_status_fs_get(c, "NO_SUCH_JOB", &status, &percent_complete, &fs, LSM_FLAG_RSVD);
+ rc = lsm_job_status_fs_get(c, "NO_SUCH_JOB", &status, &percent_complete, &fs, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_NOT_FOUND_JOB == rc, "rc %d", rc);
/* lsmJobStatusFsGet */
lsm_fs_ss *ss = (lsm_fs_ss *)&bad;
- rc = lsm_job_status_ss_get(c, NULL, NULL, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_job_status_ss_get(c, NULL, NULL, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
- rc = lsm_job_status_ss_get(c, NULL, NULL, NULL, &ss, LSM_FLAG_RSVD);
+ rc = lsm_job_status_ss_get(c, NULL, NULL, NULL, &ss, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
ss = NULL;
- rc = lsm_job_status_ss_get(c, job, NULL, NULL, &ss, LSM_FLAG_RSVD);
+ rc = lsm_job_status_ss_get(c, job, NULL, NULL, &ss, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
- rc = lsm_job_status_ss_get(c, job, &status, NULL, &ss, LSM_FLAG_RSVD);
+ rc = lsm_job_status_ss_get(c, job, &status, NULL, &ss, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
- rc = lsm_job_status_ss_get(c, "NO_SUCH_JOB", &status, &percent_complete, &ss, LSM_FLAG_RSVD);
+ rc = lsm_job_status_ss_get(c, "NO_SUCH_JOB", &status, &percent_complete, &ss, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_NOT_FOUND_JOB == rc, "rc %d", rc);
/* lsmJobFree */
char *bogus_job = strdup("NO_SUCH_JOB");
- rc = lsm_job_free(c, NULL, LSM_FLAG_RSVD);
+ rc = lsm_job_free(c, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
- rc = lsm_job_free(c, &bogus_job, LSM_FLAG_RSVD);
+ rc = lsm_job_free(c, &bogus_job, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_NOT_FOUND_JOB == rc, "rc %d", rc);
fail_unless(bogus_job != NULL, "Expected bogus job to != NULL!");
@@ -1323,90 +1323,90 @@ START_TEST(test_invalid_input)
uint32_t count = 0;
lsm_disk **disks = NULL;
- rc = lsm_disk_list(c, NULL, NULL, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_disk_list(c, NULL, NULL, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d, rc");
- rc = lsm_disk_list(c, "bogus_key", NULL, &disks, &count, LSM_FLAG_RSVD);
+ rc = lsm_disk_list(c, "bogus_key", NULL, &disks, &count, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d, rc");
- rc = lsm_disk_list(c, "bogus_key", "nope", &disks, &count, LSM_FLAG_RSVD);
+ rc = lsm_disk_list(c, "bogus_key", "nope", &disks, &count, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_UNSUPPORTED_SEARCH_KEY == rc, "rc %d, rc");
/* lsmPoolList */
- rc = lsm_pool_list(c, NULL, NULL, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_pool_list(c, NULL, NULL, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
lsm_pool **pools = NULL;
- rc = lsm_pool_list(c, NULL, NULL, &pools, NULL, LSM_FLAG_RSVD);
+ rc = lsm_pool_list(c, NULL, NULL, &pools, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
- rc = lsm_pool_list(c, NULL, NULL, NULL, &count, LSM_FLAG_RSVD);
+ rc = lsm_pool_list(c, NULL, NULL, NULL, &count, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
pools = (lsm_pool **)&bad;
- rc = lsm_pool_list(c, NULL, NULL, &pools, &count, LSM_FLAG_RSVD);
+ rc = lsm_pool_list(c, NULL, NULL, &pools, &count, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
pools = NULL;
- rc = lsm_pool_list(c, "bogus_key", "nope", &pools, &count, LSM_FLAG_RSVD);
+ rc = lsm_pool_list(c, "bogus_key", "nope", &pools, &count, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_UNSUPPORTED_SEARCH_KEY == rc, "rc %d", rc);
- rc = lsm_pool_list(c, "bogus_key", NULL, &pools, &count, LSM_FLAG_RSVD);
+ rc = lsm_pool_list(c, "bogus_key", NULL, &pools, &count, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
/* lsmVolumeList */
- rc = lsm_volume_list(c, NULL, NULL, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_volume_list(c, NULL, NULL, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
lsm_volume **vols = NULL;
- rc = lsm_volume_list(c, NULL, NULL, &vols, NULL, LSM_FLAG_RSVD);
+ rc = lsm_volume_list(c, NULL, NULL, &vols, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
- rc = lsm_volume_list(c, NULL, NULL, NULL, &count, LSM_FLAG_RSVD);
+ rc = lsm_volume_list(c, NULL, NULL, NULL, &count, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
vols = (lsm_volume **)&bad;
- rc = lsm_volume_list(c, NULL, NULL, &vols, &count, LSM_FLAG_RSVD);
+ rc = lsm_volume_list(c, NULL, NULL, &vols, &count, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
vols = NULL;
- rc = lsm_volume_list(c, "bogus_key", "nope", &vols, &count, LSM_FLAG_RSVD);
+ rc = lsm_volume_list(c, "bogus_key", "nope", &vols, &count, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_UNSUPPORTED_SEARCH_KEY == rc, "rc %d", rc);
- rc = lsm_volume_list(c, "bogus_key", NULL, &vols, &count, LSM_FLAG_RSVD);
+ rc = lsm_volume_list(c, "bogus_key", NULL, &vols, &count, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
/* lsmVolumeCreate */
lsm_volume *new_vol = NULL;
job = NULL;
- rc = lsm_volume_create(c, NULL, NULL, 0, 0, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_volume_create(c, NULL, NULL, 0, 0, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
rc = lsm_volume_create(c, (lsm_pool *)&bad, "BAD_POOL", 10000000,
- LSM_PROVISION_DEFAULT, &new_vol, &job, LSM_FLAG_RSVD);
+ LSM_VOLUME_PROVISION_DEFAULT, &new_vol, &job, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
- rc = lsm_volume_create(c, test_pool, "", 10000000, LSM_PROVISION_DEFAULT,
- &new_vol, &job, LSM_FLAG_RSVD);
+ rc = lsm_volume_create(c, test_pool, "", 10000000, LSM_VOLUME_PROVISION_DEFAULT,
+ &new_vol, &job, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
- rc = lsm_volume_create(c, test_pool, "ARG_TESTING", 10000000, LSM_PROVISION_DEFAULT,
- NULL, &job, LSM_FLAG_RSVD);
+ rc = lsm_volume_create(c, test_pool, "ARG_TESTING", 10000000, LSM_VOLUME_PROVISION_DEFAULT,
+ NULL, &job, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
- rc = lsm_volume_create(c, test_pool, "ARG_TESTING", 10000000, LSM_PROVISION_DEFAULT,
- &new_vol, NULL, LSM_FLAG_RSVD);
+ rc = lsm_volume_create(c, test_pool, "ARG_TESTING", 10000000, LSM_VOLUME_PROVISION_DEFAULT,
+ &new_vol, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
job = "NOT_NULL";
- rc = lsm_volume_create(c, test_pool, "ARG_TESTING", 10000000, LSM_PROVISION_DEFAULT,
- &new_vol, &job, LSM_FLAG_RSVD);
+ rc = lsm_volume_create(c, test_pool, "ARG_TESTING", 10000000, LSM_VOLUME_PROVISION_DEFAULT,
+ &new_vol, &job, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
job = NULL;
- rc = lsm_volume_create(c, test_pool, "ARG_TESTING", 10000000, LSM_PROVISION_DEFAULT,
- &new_vol, &job, LSM_FLAG_RSVD);
+ rc = lsm_volume_create(c, test_pool, "ARG_TESTING", 10000000, LSM_VOLUME_PROVISION_DEFAULT,
+ &new_vol, &job, LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_JOB_STARTED == rc ) {
new_vol = wait_for_job_vol(c, &job);
@@ -1415,24 +1415,24 @@ START_TEST(test_invalid_input)
}
/* lsmVolumeResize */
- rc = lsm_volume_resize(c, NULL, 0, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_volume_resize(c, NULL, 0, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
lsm_volume *resized = (lsm_volume *)&bad;
- rc = lsm_volume_resize(c, new_vol, 20000000, &resized, NULL, LSM_FLAG_RSVD);
+ rc = lsm_volume_resize(c, new_vol, 20000000, &resized, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
resized = NULL;
- rc = lsm_volume_resize(c, new_vol, 20000000, &resized, NULL, LSM_FLAG_RSVD);
+ rc = lsm_volume_resize(c, new_vol, 20000000, &resized, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
rc = lsm_volume_resize(c, new_vol, lsm_volume_number_of_blocks_get(new_vol) *
lsm_volume_block_size_get(new_vol),
- &resized, &job, LSM_FLAG_RSVD);
+ &resized, &job, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_NO_STATE_CHANGE == rc, "rc = %d", rc);
- rc = lsm_volume_resize(c, new_vol, 20000000, &resized, &job, LSM_FLAG_RSVD);
+ rc = lsm_volume_resize(c, new_vol, 20000000, &resized, &job, LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_JOB_STARTED == rc ) {
resized = wait_for_job_vol(c, &job);
@@ -1441,13 +1441,13 @@ START_TEST(test_invalid_input)
}
/* lsmVolumeDelete */
- rc = lsm_volume_delete(c, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_volume_delete(c, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
- rc = lsm_volume_delete(c, resized, NULL, LSM_FLAG_RSVD);
+ rc = lsm_volume_delete(c, resized, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
- rc = lsm_volume_delete(c, resized, &job, LSM_FLAG_RSVD);
+ rc = lsm_volume_delete(c, resized, &job, LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_JOB_STARTED == rc ) {
wait_for_job(c, &job);
} else {
@@ -1457,65 +1457,65 @@ START_TEST(test_invalid_input)
/* lsmStorageCapabilities * */
lsm_system **sys = NULL;
uint32_t num_systems = 0;
- rc = lsm_system_list(c, &sys, &num_systems, LSM_FLAG_RSVD );
+ rc = lsm_system_list(c, &sys, &num_systems, LSM_CLIENT_FLAG_RSVD );
fail_unless(LSM_ERR_OK == rc, "rc %d", rc);
fail_unless( sys != NULL);
fail_unless( num_systems >= 1, "num_systems %d", num_systems);
- rc = lsm_capabilities(c, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_capabilities(c, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT, "rc %d", rc);
if( num_systems ) {
- rc = lsm_capabilities(c, sys[0], NULL, LSM_FLAG_RSVD);
+ rc = lsm_capabilities(c, sys[0], NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT, "rc %d", rc);
}
/* lsmVolumeReplicate */
lsm_volume *cloned = NULL;
- rc = lsm_volume_replicate(c, (lsm_pool *)&bad, 0, NULL, NULL, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_volume_replicate(c, (lsm_pool *)&bad, 0, NULL, NULL, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
rc = lsm_volume_replicate(c, test_pool, LSM_VOLUME_REPLICATE_CLONE, NULL,
- "cloned", &cloned, &job, LSM_FLAG_RSVD);
+ "cloned", &cloned, &job, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
rc = lsm_volume_replicate(c, test_pool, LSM_VOLUME_REPLICATE_CLONE, new_vol,
- "", &cloned, &job, LSM_FLAG_RSVD);
+ "", &cloned, &job, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
rc = lsm_volume_replicate(c, test_pool, LSM_VOLUME_REPLICATE_CLONE, new_vol,
- "cloned", NULL, &job, LSM_FLAG_RSVD);
+ "cloned", NULL, &job, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
rc = lsm_volume_replicate(c, test_pool, LSM_VOLUME_REPLICATE_CLONE, new_vol,
- "cloned", &cloned, NULL, LSM_FLAG_RSVD);
+ "cloned", &cloned, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
/* lsmVolumeReplicateRangeBlockSize */
- rc = lsm_volume_replicate_range_block_size(c, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_volume_replicate_range_block_size(c, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
/* lsmVolumeReplicateRange */
rc = lsm_volume_replicate_range(c, LSM_VOLUME_REPLICATE_CLONE, NULL, NULL,
- NULL, 0, NULL, LSM_FLAG_RSVD);
+ NULL, 0, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
rc = lsm_volume_replicate_range(c, LSM_VOLUME_REPLICATE_CLONE, new_vol,
- NULL, NULL, 0, NULL, LSM_FLAG_RSVD);
+ NULL, NULL, 0, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
rc = lsm_volume_replicate_range(c, LSM_VOLUME_REPLICATE_CLONE, new_vol, new_vol,
- NULL, 1, &job, LSM_FLAG_RSVD);
+ NULL, 1, &job, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_volume_enable(c, NULL, LSM_FLAG_RSVD);
+ rc = lsm_volume_enable(c, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_volume_disable(c, NULL, LSM_FLAG_RSVD);
+ rc = lsm_volume_disable(c, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
@@ -1524,109 +1524,109 @@ START_TEST(test_invalid_input)
lsm_system *system = NULL;
system = get_system(c);
- rc = lsm_access_group_create(c, NULL, NULL, 0, system, NULL, LSM_FLAG_RSVD);
+ rc = lsm_access_group_create(c, NULL, NULL, 0, system, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
rc = lsm_access_group_create(c, "my_group", ISCSI_HOST[0], LSM_ACCESS_GROUP_INIT_TYPE_OTHER,
- NULL, NULL, LSM_FLAG_RSVD);
+ NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
rc = lsm_access_group_create(c, "my_group", ISCSI_HOST[0], LSM_ACCESS_GROUP_INIT_TYPE_OTHER,
- system, &ag, LSM_FLAG_RSVD);
+ system, &ag, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_OK, "rc = %d", rc);
fail_unless(ag != NULL);
/* lsmAccessGroupDel */
- rc = lsm_access_group_delete(c, NULL, LSM_FLAG_RSVD);
+ rc = lsm_access_group_delete(c, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
/* lsmAccessGroupInitiatorAdd */
- rc = lsm_access_group_initiator_add(c, NULL, NULL, 0, NULL, LSM_FLAG_RSVD);
+ rc = lsm_access_group_initiator_add(c, NULL, NULL, 0, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_access_group_initiator_delete(c, NULL, NULL, 0, NULL, LSM_FLAG_RSVD);
+ rc = lsm_access_group_initiator_delete(c, NULL, NULL, 0, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
rc = lsm_access_group_initiator_delete(c, ag, NULL,
- LSM_ACCESS_GROUP_INIT_TYPE_OTHER, NULL, LSM_FLAG_RSVD);
+ LSM_ACCESS_GROUP_INIT_TYPE_OTHER, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_volume_mask(c, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_volume_mask(c, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_volume_mask(c, ag, NULL, LSM_FLAG_RSVD);
+ rc = lsm_volume_mask(c, ag, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_volume_unmask(c, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_volume_unmask(c, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_volume_unmask(c, ag, NULL, LSM_FLAG_RSVD);
+ rc = lsm_volume_unmask(c, ag, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
/* lsmVolumesAccessibleByAccessGroup */
- rc = lsm_volumes_accessible_by_access_group(c, NULL, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_volumes_accessible_by_access_group(c, NULL, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_volumes_accessible_by_access_group(c, ag, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_volumes_accessible_by_access_group(c, ag, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
/* lsmAccessGroupsGrantedToVolume */
- rc = lsm_access_groups_granted_to_volume(c, NULL, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_access_groups_granted_to_volume(c, NULL, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_access_groups_granted_to_volume(c, new_vol, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_access_groups_granted_to_volume(c, new_vol, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
/* lsmVolumeChildDependency */
- rc = lsm_volume_child_dependency(c, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_volume_child_dependency(c, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_volume_child_dependency(c, new_vol, NULL, LSM_FLAG_RSVD);
+ rc = lsm_volume_child_dependency(c, new_vol, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
/*lsmVolumeChildDependencyDelete*/
- rc = lsm_volume_child_dependency_delete(c, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_volume_child_dependency_delete(c, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_volume_child_dependency_delete(c, new_vol, NULL, LSM_FLAG_RSVD);
+ rc = lsm_volume_child_dependency_delete(c, new_vol, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
/* lsmSystemList */
lsm_system **systems = NULL;
- rc = lsm_system_list(c, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_system_list(c, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_system_list(c, &systems, NULL, LSM_FLAG_RSVD);
+ rc = lsm_system_list(c, &systems, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
/* lsmFsList */
- rc = lsm_fs_list(c, NULL, NULL, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_fs_list(c, NULL, NULL, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
lsm_fs **fsl = NULL;
- rc = lsm_fs_list(c, NULL, NULL, &fsl, NULL, LSM_FLAG_RSVD);
+ rc = lsm_fs_list(c, NULL, NULL, &fsl, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_fs_list(c, "bogus_key", "nope", &fsl, &count, LSM_FLAG_RSVD);
+ rc = lsm_fs_list(c, "bogus_key", "nope", &fsl, &count, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_UNSUPPORTED_SEARCH_KEY, "rc = %d", rc);
/*lsmFsCreate*/
- rc = lsm_fs_create(c, NULL, NULL, 0, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_fs_create(c, NULL, NULL, 0, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_fs_create(c, test_pool, NULL, 0, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_fs_create(c, test_pool, NULL, 0, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
lsm_fs *arg_fs = NULL;
rc = lsm_fs_create(c, test_pool, "argument_fs", 10000000, &arg_fs, &job,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_JOB_STARTED == rc ) {
arg_fs = wait_for_job_fs(c, &job);
@@ -1635,76 +1635,76 @@ START_TEST(test_invalid_input)
}
/* lsmFsDelete */
- rc = lsm_fs_delete(c, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_fs_delete(c, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_fs_delete(c, arg_fs, NULL, LSM_FLAG_RSVD);
+ rc = lsm_fs_delete(c, arg_fs, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
/* lsmFsResize */
- rc = lsm_fs_resize(c, NULL, 0, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_fs_resize(c, NULL, 0, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_fs_resize(c, arg_fs, 0, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_fs_resize(c, arg_fs, 0, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
/* lsmFsClone */
- rc = lsm_fs_clone(c, NULL, NULL, NULL, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_fs_clone(c, NULL, NULL, NULL, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_fs_clone(c, arg_fs, NULL, NULL, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_fs_clone(c, arg_fs, NULL, NULL, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
/*lsmFsFileClone*/
- rc = lsm_fs_file_clone(c, NULL, NULL, NULL, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_fs_file_clone(c, NULL, NULL, NULL, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_fs_file_clone(c, arg_fs, NULL, NULL, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_fs_file_clone(c, arg_fs, NULL, NULL, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_fs_child_dependency(c, NULL, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_fs_child_dependency(c, NULL, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
lsm_string_list *badf = (lsm_string_list *)&bad;
- rc = lsm_fs_child_dependency(c, arg_fs, badf, NULL, LSM_FLAG_RSVD);
+ rc = lsm_fs_child_dependency(c, arg_fs, badf, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
lsm_string_list *f = lsm_string_list_alloc(1);
- rc = lsm_fs_child_dependency(c, arg_fs, f, NULL, LSM_FLAG_RSVD);
+ rc = lsm_fs_child_dependency(c, arg_fs, f, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
/*lsmFsChildDependencyDelete*/
- rc = lsm_fs_child_dependency_delete(c, NULL, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_fs_child_dependency_delete(c, NULL, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_fs_child_dependency_delete(c, arg_fs, badf, NULL, LSM_FLAG_RSVD);
+ rc = lsm_fs_child_dependency_delete(c, arg_fs, badf, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_fs_child_dependency_delete(c, arg_fs, f, NULL, LSM_FLAG_RSVD);
+ rc = lsm_fs_child_dependency_delete(c, arg_fs, f, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_fs_ss_list(c, NULL, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_fs_ss_list(c, NULL, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_fs_ss_list(c, arg_fs, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_fs_ss_list(c, arg_fs, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_fs_ss_create(c, NULL, NULL, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_fs_ss_create(c, NULL, NULL, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_fs_ss_create(c, arg_fs, NULL, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_fs_ss_create(c, arg_fs, NULL, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
lsm_fs_ss *arg_ss = NULL;
rc = lsm_fs_ss_create(c, arg_fs, "arg_snapshot", &arg_ss, &job,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_JOB_STARTED == rc ) {
arg_ss = wait_for_job_ss(c, &job);
@@ -1712,32 +1712,32 @@ START_TEST(test_invalid_input)
fail_unless(rc == LSM_ERR_OK, "rc = %d", rc);
}
- rc = lsm_fs_ss_delete(c, NULL, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_fs_ss_delete(c, NULL, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_fs_ss_delete(c, arg_fs, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_fs_ss_delete(c, arg_fs, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_fs_ss_delete(c, arg_fs, arg_ss, NULL, LSM_FLAG_RSVD);
+ rc = lsm_fs_ss_delete(c, arg_fs, arg_ss, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_fs_ss_restore(c, NULL, NULL, NULL, NULL, 0, NULL, LSM_FLAG_RSVD);
+ rc = lsm_fs_ss_restore(c, NULL, NULL, NULL, NULL, 0, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_fs_ss_restore(c, arg_fs, NULL, NULL, NULL, 0, NULL, LSM_FLAG_RSVD);
+ rc = lsm_fs_ss_restore(c, arg_fs, NULL, NULL, NULL, 0, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_fs_ss_restore(c, arg_fs, arg_ss, badf, NULL, 0, NULL, LSM_FLAG_RSVD);
+ rc = lsm_fs_ss_restore(c, arg_fs, arg_ss, badf, NULL, 0, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_fs_ss_restore(c, arg_fs, arg_ss, badf, badf, 0, NULL, LSM_FLAG_RSVD);
+ rc = lsm_fs_ss_restore(c, arg_fs, arg_ss, badf, badf, 0, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_fs_ss_restore(c, arg_fs, arg_ss, f, f, 0, NULL, LSM_FLAG_RSVD);
+ rc = lsm_fs_ss_restore(c, arg_fs, arg_ss, f, f, 0, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_nfs_list(c, NULL, NULL, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_nfs_list(c, NULL, NULL, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
@@ -1754,27 +1754,27 @@ START_TEST(test_invalid_input)
arg_fs = NULL;
rc = lsm_nfs_export_fs(c, NULL, NULL, NULL, NULL, NULL, 0,0,NULL, NULL, NULL,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
rc = lsm_nfs_export_fs(c, NULL, NULL, badf, NULL, NULL, 0,0,NULL, NULL, NULL,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
rc = lsm_nfs_export_fs(c, NULL, NULL, f, badf, NULL, 0,0,NULL, NULL, NULL,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
rc = lsm_nfs_export_fs(c, NULL, NULL, f, f, badf, 0,0,NULL, NULL, NULL,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
rc = lsm_nfs_export_fs(c, NULL, NULL, f, f, f, 0,0, NULL, NULL, NULL,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_nfs_export_delete(c, NULL, LSM_FLAG_RSVD);
+ rc = lsm_nfs_export_delete(c, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
@@ -1819,11 +1819,11 @@ START_TEST(test_capabilities)
uint32_t sys_count = 0;
lsm_storage_capabilities *cap = NULL;
- G(rc, lsm_system_list, c, &sys, &sys_count, LSM_FLAG_RSVD);
+ G(rc, lsm_system_list, c, &sys, &sys_count, LSM_CLIENT_FLAG_RSVD);
fail_unless( sys_count >= 1, "count = %d", sys_count);
if( sys_count > 0 ) {
- G(rc, lsm_capabilities, c, sys[0], &cap, LSM_FLAG_RSVD);
+ G(rc, lsm_capabilities, c, sys[0], &cap, LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_OK == rc ) {
cap_test(cap, LSM_CAP_VOLUMES);
@@ -1890,7 +1890,8 @@ START_TEST(test_iscsi_auth_in)
printf("get_system() OK\n");
G(rc, lsm_access_group_create, c, "ISCSI_AUTH", ISCSI_HOST[0],
- LSM_ACCESS_GROUP_INIT_TYPE_ISCSI_IQN, system, &group, LSM_FLAG_RSVD);
+ LSM_ACCESS_GROUP_INIT_TYPE_ISCSI_IQN, system, &group,
+ LSM_CLIENT_FLAG_RSVD);
printf("lsm_access_group_create() OK\n");
fail_unless(LSM_ERR_OK == rc, "rc = %d", rc);
@@ -1903,11 +1904,11 @@ START_TEST(test_iscsi_auth_in)
rc = lsm_iscsi_chap_auth(
c, ISCSI_HOST[0], "username", "secret", NULL, NULL,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_OK == rc, "rc = %d", rc);
- rc = lsm_access_group_delete(c, group, LSM_FLAG_RSVD);
+ rc = lsm_access_group_delete(c, group, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_OK == rc );
@@ -1923,7 +1924,7 @@ START_TEST(test_plugin_info)
char *version = NULL;
int rc = 0;
- G(rc, lsm_plugin_info_get, c, &desc, &version, LSM_FLAG_RSVD);
+ G(rc, lsm_plugin_info_get, c, &desc, &version, LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_OK == rc ) {
printf("Desc: (%s), Version: (%s)\n", desc, version);
@@ -1931,13 +1932,13 @@ START_TEST(test_plugin_info)
free(version);
}
- rc = lsm_plugin_info_get(NULL, &desc, &version, LSM_FLAG_RSVD);
+ rc = lsm_plugin_info_get(NULL, &desc, &version, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc = %d", rc);
- rc = lsm_plugin_info_get(c, NULL, &version, LSM_FLAG_RSVD);
+ rc = lsm_plugin_info_get(c, NULL, &version, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc = %d", rc);
- rc = lsm_plugin_info_get(c, &desc, NULL, LSM_FLAG_RSVD);
+ rc = lsm_plugin_info_get(c, &desc, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc = %d", rc);
}
END_TEST
@@ -1972,9 +1973,7 @@ START_TEST(test_error_reporting)
void *debug_data = NULL;
uint32_t debug_size = 0;
- lsm_error_ptr e = lsm_error_create( LSM_ERR_LIB_BUG,
- LSM_ERR_DOMAIN_PLUG_IN,
- LSM_ERR_LEVEL_ERROR, msg,
+ lsm_error_ptr e = lsm_error_create(LSM_ERR_LIB_BUG, msg,
exception, debug_msg,
d, sizeof(d));
@@ -1982,8 +1981,6 @@ START_TEST(test_error_reporting)
if( e ) {
fail_unless(LSM_ERR_LIB_BUG == lsm_error_number_get(e));
- fail_unless(LSM_ERR_DOMAIN_PLUG_IN == lsm_error_domain_get(e));
- fail_unless(LSM_ERR_LEVEL_ERROR == lsm_error_level_get(e));
fail_unless(strcmp(msg, lsm_error_message_get(e)) == 0);
fail_unless(strcmp(exception, lsm_error_exception_get(e)) == 0);
fail_unless(strcmp(debug_msg, lsm_error_debug_get(e)) == 0);
@@ -2313,14 +2310,14 @@ START_TEST(test_search_pools)
lsm_pool **pools = NULL;
uint32_t poolCount = 0;
- G(rc, lsm_pool_list, c, NULL, NULL, &pools, &poolCount, LSM_FLAG_RSVD);
+ G(rc, lsm_pool_list, c, NULL, NULL, &pools, &poolCount, LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_OK == rc && poolCount ) {
lsm_pool **search_pools = NULL;
uint32_t search_count = 0;
G(rc, lsm_pool_list, c, "id", lsm_pool_id_get(pools[0]), &search_pools,
- &search_count, LSM_FLAG_RSVD);
+ &search_count, LSM_CLIENT_FLAG_RSVD);
fail_unless(search_count == 1, "Expecting 1 pool, got %d", search_count);
@@ -2331,13 +2328,13 @@ START_TEST(test_search_pools)
search_count = 0;
G(rc, lsm_pool_list, c, "id", "non-existent-id", &search_pools,
- &search_count, LSM_FLAG_RSVD);
+ &search_count, LSM_CLIENT_FLAG_RSVD);
fail_unless(search_count == 0, "Expecting no pools! %d", search_count);
/* Search which results in all pools */
G(rc, lsm_pool_list, c, "system_id", lsm_pool_system_id_get(pools[0]),
&search_pools,
- &search_count, LSM_FLAG_RSVD);
+ &search_count, LSM_CLIENT_FLAG_RSVD);
fail_unless(search_count == poolCount, "Expecting %d pools, got %d",
poolCount, search_count);
@@ -2367,7 +2364,7 @@ START_TEST(test_search_volumes)
create_volumes(c, pool, 10);
G(rc, lsm_volume_list, c, NULL, NULL, &volumes, &volume_count,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
fail_unless(volume_count > 0, "We are expecting some volumes!");
@@ -2377,7 +2374,7 @@ START_TEST(test_search_volumes)
G(rc, lsm_volume_list, c, "id", lsm_volume_id_get(volumes[0]),
&search_volume,
- &search_count, LSM_FLAG_RSVD);
+ &search_count, LSM_CLIENT_FLAG_RSVD);
fail_unless(search_count == 1, "Expecting 1 pool, got %d", search_count);
@@ -2387,14 +2384,14 @@ START_TEST(test_search_volumes)
/* Search for non-existent */
G(rc, lsm_volume_list, c, "id", "non-existent-id", &search_volume,
- &search_count, LSM_FLAG_RSVD);
+ &search_count, LSM_CLIENT_FLAG_RSVD);
fail_unless(search_count == 0, "Expecting no volumes! %d", search_count);
/* Search which results in all volumes */
G(rc, lsm_volume_list, c, "system_id",
lsm_volume_system_id_get(volumes[0]),
&search_volume,
- &search_count, LSM_FLAG_RSVD);
+ &search_count, LSM_CLIENT_FLAG_RSVD);
fail_unless(search_count == volume_count, "Expecting %d volumes, got %d",
volume_count, search_count);
@@ -2422,7 +2419,7 @@ START_TEST(test_search_disks)
lsm_pool *pool = get_test_pool(c);
- G(rc, lsm_disk_list, c, NULL, NULL, &disks, &disk_count, LSM_FLAG_RSVD);
+ G(rc, lsm_disk_list, c, NULL, NULL, &disks, &disk_count, LSM_CLIENT_FLAG_RSVD);
fail_unless(disk_count > 0, "We are expecting some disks!");
if( LSM_ERR_OK == rc && disk_count ) {
@@ -2432,7 +2429,7 @@ START_TEST(test_search_disks)
G(rc, lsm_disk_list, c, "id", lsm_disk_id_get(disks[0]),
&search_disks,
- &search_count, LSM_FLAG_RSVD);
+ &search_count, LSM_CLIENT_FLAG_RSVD);
fail_unless(search_count == 1, "Expecting 1 disk, got %d", search_count);
G(rc, lsm_disk_record_array_free, search_disks, search_count);
@@ -2441,14 +2438,14 @@ START_TEST(test_search_disks)
/* Search for non-existent */
G(rc, lsm_disk_list, c, "id", "non-existent-id", &search_disks,
- &search_count, LSM_FLAG_RSVD);
+ &search_count, LSM_CLIENT_FLAG_RSVD);
fail_unless(search_count == 0, "Expecting no disks! %d", search_count);
/* Search which results in all disks */
G(rc, lsm_disk_list, c, "system_id", lsm_disk_system_id_get(disks[0]),
&search_disks,
- &search_count, LSM_FLAG_RSVD);
+ &search_count, LSM_CLIENT_FLAG_RSVD);
fail_unless(search_count == disk_count, "Expecting %d disks, got %d",
disk_count, search_count);
@@ -2484,7 +2481,7 @@ START_TEST(test_search_access_groups)
G(rc, lsm_access_group_create, c, ag_name, ISCSI_HOST[i],
LSM_ACCESS_GROUP_INIT_TYPE_ISCSI_IQN,
- system, &group, LSM_FLAG_RSVD);
+ system, &group, LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_OK == rc ) {
G(rc, lsm_access_group_record_free, group);
@@ -2495,7 +2492,7 @@ START_TEST(test_search_access_groups)
G(rc, lsm_system_record_free, system);
system = NULL;
- G(rc, lsm_access_group_list, c, NULL, NULL, &ag, &count, LSM_FLAG_RSVD);
+ G(rc, lsm_access_group_list, c, NULL, NULL, &ag, &count, LSM_CLIENT_FLAG_RSVD);
fail_unless(count > 0, "We are expecting some access_groups!");
if( LSM_ERR_OK == rc && count ) {
@@ -2505,7 +2502,7 @@ START_TEST(test_search_access_groups)
G(rc, lsm_access_group_list, c, "id", lsm_access_group_id_get(ag[0]),
&search_ag,
- &search_count, LSM_FLAG_RSVD);
+ &search_count, LSM_CLIENT_FLAG_RSVD);
fail_unless(search_count == 1, "Expecting 1 access group, got %d",
search_count);
@@ -2516,7 +2513,7 @@ START_TEST(test_search_access_groups)
search_count = 0;
G(rc, lsm_access_group_list, c, "id", "non-existent-id", &search_ag,
- &search_count, LSM_FLAG_RSVD);
+ &search_count, LSM_CLIENT_FLAG_RSVD);
fail_unless(search_count == 0, "Expecting no access groups! %d",
search_count);
@@ -2524,7 +2521,7 @@ START_TEST(test_search_access_groups)
G(rc, lsm_access_group_list, c, "system_id",
lsm_access_group_system_id_get(ag[0]),
&search_ag,
- &search_count, LSM_FLAG_RSVD);
+ &search_count, LSM_CLIENT_FLAG_RSVD);
fail_unless(search_count == count, "Expecting %d access groups, got %d",
count, search_count);
@@ -2560,7 +2557,7 @@ START_TEST(test_search_fs)
snprintf(fs_name, sizeof(fs_name), "test_fs_%d", i);
- rc = lsm_fs_create(c, pool, fs_name, 50000000, &fs, &job, LSM_FLAG_RSVD);
+ rc = lsm_fs_create(c, pool, fs_name, 50000000, &fs, &job, LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_JOB_STARTED == rc ) {
fail_unless(NULL == fs);
@@ -2573,7 +2570,7 @@ START_TEST(test_search_fs)
fs = NULL;
}
- G(rc, lsm_fs_list, c, NULL, NULL, &fsl, &count, LSM_FLAG_RSVD);
+ G(rc, lsm_fs_list, c, NULL, NULL, &fsl, &count, LSM_CLIENT_FLAG_RSVD);
fail_unless(count > 0, "We are expecting some file systems!");
if( LSM_ERR_OK == rc && count ) {
@@ -2583,7 +2580,7 @@ START_TEST(test_search_fs)
G(rc, lsm_fs_list, c, "id", lsm_fs_id_get(fsl[0]),
&search_fs,
- &search_count, LSM_FLAG_RSVD);
+ &search_count, LSM_CLIENT_FLAG_RSVD);
fail_unless(search_count == 1, "Expecting 1 fs, got %d",
search_count);
@@ -2594,7 +2591,7 @@ START_TEST(test_search_fs)
/* Search for non-existent */
G(rc, lsm_fs_list, c, "id", "non-existent-id", &search_fs,
- &search_count, LSM_FLAG_RSVD);
+ &search_count, LSM_CLIENT_FLAG_RSVD);
fail_unless(search_count == 0, "Expecting no fs! %d", search_count);
@@ -2602,7 +2599,7 @@ START_TEST(test_search_fs)
G(rc, lsm_fs_list, c, "system_id",
lsm_fs_system_id_get(fsl[0]),
&search_fs,
- &search_count, LSM_FLAG_RSVD);
+ &search_count, LSM_CLIENT_FLAG_RSVD);
fail_unless(search_count == count, "Expecting %d fs, got %d",
count, search_count);
@@ -2634,7 +2631,7 @@ START_TEST(test_target_ports)
int rc = 0;
- G(rc, lsm_target_port_list, c, NULL, NULL, &tp, &count, LSM_FLAG_RSVD);
+ G(rc, lsm_target_port_list, c, NULL, NULL, &tp, &count, LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_OK == rc ) {
for( i = 0; i < count; ++i ) {
@@ -2667,12 +2664,12 @@ START_TEST(test_target_ports)
G(rc, lsm_target_port_list, c, "id", "does_not_exist",
&search, &search_count,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
fail_unless(search_count == 0, "%d", search_count);
G(rc, lsm_target_port_list, c, "system_id", "sim-01",
&search, &search_count,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
fail_unless(search_count == 5, "%d", search_count);
if( search_count ) {
@@ -2695,7 +2692,7 @@ START_TEST(test_initiator_id_verification)
uint32_t count = 0;
lsm_system *system = get_system(c);
- G(rc, lsm_access_group_list, c, NULL, NULL, &groups, &count, LSM_FLAG_RSVD);
+ G(rc, lsm_access_group_list, c, NULL, NULL, &groups, &count, LSM_CLIENT_FLAG_RSVD);
fail_unless(count == 0, "Expect 0 access groups, got %"PRIu32, count);
fail_unless(groups == NULL);
@@ -2704,12 +2701,12 @@ START_TEST(test_initiator_id_verification)
G(rc, lsm_access_group_create, c, "test_ag_iscsi",
"iqn.1994-05.com.domain.sub:whatever-the.users_wants",
LSM_ACCESS_GROUP_INIT_TYPE_ISCSI_IQN, system,
- &group, LSM_FLAG_RSVD);
+ &group, LSM_CLIENT_FLAG_RSVD);
G(rc, lsm_access_group_initiator_add, c, group,
"iqn.2001-04.com.example:storage:diskarrays-sn-a8675309",
LSM_ACCESS_GROUP_INIT_TYPE_ISCSI_IQN, &updated_group,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
G(rc, lsm_access_group_record_free, group);
group = updated_group;
@@ -2718,7 +2715,7 @@ START_TEST(test_initiator_id_verification)
G(rc, lsm_access_group_initiator_add, c, group,
"iqn.2001-04.com.example",
LSM_ACCESS_GROUP_INIT_TYPE_ISCSI_IQN, &updated_group,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
G(rc, lsm_access_group_record_free, group);
group = updated_group;
@@ -2727,7 +2724,7 @@ START_TEST(test_initiator_id_verification)
G(rc, lsm_access_group_initiator_add, c, group,
"iqn.2001-04.com.example:storage.tape1.sys1.xyz",
LSM_ACCESS_GROUP_INIT_TYPE_ISCSI_IQN, &updated_group,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
G(rc, lsm_access_group_record_free, group);
group = updated_group;
@@ -2736,7 +2733,7 @@ START_TEST(test_initiator_id_verification)
G(rc, lsm_access_group_initiator_add, c, group,
"iqn.2001-04.com.example:storage.disk2.sys1.xyz",
LSM_ACCESS_GROUP_INIT_TYPE_ISCSI_IQN, &updated_group,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
G(rc, lsm_access_group_record_free, group);
group = updated_group;
@@ -2745,7 +2742,7 @@ START_TEST(test_initiator_id_verification)
G(rc, lsm_access_group_initiator_add, c, group,
"0x0011223344556677",
LSM_ACCESS_GROUP_INIT_TYPE_WWPN, &updated_group,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
G(rc, lsm_access_group_record_free, group);
group = updated_group;
@@ -2754,7 +2751,7 @@ START_TEST(test_initiator_id_verification)
G(rc, lsm_access_group_initiator_add, c, group,
"00:11:22:33:44:55:66:78",
LSM_ACCESS_GROUP_INIT_TYPE_WWPN, &updated_group,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
G(rc, lsm_access_group_record_free, group);
group = updated_group;
@@ -2763,7 +2760,7 @@ START_TEST(test_initiator_id_verification)
G(rc, lsm_access_group_initiator_add, c, group,
"00-11-22-33-44-55-66-79",
LSM_ACCESS_GROUP_INIT_TYPE_WWPN, &updated_group,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
G(rc, lsm_access_group_record_free, group);
group = updated_group;
@@ -2772,7 +2769,7 @@ START_TEST(test_initiator_id_verification)
G(rc, lsm_access_group_initiator_add, c, group,
"0x00-11-22-33-44-55-66-80",
LSM_ACCESS_GROUP_INIT_TYPE_WWPN, &updated_group,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
G(rc, lsm_access_group_record_free, group);
group = updated_group;
@@ -2781,7 +2778,7 @@ START_TEST(test_initiator_id_verification)
/* Test invalid */
rc = lsm_access_group_initiator_add(c, group, "0x:0011223344556677",
LSM_ACCESS_GROUP_INIT_TYPE_WWPN, &updated_group,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT,
"Expected initiator id with invalid form to fail! %d", rc);
@@ -2789,7 +2786,7 @@ START_TEST(test_initiator_id_verification)
/* Test invalid iqn */
rc = lsm_access_group_initiator_add(c, group, "0011223344556677:",
LSM_ACCESS_GROUP_INIT_TYPE_WWPN, &updated_group,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT,
"Expected initiator id with invalid form to fail! %d", rc);
@@ -2797,7 +2794,7 @@ START_TEST(test_initiator_id_verification)
/* Test invalid iqn */
rc = lsm_access_group_initiator_add(c, group, "001122334455667788",
LSM_ACCESS_GROUP_INIT_TYPE_WWPN, &updated_group,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT,
"Expected initiator id with invalid form to fail! %d", rc);
@@ -2805,7 +2802,7 @@ START_TEST(test_initiator_id_verification)
/* Test invalid iqn */
rc = lsm_access_group_initiator_add(c, group, "0x001122334455",
LSM_ACCESS_GROUP_INIT_TYPE_WWPN, &updated_group,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT,
"Expected initiator id with invalid form to fail! %d", rc);
@@ -2813,13 +2810,13 @@ START_TEST(test_initiator_id_verification)
/* Test invalid iqn */
rc = lsm_access_group_initiator_add(c, group, "0x00+11:22:33:44:55:66:77",
LSM_ACCESS_GROUP_INIT_TYPE_WWPN, &updated_group,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT,
"Expected initiator id with invalid form to fail! %d", rc);
/* Delete group */
- G(rc, lsm_access_group_delete, c, group, LSM_FLAG_RSVD);
+ G(rc, lsm_access_group_delete, c, group, LSM_CLIENT_FLAG_RSVD);
G(rc, lsm_access_group_record_free, group);
group = NULL;
diff --git a/tools/Makefile.am b/tools/Makefile.am
index d7815f5..1d41361 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,3 +1,3 @@
## Process this file with automake to produce Makefile.in
-SUBDIRS = lsmcli udev
+SUBDIRS = lsmcli udev utility
diff --git a/tools/lsmcli/data_display.py b/tools/lsmcli/data_display.py
index cc1732f..8fab818 100644
--- a/tools/lsmcli/data_display.py
+++ b/tools/lsmcli/data_display.py
@@ -219,11 +219,11 @@ def ag_init_type_str_to_lsm(init_type_str):
_TGT_PORT_TYPE_CONV = {
- TargetPort.PORT_TYPE_UNKNOWN: 'Unknown',
- TargetPort.PORT_TYPE_OTHER: 'Other',
- TargetPort.PORT_TYPE_FC: 'FC',
- TargetPort.PORT_TYPE_FCOE: 'FCoE',
- TargetPort.PORT_TYPE_ISCSI: 'iSCSI',
+ TargetPort.TYPE_UNKNOWN: 'Unknown',
+ TargetPort.TYPE_OTHER: 'Other',
+ TargetPort.TYPE_FC: 'FC',
+ TargetPort.TYPE_FCOE: 'FCoE',
+ TargetPort.TYPE_ISCSI: 'iSCSI',
}
diff --git a/tools/utility/Makefile.am b/tools/utility/Makefile.am
new file mode 100644
index 0000000..ccd31b9
--- /dev/null
+++ b/tools/utility/Makefile.am
@@ -0,0 +1 @@
+EXTRA_DIST = check_const.pl
so that the constants match as expected. I also removed a couple
of fields from the C error structure that we weren't really
leveraging: error level and error domain. Some other constants
were removed as well. The check_const.pl script has been
incorporated into the `make check` process and will fail the
build if the script detects any inconsistencies.
Signed-off-by: Tony Asleson <***@redhat.com>
---
c_binding/include/libstoragemgmt/libstoragemgmt.h | 2 +-
.../include/libstoragemgmt/libstoragemgmt_error.h | 36 +-
.../libstoragemgmt/libstoragemgmt_plug_interface.h | 25 +-
.../include/libstoragemgmt/libstoragemgmt_types.h | 51 +-
c_binding/lsm_datatypes.cpp | 37 +-
c_binding/lsm_datatypes.hpp | 4 +-
c_binding/lsm_mgmt.cpp | 5 +-
c_binding/lsm_plugin_ipc.cpp | 6 +-
configure.ac | 6 +
packaging/libstoragemgmt.spec.in | 2 +-
plugin/ontap/ontap.py | 4 +-
plugin/sim/simarray.py | 10 +-
plugin/simc/simc_lsmplugin.c | 28 +-
plugin/smispy/smis.py | 8 +-
python_binding/lsm/__init__.py | 2 +-
python_binding/lsm/_client.py | 6 +
python_binding/lsm/_common.py | 7 -
python_binding/lsm/_data.py | 10 +-
test/runtests.sh | 3 +
test/tester.c | 513 ++++++++++-----------
tools/Makefile.am | 2 +-
tools/lsmcli/data_display.py | 10 +-
tools/utility/Makefile.am | 1 +
23 files changed, 348 insertions(+), 430 deletions(-)
create mode 100644 tools/utility/Makefile.am
diff --git a/c_binding/include/libstoragemgmt/libstoragemgmt.h b/c_binding/include/libstoragemgmt/libstoragemgmt.h
index c0ac404..85b8e4e 100644
--- a/c_binding/include/libstoragemgmt/libstoragemgmt.h
+++ b/c_binding/include/libstoragemgmt/libstoragemgmt.h
@@ -287,7 +287,7 @@ extern "C" {
*/
int LSM_DLL_EXPORT lsm_volume_create(lsm_connect *conn, lsm_pool *pool,
const char *volume_name, uint64_t size,
- lsm_provision_type provisioning,
+ lsm_volume_provision_type provisioning,
lsm_volume **new_volume, char **job,
lsm_flag flags);
diff --git a/c_binding/include/libstoragemgmt/libstoragemgmt_error.h b/c_binding/include/libstoragemgmt/libstoragemgmt_error.h
index 2bd0143..42e5547 100644
--- a/c_binding/include/libstoragemgmt/libstoragemgmt_error.h
+++ b/c_binding/include/libstoragemgmt/libstoragemgmt_error.h
@@ -28,18 +28,7 @@ extern "C" {
/** @file libstoragemgmt_error.h */
-/**< \enum lsm_error_level Severity of the error. */
-typedef enum {
- LSM_ERR_LEVEL_NONE = 0,
- LSM_ERR_LEVEL_WARNING = 1,
- LSM_ERR_LEVEL_ERROR = 2
-} lsm_error_level;
-
-/**< \enum lsm_error_domain Where the error took place */
-typedef enum {
- LSM_ERR_DOMAIN_FRAME_WORK = 0, /**< Frame work */
- LSM_ERR_DOMAIN_PLUG_IN = 1 /**< Plug-in */
-} lsm_error_domain;
+
/**< \enum lsm_error_number Possible enumerated return codes from library */
typedef enum {
@@ -58,8 +47,8 @@ typedef enum {
LSM_ERR_NO_STATE_CHANGE = 125, /**< Operation completed with no change in array state */
- LSM_ERR_CONNREFUSED = 140, /**< Host on network, but not allowing connection */
- LSM_ERR_HOSTDOWN = 141, /**< Host unreachable on network */
+ LSM_ERR_NETWORK_CONNREFUSED = 140, /**< Host on network, but not allowing connection */
+ LSM_ERR_NETWORK_HOSTDOWN = 141, /**< Host unreachable on network */
LSM_ERR_NETWORK_ERROR = 142, /**< Generic network error */
LSM_ERR_NO_MEMORY = 152, /**< Memory allocation failure */
@@ -74,7 +63,6 @@ typedef enum {
LSM_ERR_NOT_FOUND_FS_SS = 204, /**< Specified snap shot not found */
LSM_ERR_NOT_FOUND_VOLUME = 205, /**< Specified volume not found */
LSM_ERR_NOT_FOUND_NFS_EXPORT = 206, /**< NFS export not found */
- LSM_ERR_NOT_FOUND_INITIATOR = 207, /**< Initiator not found */
LSM_ERR_NOT_FOUND_SYSTEM = 208, /**< System not found */
LSM_ERR_NOT_LICENSED = 226, /**< Need license for feature */
@@ -100,12 +88,12 @@ typedef enum {
LSM_ERR_TRANSPORT_INVALID_ARG = 402, /**< Parameter transported over IPC is invalid */
LSM_ERR_VOLUME_BUSY = 501, /* Volume already in use */
- ACCESS_GROUP_MASKED = 502,
+ LSM_ERR_ACCESS_GROUP_MASKED = 502,
LSM_ERR_UNSUPPORTED_SEARCH_KEY = 510, /**< Unsupport search key */
- EMPTY_ACCESS_GROUP = 511
+ LSM_ERR_EMPTY_ACCESS_GROUP = 511
} lsm_error_number;
@@ -135,20 +123,6 @@ int LSM_DLL_EXPORT lsm_error_free(lsm_error_ptr err);
lsm_error_number LSM_DLL_EXPORT lsm_error_number_get(lsm_error_ptr e);
/**
- * Retrieves the domain from the error.
- * @param e The lsm_error_ptr
- * @return -1 if e is not a valid error pointer, else error domain value.
- */
-lsm_error_domain LSM_DLL_EXPORT lsm_error_domain_get(lsm_error_ptr e);
-
-/**
- * Retrieves the error level from the error.
- * @param e The lsm_error_ptr
- * @return -1 if e is not a valid error pointer, else error level.
- */
-lsm_error_level LSM_DLL_EXPORT lsm_error_level_get(lsm_error_ptr e);
-
-/**
* Retrieves the error message from the error.
* Note: The returned value is only valid as long as the e is valid, in addition
* the function will return NULL if e is invalid. To remove the ambiguity call
diff --git a/c_binding/include/libstoragemgmt/libstoragemgmt_plug_interface.h b/c_binding/include/libstoragemgmt/libstoragemgmt_plug_interface.h
index ba5fa81..518f5c0 100644
--- a/c_binding/include/libstoragemgmt/libstoragemgmt_plug_interface.h
+++ b/c_binding/include/libstoragemgmt/libstoragemgmt_plug_interface.h
@@ -243,7 +243,7 @@ typedef int (*lsm_plug_target_port_list)( lsm_plugin_ptr c,
*/
typedef int (*lsm_plug_volume_create)(lsm_plugin_ptr c, lsm_pool *pool,
const char *volume_name, uint64_t size,
- lsm_provision_type provisioning, lsm_volume **new_volume,
+ lsm_volume_provision_type provisioning, lsm_volume **new_volume,
char **job, lsm_flag flags);
/**
@@ -319,19 +319,6 @@ typedef int (*lsm_plug_volume_resize)(lsm_plugin_ptr c, lsm_volume *volume,
*/
typedef int (*lsm_plug_volume_delete)(lsm_plugin_ptr c, lsm_volume *volume,
char **job, lsm_flag flags);
-
-/**
- * Check on the status of a volume
- * @param[in] c Valid lsm plug-in pointer
- * @param[in] v Volume to retrieve status for
- * @param[out] status Status of volume
- * @param[in] flags Reserved
- * @return LSM_ERR_OK, else error reason
- */
-typedef int (*lsm_plug_volume_status)(lsm_plugin_ptr c, lsm_volume *v,
- lsm_volume_status_type *status,
- lsm_flag flags);
-
/**
* Place a volume online, callback function signature.
* @param[in] c Valid lsm plug-in pointer
@@ -886,9 +873,7 @@ int LSM_DLL_EXPORT lsm_plugin_error_log( lsm_plugin_ptr plug, lsm_error_ptr erro
* @param debug_data_size
* @return Null on error, else valid error error record.
*/
-lsm_error_ptr LSM_DLL_EXPORT lsm_error_create( lsm_error_number code,
- lsm_error_domain domain,
- lsm_error_level level, const char* msg,
+lsm_error_ptr LSM_DLL_EXPORT lsm_error_create(lsm_error_number code, const char* msg,
const char *exception, const char *debug,
const void *debug_data, uint32_t debug_data_size);
@@ -897,13 +882,13 @@ lsm_error_ptr LSM_DLL_EXPORT lsm_error_create( lsm_error_number code,
* Plug-in macros for creating errors
*/
#define LSM_ERROR_CREATE_PLUGIN_MSG( code, msg ) \
- lsm_error_create(code, LSM_ERR_DOMAIN_PLUG_IN, LSM_ERR_LEVEL_ERROR, msg, NULL, NULL, NULL, 0)
+ lsm_error_create(code, msg, NULL, NULL, NULL, 0)
#define LSM_ERROR_CREATE_PLUGIN_EXCEPTION( code, msg, exception) \
- lsm_error_create((code), LSM_ERR_DOMAIN_PLUG_IN, LSM_ERR_LEVEL_ERROR, (msg), (exception), NULL, NULL, 0)
+ lsm_error_create((code), (msg), (exception), NULL, NULL, 0)
#define LSM_ERROR_CREATE_PLUGIN_DEBUG( code, msg, exception, debug, debug_data, debug_len) \
- lsm_error_create((code), LSM_ERR_DOMAIN_PLUG_IN, LSM_ERR_LEVEL_ERROR, (msg), (exception), (debug), (debug_data), debug_len))
+ lsm_error_create((code), (msg), (exception), (debug), (debug_data), debug_len))
/**
* Helper function to create an array of lsm_pool *
diff --git a/c_binding/include/libstoragemgmt/libstoragemgmt_types.h b/c_binding/include/libstoragemgmt/libstoragemgmt_types.h
index 053dec3..ec81bb9 100644
--- a/c_binding/include/libstoragemgmt/libstoragemgmt_types.h
+++ b/c_binding/include/libstoragemgmt/libstoragemgmt_types.h
@@ -36,7 +36,7 @@ extern "C" {
/* Just incase we want to change the flag to a different type */
typedef uint64_t lsm_flag;
-#define LSM_FLAG_RSVD 0
+#define LSM_CLIENT_FLAG_RSVD 0
/**
* Opaque data type for a connection.
@@ -126,30 +126,17 @@ typedef enum {
/**< \enum lsm_provision_type Different types of provisioning */
typedef enum {
- LSM_PROVISION_UNKNOWN = -1, /**< Unknown */
- LSM_PROVISION_THIN = 1, /**< Thin provisioning */
- LSM_PROVISION_FULL = 2, /**< Thick provisioning */
- LSM_PROVISION_DEFAULT = 3 /**< Default provisioning */
-} lsm_provision_type;
-
-/**< \enum lsm_access_type Different types of Volume access */
-typedef enum {
- LSM_VOLUME_ACCESS_READ_ONLY = 1, /**< Read only access */
- LSM_VOLUME_ACCESS_READ_WRITE = 2, /**< Read write access */
- LSM_VOLUME_ACCESS_NONE = 3 /**< No access */
-} lsm_access_type;
-
-/**< \enum lsm_volume_status_type Different states that a volume can be in */
-typedef enum {
- LSM_VOLUME_STATUS_ONLINE = 1, /**< Volume is ready to be used */
- LSM_VOLUME_STATUS_OFFLINE = 2 /**< Volume is offline, no access */
-} lsm_volume_status_type;
+ LSM_VOLUME_PROVISION_UNKNOWN = -1, /**< Unknown */
+ LSM_VOLUME_PROVISION_THIN = 1, /**< Thin provisioning */
+ LSM_VOLUME_PROVISION_FULL = 2, /**< Thick provisioning */
+ LSM_VOLUME_PROVISION_DEFAULT = 3 /**< Default provisioning */
+} lsm_volume_provision_type;
/**
* Admin state for volume, enabled or disabled
*/
-#define LSM_VOLUME_ADMIN_STATE_ENABLED 0x1 /**< Volume accessible */
-#define LSM_VOLUME_ADMIN_STATE_DISABLE 0x0 /**< Volume unaccessible */
+#define LSM_VOLUME_ADMIN_STATE_ENABLED 0x1 /**< Volume accessible */
+#define LSM_VOLUME_ADMIN_STATE_DISABLED 0x0 /**< Volume unaccessible */
/**
* Different states a system status can be in.
@@ -171,14 +158,6 @@ typedef enum {
LSM_ACCESS_GROUP_INIT_TYPE_ISCSI_WWPN_MIXED = 7 /**< More than 1 type */
} lsm_access_group_init_type;
-
-/**< \enum lsm_job_type Different types of jobs */
-typedef enum {
- LSM_JOB_VOL_CREATE = 1, /**< Volume create */
- LSM_JOB_VOL_RESIZE = 2, /**< Volume re-size */
- LSM_JOB_VOL_REPLICATE = 3 /**< Volume replicate */
-} lsm_job_type;
-
/**< \enum lsm_job_status Job states */
typedef enum {
LSM_JOB_INPROGRESS = 1, /**< Job is in progress */
@@ -190,7 +169,7 @@ typedef enum {
typedef enum {
LSM_DISK_TYPE_UNKNOWN = 0,
LSM_DISK_TYPE_OTHER = 1,
- LSM_DISL_TYPE_NOT_APPLICABLE = 2,
+ LSM_DISK_TYPE_NOT_APPLICABLE = 2,
LSM_DISK_TYPE_ATA = 3,
LSM_DISK_TYPE_SATA = 4,
LSM_DISK_TYPE_SAS = 5,
@@ -210,7 +189,7 @@ typedef enum {
#define LSM_DISK_STATUS_OTHER 0x0000000000000004
#define LSM_DISK_STATUS_PREDICTIVE_FAILURE 0x0000000000000008
#define LSM_DISK_STATUS_ERROR 0x0000000000000010
-#define LSM_DISK_STATUS_STATUS_REMOVED 0x0000000000000020
+#define LSM_DISK_STATUS_REMOVED 0x0000000000000020
#define LSM_DISK_STATUS_STARTING 0x0000000000000040
#define LSM_DISK_STATUS_STOPPING 0x0000000000000080
#define LSM_DISK_STATUS_STOPPED 0x0000000000000100
@@ -245,11 +224,11 @@ typedef enum {
#define LSM_POOL_ELEMENT_TYPE_SYS_RESERVED 0x0000000000000400
typedef enum {
- LSM_PORT_TYPE_UNKNOWN = 0,
- LSM_PORT_TYPE_OTHER = 1,
- LSM_PORT_TYPE_FC = 2,
- LSM_PORT_TYPE_FCOE = 3,
- LSM_PORT_TYPE_ISCSI = 4
+ LSM_TARGET_PORT_TYPE_UNKNOWN = 0,
+ LSM_TARGET_PORT_TYPE_OTHER = 1,
+ LSM_TARGET_PORT_TYPE_FC = 2,
+ LSM_TARGET_PORT_TYPE_FCOE = 3,
+ LSM_TARGET_PORT_TYPE_ISCSI = 4
} lsm_target_port_type;
#ifdef __cplusplus
diff --git a/c_binding/lsm_datatypes.cpp b/c_binding/lsm_datatypes.cpp
index 01247c6..a0248b2 100644
--- a/c_binding/lsm_datatypes.cpp
+++ b/c_binding/lsm_datatypes.cpp
@@ -259,21 +259,15 @@ static int connection_establish( lsm_connect *c, const char * password,
c->tp->rpc("plugin_register", p);
} catch (const ValueException &ve) {
- *e = lsm_error_create(LSM_ERR_TRANSPORT_SERIALIZATION,
- LSM_ERR_DOMAIN_FRAME_WORK,
- LSM_ERR_LEVEL_ERROR, "Error in serialization",
+ *e = lsm_error_create(LSM_ERR_TRANSPORT_SERIALIZATION, "Error in serialization",
ve.what(), NULL, NULL, 0 );
rc = LSM_ERR_TRANSPORT_SERIALIZATION;
} catch (const LsmException &le) {
- *e = lsm_error_create(LSM_ERR_TRANSPORT_COMMUNICATION,
- LSM_ERR_DOMAIN_FRAME_WORK,
- LSM_ERR_LEVEL_ERROR, "Error in communication",
+ *e = lsm_error_create(LSM_ERR_TRANSPORT_COMMUNICATION, "Error in communication",
le.what(), NULL, NULL, 0 );
rc = LSM_ERR_TRANSPORT_COMMUNICATION;
} catch (...) {
- *e = lsm_error_create(LSM_ERR_LIB_BUG,
- LSM_ERR_DOMAIN_FRAME_WORK,
- LSM_ERR_LEVEL_ERROR, "Undefined exception",
+ *e = lsm_error_create(LSM_ERR_LIB_BUG, "Undefined exception",
NULL, NULL, NULL, 0 );
rc = LSM_ERR_LIB_BUG;
}
@@ -317,17 +311,13 @@ int driver_load(lsm_connect *c, const char *plugin_name, const char *password,
}
}
} else {
- *e = lsm_error_create(LSM_ERR_PLUGIN_IPC_FAIL,
- LSM_ERR_DOMAIN_FRAME_WORK,
- LSM_ERR_LEVEL_ERROR, "Unable to connect to plugin",
+ *e = lsm_error_create(LSM_ERR_PLUGIN_IPC_FAIL, "Unable to connect to plugin",
NULL, dlerror(), NULL, 0 );
rc = LSM_ERR_PLUGIN_IPC_FAIL;
}
} else {
- *e = lsm_error_create(LSM_ERR_PLUGIN_SOCKET_PERMISSION,
- LSM_ERR_DOMAIN_FRAME_WORK,
- LSM_ERR_LEVEL_ERROR, "Unable to access plugin",
+ *e = lsm_error_create(LSM_ERR_PLUGIN_SOCKET_PERMISSION, "Unable to access plugin",
NULL, NULL, NULL, 0 );
rc = LSM_ERR_PLUGIN_SOCKET_PERMISSION;
@@ -338,8 +328,7 @@ int driver_load(lsm_connect *c, const char *plugin_name, const char *password,
return rc;
}
-lsm_error_ptr lsm_error_create(lsm_error_number code, lsm_error_domain domain,
- lsm_error_level level, const char* msg,
+lsm_error_ptr lsm_error_create(lsm_error_number code, const char* msg,
const char *exception, const char *debug,
const void *debug_data, uint32_t debug_data_size)
{
@@ -348,8 +337,6 @@ lsm_error_ptr lsm_error_create(lsm_error_number code, lsm_error_domain domain,
if (err) {
err->magic = LSM_ERROR_MAGIC;
err->code = code;
- err->domain = domain;
- err->level = level;
/* Any of these strdup calls could fail, but we will continue*/
if (msg) {
@@ -424,16 +411,6 @@ lsm_error_number lsm_error_number_get(lsm_error_ptr e)
LSM_RETURN_ERR_VAL(lsm_error_number, e, code, -1);
}
-lsm_error_domain lsm_error_domain_get(lsm_error_ptr e)
-{
- LSM_RETURN_ERR_VAL(lsm_error_domain, e, domain, -1);
-}
-
-lsm_error_level lsm_error_level_get(lsm_error_ptr e)
-{
- LSM_RETURN_ERR_VAL(lsm_error_level, e, level, -1);
-}
-
char* lsm_error_message_get( lsm_error_ptr e)
{
LSM_RETURN_ERR_VAL(char*, e, message, NULL);
@@ -1907,7 +1884,7 @@ lsm_target_port LSM_DLL_EXPORT *lsm_target_port_copy(lsm_target_port *tp)
}
MEMBER_FUNC_GET(const char *, lsm_target_port_id_get, lsm_target_port *tp, tp, LSM_IS_TARGET_PORT, id, NULL)
-MEMBER_FUNC_GET(lsm_target_port_type, lsm_target_port_type_get, lsm_target_port *tp, tp, LSM_IS_TARGET_PORT, port_type, LSM_PORT_TYPE_UNKNOWN)
+MEMBER_FUNC_GET(lsm_target_port_type, lsm_target_port_type_get, lsm_target_port *tp, tp, LSM_IS_TARGET_PORT, port_type, LSM_TARGET_PORT_TYPE_UNKNOWN)
MEMBER_FUNC_GET(const char *, lsm_target_port_service_address_get, lsm_target_port *tp, tp, LSM_IS_TARGET_PORT, service_address, NULL)
MEMBER_FUNC_GET(const char *, lsm_target_port_network_address_get, lsm_target_port *tp, tp, LSM_IS_TARGET_PORT, network_address, NULL)
MEMBER_FUNC_GET(const char *, lsm_target_port_physical_address_get, lsm_target_port *tp, tp, LSM_IS_TARGET_PORT, physical_address, NULL)
diff --git a/c_binding/lsm_datatypes.hpp b/c_binding/lsm_datatypes.hpp
index 5fbc9c1..27976db 100644
--- a/c_binding/lsm_datatypes.hpp
+++ b/c_binding/lsm_datatypes.hpp
@@ -217,9 +217,7 @@ struct LSM_DLL_LOCAL _lsm_connect {
*/
struct LSM_DLL_LOCAL _lsm_error {
uint32_t magic; /**< Magic, used for struct validation */
- lsm_error_number code; /**< Error code */
- lsm_error_domain domain; /**< Where the error occured */
- lsm_error_level level; /**< Severity of the error */
+ lsm_error_number code; /**< Error code */
uint32_t reserved; /**< Reserved */
char *message; /**< Human readable error message */
char *exception; /**< Exception message if present */
diff --git a/c_binding/lsm_mgmt.cpp b/c_binding/lsm_mgmt.cpp
index cb841d4..36f616d 100644
--- a/c_binding/lsm_mgmt.cpp
+++ b/c_binding/lsm_mgmt.cpp
@@ -206,8 +206,7 @@ static int lsmErrorLog(lsm_connect *c, lsm_error_ptr error)
static lsm_error_number logException(lsm_connect *c, lsm_error_number error,
const char *message, const char *exception_msg)
{
- lsm_error_ptr err = lsm_error_create(error, LSM_ERR_DOMAIN_FRAME_WORK,
- LSM_ERR_LEVEL_ERROR, message,
+ lsm_error_ptr err = lsm_error_create(error, message,
exception_msg, NULL,
NULL, 0);
if( err ) {
@@ -948,7 +947,7 @@ static void* parse_job_response(lsm_connect *c, Value response, int &rc,
}
int lsm_volume_create(lsm_connect *c, lsm_pool *pool, const char *volumeName,
- uint64_t size, lsm_provision_type provisioning,
+ uint64_t size, lsm_volume_provision_type provisioning,
lsm_volume **newVolume, char **job, lsm_flag flags)
{
CONN_SETUP(c);
diff --git a/c_binding/lsm_plugin_ipc.cpp b/c_binding/lsm_plugin_ipc.cpp
index 8fcca83..0d3496f 100644
--- a/c_binding/lsm_plugin_ipc.cpp
+++ b/c_binding/lsm_plugin_ipc.cpp
@@ -175,7 +175,7 @@ static lsm_plugin_ptr lsm_plugin_alloc(lsm_plugin_register reg,
rc->version = strdup(version);
if (!rc->desc || !rc->version) {
- lsm_plugin_free(rc, LSM_FLAG_RSVD);
+ lsm_plugin_free(rc, LSM_CLIENT_FLAG_RSVD);
rc = NULL;
}
}
@@ -264,7 +264,7 @@ int lsm_plugin_init_v1( int argc, char *argv[], lsm_plugin_register reg,
if (plug->tp) {
rc = lsm_plugin_run(plug);
} else {
- lsm_plugin_free(plug, LSM_FLAG_RSVD);
+ lsm_plugin_free(plug, LSM_CLIENT_FLAG_RSVD);
rc = LSM_ERR_NO_MEMORY;
}
} else {
@@ -682,7 +682,7 @@ static int handle_volume_create(lsm_plugin_ptr p, Value ¶ms, Value &response
char *job = NULL;
const char *name = v_name.asC_str();
uint64_t size = v_size.asUint64_t();
- lsm_provision_type pro = (lsm_provision_type)v_prov.asInt32_t();
+ lsm_volume_provision_type pro = (lsm_volume_provision_type)v_prov.asInt32_t();
rc = p->san_ops->vol_create(p, pool, name, size, pro, &vol, &job,
LSM_FLAG_GET_VALUE(params));
diff --git a/configure.ac b/configure.ac
index 0928c1b..92c164e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -135,6 +135,11 @@ fi
AM_CONDITIONAL([BUILD_C_UNIT], [test "x${want_c_unit}" = "xyes"])
+dnl =========================================================================
+dnl Check for perl, used for code constants checking
+dnl =========================================================================
+AC_PATH_PROGS(PERL, perl)
+
dnl ==========================================================================
dnl Check for python2 as it is needed for the base cmd line function
dnl ==========================================================================
@@ -203,6 +208,7 @@ AC_OUTPUT(libstoragemgmt.pc \
tools/Makefile \
tools/udev/Makefile \
tools/lsmcli/Makefile \
+ tools/utility/Makefile \
packaging/Makefile \
packaging/daemon/Makefile \
packaging/libstoragemgmt.spec \
diff --git a/packaging/libstoragemgmt.spec.in b/packaging/libstoragemgmt.spec.in
index 479a04d..22d1c20 100644
--- a/packaging/libstoragemgmt.spec.in
+++ b/packaging/libstoragemgmt.spec.in
@@ -15,7 +15,7 @@ URL: http://sourceforge.net/projects/libstoragemgmt/
Source0: http://sourceforge.net/projects/libstoragemgmt/files/libstoragemgmt-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: %{name}-python
-BuildRequires: autoconf automake libtool yajl-devel libxml2-devel check-devel
+BuildRequires: autoconf automake libtool yajl-devel libxml2-devel check-devel perl
BuildRequires: openssl-devel
BuildRequires: python-argparse
BuildRequires: glib2-devel
diff --git a/plugin/ontap/ontap.py b/plugin/ontap/ontap.py
index 7a2c397..5dcbcc7 100644
--- a/plugin/ontap/ontap.py
+++ b/plugin/ontap/ontap.py
@@ -1105,7 +1105,7 @@ class Ontap(IStorageAreaNetwork, INfs):
for f in fcp:
a = f['addr']
adapter = f['adapter']
- tp.append(TargetPort(md5(a), TargetPort.PORT_TYPE_FC, a, a, a,
+ tp.append(TargetPort(md5(a), TargetPort.TYPE_FC, a, a, a,
adapter, self.sys_info.id))
node_name = self.f.iscsi_node_name()
@@ -1118,7 +1118,7 @@ class Ontap(IStorageAreaNetwork, INfs):
physical_name = i['interface']
tid = md5(service_address + network_address + physical_address +
physical_name)
- tp.append(TargetPort(tid, TargetPort.PORT_TYPE_ISCSI,
+ tp.append(TargetPort(tid, TargetPort.TYPE_ISCSI,
service_address,
network_address,
physical_address,
diff --git a/plugin/sim/simarray.py b/plugin/sim/simarray.py
index f60905d..f391681 100644
--- a/plugin/sim/simarray.py
+++ b/plugin/sim/simarray.py
@@ -706,7 +706,7 @@ class SimData(object):
self.tgt_dict = {
'TGT_PORT_ID_01': {
'tgt_id': 'TGT_PORT_ID_01',
- 'port_type': TargetPort.PORT_TYPE_FC,
+ 'port_type': TargetPort.TYPE_FC,
'service_address': '50:0a:09:86:99:4b:8d:c5',
'network_address': '50:0a:09:86:99:4b:8d:c5',
'physical_address': '50:0a:09:86:99:4b:8d:c5',
@@ -715,7 +715,7 @@ class SimData(object):
},
'TGT_PORT_ID_02': {
'tgt_id': 'TGT_PORT_ID_02',
- 'port_type': TargetPort.PORT_TYPE_FCOE,
+ 'port_type': TargetPort.TYPE_FCOE,
'service_address': '50:0a:09:86:99:4b:8d:c6',
'network_address': '50:0a:09:86:99:4b:8d:c6',
'physical_address': '50:0a:09:86:99:4b:8d:c6',
@@ -724,7 +724,7 @@ class SimData(object):
},
'TGT_PORT_ID_03': {
'tgt_id': 'TGT_PORT_ID_03',
- 'port_type': TargetPort.PORT_TYPE_ISCSI,
+ 'port_type': TargetPort.TYPE_ISCSI,
'service_address': 'iqn.1986-05.com.example:sim-tgt-03',
'network_address': 'sim-iscsi-tgt-3.example.com:3260',
'physical_address': 'a4:4e:31:47:f4:e0',
@@ -733,7 +733,7 @@ class SimData(object):
},
'TGT_PORT_ID_04': {
'tgt_id': 'TGT_PORT_ID_04',
- 'port_type': TargetPort.PORT_TYPE_ISCSI,
+ 'port_type': TargetPort.TYPE_ISCSI,
'service_address': 'iqn.1986-05.com.example:sim-tgt-03',
'network_address': '10.0.0.1:3260',
'physical_address': 'a4:4e:31:47:f4:e1',
@@ -742,7 +742,7 @@ class SimData(object):
},
'TGT_PORT_ID_05': {
'tgt_id': 'TGT_PORT_ID_05',
- 'port_type': TargetPort.PORT_TYPE_ISCSI,
+ 'port_type': TargetPort.TYPE_ISCSI,
'service_address': 'iqn.1986-05.com.example:sim-tgt-03',
'network_address': '[2001:470:1f09:efe:a64e:31ff::1]:3260',
'physical_address': 'a4:4e:31:47:f4:e1',
diff --git a/plugin/simc/simc_lsmplugin.c b/plugin/simc/simc_lsmplugin.c
index b263adb..7c55337 100644
--- a/plugin/simc/simc_lsmplugin.c
+++ b/plugin/simc/simc_lsmplugin.c
@@ -344,7 +344,7 @@ static int cap(lsm_plugin_ptr c, lsm_system *system,
*cap = lsm_capability_record_alloc(NULL);
if( *cap ) {
- rc = lsm_capability_set_n(*cap, LSM_CAPABILITY_SUPPORTED,
+ rc = lsm_capability_set_n(*cap, LSM_CAP_SUPPORTED,
LSM_CAP_VOLUMES,
LSM_CAP_VOLUME_CREATE,
LSM_CAP_VOLUME_RESIZE,
@@ -618,29 +618,29 @@ static int list_targets(lsm_plugin_ptr c, const char *search_key,
if( *tp ) {
(*tp)[0] = lsm_target_port_record_alloc("TGT_PORT_ID_01",
- LSM_PORT_TYPE_FC, p0, p0, p0,
+ LSM_TARGET_PORT_TYPE_FC, p0, p0, p0,
"FC_a_0b", sys_id, NULL);
(*tp)[1] = lsm_target_port_record_alloc("TGT_PORT_ID_02",
- LSM_PORT_TYPE_FCOE, p1, p1, p1,
+ LSM_TARGET_PORT_TYPE_FCOE, p1, p1, p1,
"FC_a_0c", sys_id, NULL);
(*tp)[2] = lsm_target_port_record_alloc("TGT_PORT_ID_03",
- LSM_PORT_TYPE_ISCSI,
+ LSM_TARGET_PORT_TYPE_ISCSI,
"iqn.1986-05.com.example:sim-tgt-03",
"sim-iscsi-tgt-3.example.com:3260",
"a4:4e:31:47:f4:e0",
"iSCSI_c_0d", sys_id, NULL);
(*tp)[3] = lsm_target_port_record_alloc("TGT_PORT_ID_04",
- LSM_PORT_TYPE_ISCSI,
+ LSM_TARGET_PORT_TYPE_ISCSI,
"iqn.1986-05.com.example:sim-tgt-03",
"10.0.0.1:3260",
"a4:4e:31:47:f4:e1",
"iSCSI_c_0e", sys_id, NULL);
(*tp)[4] = lsm_target_port_record_alloc("TGT_PORT_ID_05",
- LSM_PORT_TYPE_ISCSI,
+ LSM_TARGET_PORT_TYPE_ISCSI,
"iqn.1986-05.com.example:sim-tgt-03",
"[2001:470:1f09:efe:a64e:31ff::1]:3260",
"a4:4e:31:47:f4:e1",
@@ -721,7 +721,7 @@ static struct allocated_volume * find_volume_name(struct plugin_data *pd,
static int volume_create(lsm_plugin_ptr c, lsm_pool *pool,
const char *volume_name, uint64_t size,
- lsm_provision_type provisioning, lsm_volume **new_volume,
+ lsm_volume_provision_type provisioning, lsm_volume **new_volume,
char **job, lsm_flag flags)
{
int rc = LSM_ERR_OK;
@@ -806,7 +806,7 @@ static int volume_replicate(lsm_plugin_ptr c, lsm_pool *pool,
if( find_volume(pd, lsm_volume_id_get(volume_src) )) {
rc = volume_create(c, pool_to_use, name,
lsm_volume_number_of_blocks_get(volume_src)*BS,
- LSM_PROVISION_DEFAULT, new_replicant, job, flags);
+ LSM_VOLUME_PROVISION_DEFAULT, new_replicant, job, flags);
} else {
rc = lsm_log_error_basic(c, LSM_ERR_NOT_FOUND_VOLUME,
"Volume not found!");
@@ -935,7 +935,7 @@ static int volume_delete(lsm_plugin_ptr c, lsm_volume *volume,
// Check to see if this volume is masked to any access groups, if it is we
// will return an IS_MASKED error code.
- int rc = ag_granted_to_volume(c, volume, &groups, &count, LSM_FLAG_RSVD);
+ int rc = ag_granted_to_volume(c, volume, &groups, &count, LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_OK == rc ) {
lsm_access_group_record_array_free(groups, count);
@@ -1084,7 +1084,7 @@ static int access_group_delete( lsm_plugin_ptr c,
struct plugin_data *pd = (struct plugin_data*)lsm_private_data_get(c);
const char *id = lsm_access_group_id_get(group);
- rc = vol_accessible_by_ag(c, group, &volumes, &count, LSM_FLAG_RSVD);
+ rc = vol_accessible_by_ag(c, group, &volumes, &count, LSM_CLIENT_FLAG_RSVD);
if( rc == LSM_ERR_OK && count ) {
lsm_volume_record_array_free(volumes, count);
@@ -1208,10 +1208,10 @@ static int volume_mask(lsm_plugin_ptr c,
free, free);
char *key = strdup(lsm_access_group_id_get(find->ag));
char *vol_id = strdup(lsm_volume_id_get(volume));
- lsm_access_type *val = (lsm_access_type*) malloc(sizeof(lsm_access_type));
+ int *val = (int*) malloc(sizeof(int));
if( grant && key && val && vol_id ) {
- *val = LSM_VOLUME_ACCESS_READ_WRITE;
+ *val = 1;
/* Create the association for volume id and access value */
g_hash_table_insert(grant, vol_id, val);
@@ -1235,8 +1235,8 @@ static int volume_mask(lsm_plugin_ptr c,
char *vol_id = g_hash_table_lookup(grants, lsm_volume_id_get(volume));
if( !vol_id ) {
vol_id = strdup(lsm_volume_id_get(volume));
- lsm_access_type *val =
- (lsm_access_type*) malloc(sizeof(lsm_access_type));
+ int *val = (int*) malloc(sizeof(int));
+ *val = 1;
if( vol_id && val ) {
g_hash_table_insert(grants, vol_id, val);
} else {
diff --git a/plugin/smispy/smis.py b/plugin/smispy/smis.py
index f03a257..5a7f2b2 100644
--- a/plugin/smispy/smis.py
+++ b/plugin/smispy/smis.py
@@ -169,11 +169,11 @@ def _lsm_tgt_port_type_of_cim_fc_tgt(cim_fc_tgt):
if 'PortDiscriminator' in cim_fc_tgt and \
cim_fc_tgt['PortDiscriminator'] and \
DMTF.FC_PORT_PORT_DISCRIMINATOR_FCOE in cim_fc_tgt['PortDiscriminator']:
- return TargetPort.PORT_TYPE_FCOE
+ return TargetPort.TYPE_FCOE
if 'LinkTechnology' in cim_fc_tgt and \
cim_fc_tgt['LinkTechnology'] == DMTF.NET_PORT_LINK_TECH_ETHERNET:
- return TargetPort.PORT_TYPE_FCOE
- return TargetPort.PORT_TYPE_FC
+ return TargetPort.TYPE_FCOE
+ return TargetPort.TYPE_FC
def _lsm_init_type_to_dmtf(init_type):
@@ -3579,7 +3579,7 @@ class Smis(IStorageAreaNetwork):
this method is only for iSCSI over TCP.
"""
rc = []
- port_type = TargetPort.PORT_TYPE_ISCSI
+ port_type = TargetPort.TYPE_ISCSI
plugin_data = None
cim_tcps = self._c.Associators(
cim_iscsi_pg.path,
diff --git a/python_binding/lsm/__init__.py b/python_binding/lsm/__init__.py
index 308ad15..fb1cdbd 100644
--- a/python_binding/lsm/__init__.py
+++ b/python_binding/lsm/__init__.py
@@ -2,7 +2,7 @@ __all__ = []
from version import VERSION
-from _common import error, info, LsmError, ErrorLevel, ErrorNumber, \
+from _common import error, info, LsmError, ErrorNumber, \
JobStatus, uri_parse, md5, Proxy, size_bytes_2_size_human, \
common_urllib2_error_handler, size_human_2_size_bytes
from _data import (Disk, Volume, Pool, System, FileSystem, FsSnapshot,
diff --git a/python_binding/lsm/_client.py b/python_binding/lsm/_client.py
index 6b8e111..6b58608 100644
--- a/python_binding/lsm/_client.py
+++ b/python_binding/lsm/_client.py
@@ -63,6 +63,12 @@ def _raise_no_daemon():
# parameter names. Makes the code compact, but you will break things if the
# IPlugin class does not match the method names and parameters here!
class Client(INetworkAttachedStorage):
+
+ ##
+ # Used for default flag value
+ #
+ FLAG_RSVD = 0
+
"""
Client side class used for managing storage that utilises RPC mechanism.
"""
diff --git a/python_binding/lsm/_common.py b/python_binding/lsm/_common.py
index 9281ec1..5089565 100644
--- a/python_binding/lsm/_common.py
+++ b/python_binding/lsm/_common.py
@@ -411,12 +411,6 @@ def get_class(class_name):
return m
-class ErrorLevel(object):
- NONE = 0
- WARNING = 1
- ERROR = 2
-
-
#Note: Some of these don't make sense for python, but they do for other
#Languages so we will be keeping them consistent even though we won't be
#using them.
@@ -467,7 +461,6 @@ class ErrorNumber(object):
PLUGIN_SOCKET_PERMISSION = 307 # Incorrect permission on UNIX domain
# socket used for IPC
- PLUGIN_REGISTRATION = 308
PLUGIN_NOT_EXIST = 311
NOT_ENOUGH_SPACE = 350
diff --git a/python_binding/lsm/_data.py b/python_binding/lsm/_data.py
index 9f5c723..b7f3290 100644
--- a/python_binding/lsm/_data.py
+++ b/python_binding/lsm/_data.py
@@ -556,11 +556,11 @@ class AccessGroup(IData):
class TargetPort(IData):
SUPPORTED_SEARCH_KEYS = ['id', 'system_id']
- PORT_TYPE_UNKNOWN = 0
- PORT_TYPE_OTHER = 1
- PORT_TYPE_FC = 2
- PORT_TYPE_FCOE = 3
- PORT_TYPE_ISCSI = 4
+ TYPE_UNKNOWN = 0
+ TYPE_OTHER = 1
+ TYPE_FC = 2
+ TYPE_FCOE = 3
+ TYPE_ISCSI = 4
def __init__(self, _id, _port_type, _service_address,
_network_address, _physical_address, _physical_name,
diff --git a/test/runtests.sh b/test/runtests.sh
index 93b584e..a2840e9 100755
--- a/test/runtests.sh
+++ b/test/runtests.sh
@@ -136,6 +136,9 @@ good "find $rootdir/ \( ! -regex '.*/\..*' \) -type f -name \*_lsmplugin -exec c
good "cp $bin_plugin/*_lsmplugin $plugins"
good "ls -lh $plugins"
+#Check to make sure that constants are correct
+good "perl ../tools/utility/check_const.pl"
+
#Start daemon
$LSMD_DAEMON \
--plugindir $plugins \
diff --git a/test/tester.c b/test/tester.c
index 1a27d12..d5ce169 100644
--- a/test/tester.c
+++ b/test/tester.c
@@ -129,7 +129,7 @@ lsm_pool *get_test_pool(lsm_connect *c)
lsm_pool *test_pool = NULL;
int rc = 0;
- G(rc, lsm_pool_list, c, NULL, NULL, &pools, &count, LSM_FLAG_RSVD);
+ G(rc, lsm_pool_list, c, NULL, NULL, &pools, &count, LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_OK == rc ) {
uint32_t i = 0;
@@ -168,7 +168,7 @@ void setup(void)
lsm_error_ptr e = NULL;
int rc = lsm_connect_password(plugin_to_use(), NULL, &c, 30000, &e,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_OK == rc ) {
if( getenv("LSM_DEBUG_PLUGIN") ) {
@@ -185,7 +185,7 @@ void teardown(void)
*/
if( c ) {
- lsm_connect_close(c, LSM_FLAG_RSVD);
+ lsm_connect_close(c, LSM_CLIENT_FLAG_RSVD);
c = NULL;
}
}
@@ -197,14 +197,14 @@ void wait_for_job(lsm_connect *c, char **job_id)
int rc = 0;
do {
- G(rc, lsm_job_status_get, c, *job_id, &status, &pc, LSM_FLAG_RSVD);
+ G(rc, lsm_job_status_get, c, *job_id, &status, &pc, LSM_CLIENT_FLAG_RSVD);
printf("GENERIC: Job %s in progress, %d done, status = %d\n", *job_id,
pc, status);
usleep(POLL_SLEEP);
} while( status == LSM_JOB_INPROGRESS );
- G(rc, lsm_job_free, c, job_id, LSM_FLAG_RSVD);
+ G(rc, lsm_job_free, c, job_id, LSM_CLIENT_FLAG_RSVD);
fail_unless( LSM_JOB_COMPLETE == status);
fail_unless( 100 == pc);
@@ -220,7 +220,7 @@ lsm_volume *wait_for_job_vol(lsm_connect *c, char **job_id)
do {
G(rc, lsm_job_status_volume_get, c, *job_id, &status, &pc, &vol,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
printf("VOLUME: Job %s in progress, %d done, status = %d\n",
*job_id, pc, status);
usleep(POLL_SLEEP);
@@ -230,7 +230,7 @@ lsm_volume *wait_for_job_vol(lsm_connect *c, char **job_id)
printf("Volume complete: Job %s percent %d done, status = %d, rc=%d\n",
*job_id, pc, status, rc);
- G(rc, lsm_job_free, c, job_id, LSM_FLAG_RSVD);
+ G(rc, lsm_job_free, c, job_id, LSM_CLIENT_FLAG_RSVD);
fail_unless( LSM_JOB_COMPLETE == status);
fail_unless( 100 == pc);
@@ -247,14 +247,14 @@ lsm_pool *wait_for_job_pool(lsm_connect *c, char **job_id)
do {
G(rc, lsm_job_status_pool_get, c, *job_id, &status, &pc, &pool,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
printf("POOL: Job %s in progress, %d done, status = %d\n", *job_id, pc,
status);
usleep(POLL_SLEEP);
} while( status == LSM_JOB_INPROGRESS );
- G(rc, lsm_job_free, c, job_id, LSM_FLAG_RSVD);
+ G(rc, lsm_job_free, c, job_id, LSM_CLIENT_FLAG_RSVD);
fail_unless( LSM_JOB_COMPLETE == status);
fail_unless( 100 == pc);
@@ -271,14 +271,14 @@ lsm_fs *wait_for_job_fs(lsm_connect *c, char **job_id)
do {
G(rc, lsm_job_status_fs_get, c, *job_id, &status, &pc, &fs,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
printf("FS: Job %s in progress, %d done, status = %d\n", *job_id, pc,
status);
usleep(POLL_SLEEP);
} while( status == LSM_JOB_INPROGRESS );
- G(rc, lsm_job_free, c, job_id, LSM_FLAG_RSVD);
+ G(rc, lsm_job_free, c, job_id, LSM_CLIENT_FLAG_RSVD);
fail_unless( LSM_JOB_COMPLETE == status);
fail_unless( 100 == pc);
@@ -294,14 +294,14 @@ lsm_fs_ss *wait_for_job_ss(lsm_connect *c, char **job_id)
do {
G(rc, lsm_job_status_ss_get, c, *job_id, &status, &pc, &ss,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
printf("SS: Job %s in progress, %d done, status = %d\n",
*job_id, pc, status);
usleep(POLL_SLEEP);
} while( status == LSM_JOB_INPROGRESS );
- G(rc, lsm_job_free, c, job_id, LSM_FLAG_RSVD);
+ G(rc, lsm_job_free, c, job_id, LSM_CLIENT_FLAG_RSVD);
fail_unless( LSM_JOB_COMPLETE == status);
fail_unless( 100 == pc);
@@ -346,7 +346,7 @@ void create_volumes(lsm_connect *c, lsm_pool *p, int num)
snprintf(name, sizeof(name), "test %d", i);
int vc = lsm_volume_create(c, p, name, 20000000,
- LSM_PROVISION_DEFAULT, &n, &job, LSM_FLAG_RSVD);
+ LSM_VOLUME_PROVISION_DEFAULT, &n, &job, LSM_CLIENT_FLAG_RSVD);
fail_unless( vc == LSM_ERR_OK || vc == LSM_ERR_JOB_STARTED,
"lsmVolumeCreate %d (%s)", vc, error(lsm_error_last_get(c)));
@@ -369,7 +369,7 @@ lsm_system *get_system(lsm_connect *c)
uint32_t count = 0;
int rc = 0;
- G(rc, lsm_system_list, c, &sys, &count, LSM_FLAG_RSVD);
+ G(rc, lsm_system_list, c, &sys, &count, LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_OK == rc && count) {
rc_sys = lsm_system_record_copy(sys[0]);
@@ -390,10 +390,10 @@ START_TEST(test_smoke_test)
uint32_t tmo = 0;
//Set timeout.
- G(rc, lsm_connect_timeout_set, c, set_tmo, LSM_FLAG_RSVD);
+ G(rc, lsm_connect_timeout_set, c, set_tmo, LSM_CLIENT_FLAG_RSVD);
//Get time-out.
- G(rc, lsm_connect_timeout_get, c, &tmo, LSM_FLAG_RSVD);
+ G(rc, lsm_connect_timeout_get, c, &tmo, LSM_CLIENT_FLAG_RSVD);
fail_unless( set_tmo == tmo, " %u != %u", set_tmo, tmo );
@@ -402,7 +402,7 @@ START_TEST(test_smoke_test)
int poolToUse = -1;
//Get pool list
- G(rc, lsm_pool_list, c, NULL, NULL, &pools, &poolCount, LSM_FLAG_RSVD);
+ G(rc, lsm_pool_list, c, NULL, NULL, &pools, &poolCount, LSM_CLIENT_FLAG_RSVD);
//Check pool count
count = poolCount;
@@ -437,7 +437,7 @@ START_TEST(test_smoke_test)
selectedPool = pools[poolToUse];
int vc = lsm_volume_create(c, pools[poolToUse], "test", 20000000,
- LSM_PROVISION_DEFAULT, &n, &job, LSM_FLAG_RSVD);
+ LSM_VOLUME_PROVISION_DEFAULT, &n, &job, LSM_CLIENT_FLAG_RSVD);
fail_unless( vc == LSM_ERR_OK || vc == LSM_ERR_JOB_STARTED,
"lsmVolumeCreate %d (%s)", vc, error(lsm_error_last_get(c)));
@@ -451,10 +451,10 @@ START_TEST(test_smoke_test)
uint8_t dependants = 10;
int child_depends = 0;
G(child_depends, lsm_volume_child_dependency, c, n, &dependants,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
fail_unless(dependants == 0);
- child_depends = lsm_volume_child_dependency_delete(c, n, &job, LSM_FLAG_RSVD);
+ child_depends = lsm_volume_child_dependency_delete(c, n, &job, LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_JOB_STARTED == child_depends ) {
wait_for_job(c, &job);
} else {
@@ -472,7 +472,7 @@ START_TEST(test_smoke_test)
int rep_bs = 0;
G(rep_bs, lsm_volume_replicate_range_block_size, c, system, &bs,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
fail_unless(512 == bs);
lsm_system_record_free(system);
@@ -500,7 +500,7 @@ START_TEST(test_smoke_test)
}
int rep_range = lsm_volume_replicate_range(c, LSM_VOLUME_REPLICATE_CLONE,
- n, n, range, 3, &job, LSM_FLAG_RSVD);
+ n, n, range, 3, &job, LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_JOB_STARTED == rep_range ) {
wait_for_job(c, &job);
@@ -516,12 +516,12 @@ START_TEST(test_smoke_test)
G(rc, lsm_block_range_record_array_free, range, 3);
int online = 0;
- G(online, lsm_volume_disable, c, n, LSM_FLAG_RSVD);
+ G(online, lsm_volume_disable, c, n, LSM_CLIENT_FLAG_RSVD);
- G(online, lsm_volume_enable, c, n, LSM_FLAG_RSVD);
+ G(online, lsm_volume_enable, c, n, LSM_CLIENT_FLAG_RSVD);
char *jobDel = NULL;
- int delRc = lsm_volume_delete(c, n, &jobDel, LSM_FLAG_RSVD);
+ int delRc = lsm_volume_delete(c, n, &jobDel, LSM_CLIENT_FLAG_RSVD);
fail_unless( delRc == LSM_ERR_OK || delRc == LSM_ERR_JOB_STARTED,
"lsm_volume_delete %d (%s)", rc, error(lsm_error_last_get(c)));
@@ -539,7 +539,7 @@ START_TEST(test_smoke_test)
lsm_volume **volumes = NULL;
count = 0;
/* Get a list of volumes */
- G(rc, lsm_volume_list, c, NULL, NULL, &volumes, &count, LSM_FLAG_RSVD);
+ G(rc, lsm_volume_list, c, NULL, NULL, &volumes, &count, LSM_CLIENT_FLAG_RSVD);
for (i = 0; i < count; ++i) {
printf("%s - %s - %s - %"PRIu64" - %"PRIu64" - %x\n",
@@ -562,7 +562,7 @@ START_TEST(test_smoke_test)
int resizeRc = lsm_volume_resize(c, volumes[0],
((lsm_volume_number_of_blocks_get(volumes[0]) *
- lsm_volume_block_size_get(volumes[0])) * 2), &resized, &resizeJob, LSM_FLAG_RSVD);
+ lsm_volume_block_size_get(volumes[0])) * 2), &resized, &resizeJob, LSM_CLIENT_FLAG_RSVD);
fail_unless(resizeRc == LSM_ERR_OK || resizeRc == LSM_ERR_JOB_STARTED,
"lsmVolumeResize %d (%s)", resizeRc,
@@ -578,7 +578,7 @@ START_TEST(test_smoke_test)
int repRc = lsm_volume_replicate(c, NULL, //Pool is optional
LSM_VOLUME_REPLICATE_SNAPSHOT,
volumes[0], "SNAPSHOT1",
- &rep, &job, LSM_FLAG_RSVD);
+ &rep, &job, LSM_CLIENT_FLAG_RSVD);
fail_unless(repRc == LSM_ERR_OK || repRc == LSM_ERR_JOB_STARTED,
"lsmVolumeReplicate %d (%s)", repRc,
@@ -616,14 +616,14 @@ START_TEST(test_access_groups)
system = get_system(c);
- G(rc, lsm_access_group_list, c, NULL, NULL, &groups, &count, LSM_FLAG_RSVD);
+ G(rc, lsm_access_group_list, c, NULL, NULL, &groups, &count, LSM_CLIENT_FLAG_RSVD);
fail_unless(count == 0, "Expect 0 access groups, got %"PRIu32, count);
fail_unless(groups == NULL);
G(rc, lsm_access_group_create, c, "test_access_groups",
"iqn.1994-05.com.domain:01.89bd01",
LSM_ACCESS_GROUP_INIT_TYPE_ISCSI_IQN, system,
- &group, LSM_FLAG_RSVD);
+ &group, LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_OK == rc ) {
lsm_string_list *init_list = lsm_access_group_initiator_id_get(group);
@@ -656,7 +656,7 @@ START_TEST(test_access_groups)
init_copy = NULL;
}
- G(rc, lsm_access_group_list, c, NULL, NULL, &groups, &count, LSM_FLAG_RSVD);
+ G(rc, lsm_access_group_list, c, NULL, NULL, &groups, &count, LSM_CLIENT_FLAG_RSVD);
fail_unless( 1 == count );
G(rc, lsm_access_group_record_array_free, groups, count);
groups = NULL;
@@ -666,10 +666,10 @@ START_TEST(test_access_groups)
rc = lsm_access_group_initiator_add(c, group, "iqn.1994-05.com.domain:01.89bd02",
LSM_ACCESS_GROUP_INIT_TYPE_ISCSI_IQN,
- &updated, LSM_FLAG_RSVD);
+ &updated, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_OK == rc, "Expected success on lsmAccessGroupInitiatorAdd %d %d", rc, which_plugin);
- G(rc, lsm_access_group_list, c, NULL, NULL, &groups, &count, LSM_FLAG_RSVD);
+ G(rc, lsm_access_group_list, c, NULL, NULL, &groups, &count, LSM_CLIENT_FLAG_RSVD);
fail_unless( 1 == count );
fail_unless( updated != NULL );
@@ -690,7 +690,7 @@ START_TEST(test_access_groups)
G(rc, lsm_access_group_initiator_delete, c, groups[0],
lsm_string_list_elem_get(init_list, i),
LSM_ACCESS_GROUP_INIT_TYPE_ISCSI_IQN, &updated,
- LSM_FLAG_RSVD)
+ LSM_CLIENT_FLAG_RSVD)
fail_unless(updated != NULL);
lsm_access_group_record_free(updated);
@@ -708,7 +708,7 @@ START_TEST(test_access_groups)
groups = NULL;
count = 0;
- G(rc, lsm_access_group_list, c, NULL, NULL, &groups, &count, LSM_FLAG_RSVD);
+ G(rc, lsm_access_group_list, c, NULL, NULL, &groups, &count, LSM_CLIENT_FLAG_RSVD);
fail_unless( LSM_ERR_OK == rc);
fail_unless( 1 == count );
@@ -745,11 +745,11 @@ START_TEST(test_access_groups_grant_revoke)
ISCSI_HOST[0],
LSM_ACCESS_GROUP_INIT_TYPE_ISCSI_IQN,
system,
- &group, LSM_FLAG_RSVD);
+ &group, LSM_CLIENT_FLAG_RSVD);
int vc = lsm_volume_create(c, pool, "volume_grant_test", 20000000,
- LSM_PROVISION_DEFAULT, &n, &job, LSM_FLAG_RSVD);
+ LSM_VOLUME_PROVISION_DEFAULT, &n, &job, LSM_CLIENT_FLAG_RSVD);
fail_unless( vc == LSM_ERR_OK || vc == LSM_ERR_JOB_STARTED,
"lsmVolumeCreate %d (%s)", vc, error(lsm_error_last_get(c)));
@@ -760,7 +760,7 @@ START_TEST(test_access_groups_grant_revoke)
fail_unless(n != NULL);
- rc = lsm_volume_mask(c, group, n, LSM_FLAG_RSVD);
+ rc = lsm_volume_mask(c, group, n, LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_JOB_STARTED == rc ) {
wait_for_job(c, &job);
} else {
@@ -770,7 +770,7 @@ START_TEST(test_access_groups_grant_revoke)
lsm_volume **volumes = NULL;
uint32_t v_count = 0;
G(rc, lsm_volumes_accessible_by_access_group, c, group, &volumes, &v_count,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
fail_unless(v_count == 1);
if( v_count >= 1 ) {
@@ -781,7 +781,7 @@ START_TEST(test_access_groups_grant_revoke)
lsm_access_group **groups;
uint32_t g_count = 0;
G(rc, lsm_access_groups_granted_to_volume, c, n, &groups, &g_count,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
fail_unless(g_count == 1);
@@ -790,7 +790,7 @@ START_TEST(test_access_groups_grant_revoke)
G(rc, lsm_access_group_record_array_free, groups, g_count);
}
- rc = lsm_volume_unmask(c, group, n, LSM_FLAG_RSVD);
+ rc = lsm_volume_unmask(c, group, n, LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_JOB_STARTED == rc ) {
wait_for_job(c, &job);
} else {
@@ -798,7 +798,7 @@ START_TEST(test_access_groups_grant_revoke)
rc, which_plugin);
}
- G(rc, lsm_access_group_delete, c, group, LSM_FLAG_RSVD);
+ G(rc, lsm_access_group_delete, c, group, LSM_CLIENT_FLAG_RSVD);
G(rc, lsm_access_group_record_free, group);
G(rc, lsm_volume_record_free, n);
@@ -822,10 +822,10 @@ START_TEST(test_fs)
lsm_pool *test_pool = get_test_pool(c);
- G(rc, lsm_fs_list, c, NULL, NULL, &fs_list, &fs_count, LSM_FLAG_RSVD);
+ G(rc, lsm_fs_list, c, NULL, NULL, &fs_list, &fs_count, LSM_CLIENT_FLAG_RSVD);
fail_unless(0 == fs_count);
- rc = lsm_fs_create(c, test_pool, "C_unit_test", 50000000, &nfs, &job, LSM_FLAG_RSVD);
+ rc = lsm_fs_create(c, test_pool, "C_unit_test", 50000000, &nfs, &job, LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_JOB_STARTED == rc ) {
fail_unless(NULL == nfs);
@@ -841,7 +841,7 @@ START_TEST(test_fs)
fail_unless(fs_free_space != 0);
lsm_fs *cloned_fs = NULL;
- rc = lsm_fs_clone(c, nfs, "cloned_fs", NULL, &cloned_fs, &job, LSM_FLAG_RSVD);
+ rc = lsm_fs_clone(c, nfs, "cloned_fs", NULL, &cloned_fs, &job, LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_JOB_STARTED == rc ) {
fail_unless(NULL == cloned_fs);
cloned_fs = wait_for_job_fs(c, &job);
@@ -853,7 +853,7 @@ START_TEST(test_fs)
fail_unless(LSM_ERR_OK == rc, "rc= %d", rc);
}
- rc = lsm_fs_file_clone(c, nfs, "src/file.txt", "dest/file.txt", NULL, &job, LSM_FLAG_RSVD);
+ rc = lsm_fs_file_clone(c, nfs, "src/file.txt", "dest/file.txt", NULL, &job, LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_JOB_STARTED == rc ) {
wait_for_job(c, &job);
} else {
@@ -861,13 +861,13 @@ START_TEST(test_fs)
}
- G(rc, lsm_fs_list, c, NULL, NULL, &fs_list, &fs_count, LSM_FLAG_RSVD);
+ G(rc, lsm_fs_list, c, NULL, NULL, &fs_list, &fs_count, LSM_CLIENT_FLAG_RSVD);
fail_unless(2 == fs_count, "fs_count = %d", fs_count);
G(rc, lsm_fs_record_array_free, fs_list, fs_count);
fs_list = NULL;
fs_count = 0;
- rc = lsm_fs_resize(c,nfs, 100000000, &resized_fs, &job, LSM_FLAG_RSVD);
+ rc = lsm_fs_resize(c,nfs, 100000000, &resized_fs, &job, LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_JOB_STARTED == rc ) {
fail_unless(NULL == resized_fs);
@@ -875,10 +875,10 @@ START_TEST(test_fs)
}
uint8_t yes_no = 10;
- G(rc, lsm_fs_child_dependency, c, nfs, NULL, &yes_no, LSM_FLAG_RSVD);
+ G(rc, lsm_fs_child_dependency, c, nfs, NULL, &yes_no, LSM_CLIENT_FLAG_RSVD);
fail_unless( yes_no == 0);
- rc = lsm_fs_child_dependency_delete(c, nfs, NULL, &job, LSM_FLAG_RSVD);
+ rc = lsm_fs_child_dependency_delete(c, nfs, NULL, &job, LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_JOB_STARTED == rc ) {
fail_unless(NULL != job);
wait_for_job(c, &job);
@@ -886,7 +886,7 @@ START_TEST(test_fs)
fail_unless( LSM_ERR_OK == rc);
}
- rc = lsm_fs_delete(c, resized_fs, &job, LSM_FLAG_RSVD);
+ rc = lsm_fs_delete(c, resized_fs, &job, LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_JOB_STARTED == rc ) {
wait_for_job(c, &job);
@@ -913,7 +913,7 @@ START_TEST(test_ss)
lsm_pool *test_pool = get_test_pool(c);
int rc = lsm_fs_create(c, test_pool, "test_fs", 100000000, &fs, &job,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_JOB_STARTED == rc ) {
fs = wait_for_job_fs(c, &job);
@@ -925,12 +925,12 @@ START_TEST(test_ss)
test_pool = NULL;
- G(rc, lsm_fs_ss_list, c, fs, &ss_list, &ss_count, LSM_FLAG_RSVD);
+ G(rc, lsm_fs_ss_list, c, fs, &ss_list, &ss_count, LSM_CLIENT_FLAG_RSVD);
fail_unless( NULL == ss_list);
fail_unless( 0 == ss_count );
- rc = lsm_fs_ss_create(c, fs, "test_snap", &ss, &job, LSM_FLAG_RSVD);
+ rc = lsm_fs_ss_create(c, fs, "test_snap", &ss, &job, LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_JOB_STARTED == rc ) {
printf("Waiting for snap to create!\n");
ss = wait_for_job_ss(c, &job);
@@ -940,7 +940,7 @@ START_TEST(test_ss)
fail_unless( NULL != ss);
- G(rc, lsm_fs_ss_list, c, fs, &ss_list, &ss_count, LSM_FLAG_RSVD);
+ G(rc, lsm_fs_ss_list, c, fs, &ss_list, &ss_count, LSM_CLIENT_FLAG_RSVD);
fail_unless( NULL != ss_list);
fail_unless( 1 == ss_count );
@@ -949,7 +949,7 @@ START_TEST(test_ss)
G(rc, lsm_string_list_elem_set, files, 0, "some/file/name.txt");
}
- rc = lsm_fs_ss_restore(c, fs, ss, files, files, 0, &job, LSM_FLAG_RSVD);
+ rc = lsm_fs_ss_restore(c, fs, ss, files, files, 0, &job, LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_JOB_STARTED == rc ) {
printf("Waiting for lsm_fs_ss_restore!\n");
wait_for_job(c, &job);
@@ -959,7 +959,7 @@ START_TEST(test_ss)
G(rc, lsm_string_list_free, files);
- rc = lsm_fs_ss_delete(c, fs, ss, &job, LSM_FLAG_RSVD);
+ rc = lsm_fs_ss_delete(c, fs, ss, &job, LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_JOB_STARTED == rc ) {
wait_for_job(c, &job);
}
@@ -982,7 +982,7 @@ START_TEST(test_systems)
fail_unless(c!=NULL);
- G(rc, lsm_system_list, c, &sys, &count, LSM_FLAG_RSVD);
+ G(rc, lsm_system_list, c, &sys, &count, LSM_CLIENT_FLAG_RSVD);
fail_unless(count == 1);
id = lsm_system_id_get(sys[0]);
@@ -1089,7 +1089,7 @@ START_TEST(test_nfs_exports)
if( test_pool ) {
rc = lsm_fs_create(c, test_pool, "C_unit_test_nfs_export", 50000000,
- &nfs, &job, LSM_FLAG_RSVD);
+ &nfs, &job, LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_JOB_STARTED == rc ) {
nfs = wait_for_job_fs(c, &job);
@@ -1106,7 +1106,7 @@ START_TEST(test_nfs_exports)
if( nfs ) {
- G(rc, lsm_nfs_list, c, NULL, NULL, &exports, &count, LSM_FLAG_RSVD);
+ G(rc, lsm_nfs_list, c, NULL, NULL, &exports, &count, LSM_CLIENT_FLAG_RSVD);
fail_unless(count == 0);
fail_unless(NULL == exports);
@@ -1121,7 +1121,7 @@ START_TEST(test_nfs_exports)
G(rc, lsm_nfs_export_fs, c, lsm_fs_id_get(nfs), NULL, access,
access, NULL, ANON_UID_GID_NA,
ANON_UID_GID_NA, NULL, NULL, &e,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
G(rc, lsm_nfs_export_record_free, e);
e=NULL;
@@ -1129,17 +1129,17 @@ START_TEST(test_nfs_exports)
G(rc, lsm_string_list_free, access);
access = NULL;
- G(rc, lsm_nfs_list, c, NULL, NULL, &exports, &count, LSM_FLAG_RSVD);
+ G(rc, lsm_nfs_list, c, NULL, NULL, &exports, &count, LSM_CLIENT_FLAG_RSVD);
fail_unless( exports != NULL);
fail_unless( count == 1 );
if( count ) {
- G(rc, lsm_nfs_export_delete, c, exports[0], LSM_FLAG_RSVD);
+ G(rc, lsm_nfs_export_delete, c, exports[0], LSM_CLIENT_FLAG_RSVD);
G(rc, lsm_nfs_export_record_array_free, exports, count);
exports = NULL;
G(rc, lsm_nfs_list, c, NULL, NULL, &exports, &count,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
fail_unless(count == 0);
fail_unless(NULL == exports);
@@ -1173,8 +1173,8 @@ START_TEST(test_volume_methods)
if( test_pool ) {
rc = lsm_volume_create(c, test_pool, "lsm_volume_method_test",
- 10000000, LSM_PROVISION_DEFAULT,
- &v, &job, LSM_FLAG_RSVD);
+ 10000000, LSM_VOLUME_PROVISION_DEFAULT,
+ &v, &job, LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_JOB_STARTED == rc ) {
v = wait_for_job_vol(c, &job);
@@ -1186,7 +1186,7 @@ START_TEST(test_volume_methods)
fail_unless( strcmp(lsm_volume_pool_id_get(v),
lsm_pool_id_get(test_pool)) == 0 );
- rc = lsm_volume_delete(c, v, &job, LSM_FLAG_RSVD);
+ rc = lsm_volume_delete(c, v, &job, LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_JOB_STARTED == rc ) {
wait_for_job(c, &job);
} else {
@@ -1218,101 +1218,101 @@ START_TEST(test_invalid_input)
lsm_connect *test_connect = NULL;
lsm_error_ptr test_error = NULL;
- rc = lsm_connect_password(NULL, NULL, NULL, 20000, NULL, LSM_FLAG_RSVD);
+ rc = lsm_connect_password(NULL, NULL, NULL, 20000, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc %d", rc);
rc = lsm_connect_password("INVALID_URI:\\yep", NULL, &test_connect, 20000,
- &test_error, LSM_FLAG_RSVD);
+ &test_error, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc %d", rc);
- rc = lsm_connect_close((lsm_connect *)&bad, LSM_FLAG_RSVD);
+ rc = lsm_connect_close((lsm_connect *)&bad, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
- rc = lsm_connect_close((lsm_connect *)NULL, LSM_FLAG_RSVD);
+ rc = lsm_connect_close((lsm_connect *)NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
- rc = lsm_job_status_get(c, NULL, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_job_status_get(c, NULL, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
char *job = NULL;
- rc = lsm_job_status_get(c, job, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_job_status_get(c, job, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
lsm_job_status status;
- rc = lsm_job_status_get(c, job, &status, NULL, LSM_FLAG_RSVD);
+ rc = lsm_job_status_get(c, job, &status, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
uint8_t percent_complete;
- rc = lsm_job_status_get(c, "NO_SUCH_JOB", &status, &percent_complete, LSM_FLAG_RSVD);
+ rc = lsm_job_status_get(c, "NO_SUCH_JOB", &status, &percent_complete, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_NOT_FOUND_JOB == rc, "rc %d", rc);
/* lsmJobStatusVolumeGet */
lsm_volume *vol = NULL;
- rc = lsm_job_status_volume_get(c, NULL, NULL, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_job_status_volume_get(c, NULL, NULL, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
- rc = lsm_job_status_volume_get(c, NULL, NULL, NULL, &vol, LSM_FLAG_RSVD);
+ rc = lsm_job_status_volume_get(c, NULL, NULL, NULL, &vol, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
- rc = lsm_job_status_volume_get(c, job, NULL, NULL, &vol, LSM_FLAG_RSVD);
+ rc = lsm_job_status_volume_get(c, job, NULL, NULL, &vol, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
- rc = lsm_job_status_volume_get(c, job, &status, NULL, &vol, LSM_FLAG_RSVD);
+ rc = lsm_job_status_volume_get(c, job, &status, NULL, &vol, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
- rc = lsm_job_status_volume_get(c, "NO_SUCH_JOB", &status, &percent_complete, &vol, LSM_FLAG_RSVD);
+ rc = lsm_job_status_volume_get(c, "NO_SUCH_JOB", &status, &percent_complete, &vol, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_NOT_FOUND_JOB == rc, "rc %d", rc);
/* lsmJobStatusFsGet */
lsm_fs *fs = NULL;
- rc = lsm_job_status_fs_get(c, NULL, NULL, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_job_status_fs_get(c, NULL, NULL, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
- rc = lsm_job_status_fs_get(c, NULL, NULL, NULL, &fs, LSM_FLAG_RSVD);
+ rc = lsm_job_status_fs_get(c, NULL, NULL, NULL, &fs, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
- rc = lsm_job_status_fs_get(c, job, NULL, NULL, &fs, LSM_FLAG_RSVD);
+ rc = lsm_job_status_fs_get(c, job, NULL, NULL, &fs, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
- rc = lsm_job_status_fs_get(c, job, &status, NULL, &fs, LSM_FLAG_RSVD);
+ rc = lsm_job_status_fs_get(c, job, &status, NULL, &fs, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
- rc = lsm_job_status_fs_get(c, "NO_SUCH_JOB", &status, &percent_complete, &fs, LSM_FLAG_RSVD);
+ rc = lsm_job_status_fs_get(c, "NO_SUCH_JOB", &status, &percent_complete, &fs, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_NOT_FOUND_JOB == rc, "rc %d", rc);
/* lsmJobStatusFsGet */
lsm_fs_ss *ss = (lsm_fs_ss *)&bad;
- rc = lsm_job_status_ss_get(c, NULL, NULL, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_job_status_ss_get(c, NULL, NULL, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
- rc = lsm_job_status_ss_get(c, NULL, NULL, NULL, &ss, LSM_FLAG_RSVD);
+ rc = lsm_job_status_ss_get(c, NULL, NULL, NULL, &ss, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
ss = NULL;
- rc = lsm_job_status_ss_get(c, job, NULL, NULL, &ss, LSM_FLAG_RSVD);
+ rc = lsm_job_status_ss_get(c, job, NULL, NULL, &ss, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
- rc = lsm_job_status_ss_get(c, job, &status, NULL, &ss, LSM_FLAG_RSVD);
+ rc = lsm_job_status_ss_get(c, job, &status, NULL, &ss, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
- rc = lsm_job_status_ss_get(c, "NO_SUCH_JOB", &status, &percent_complete, &ss, LSM_FLAG_RSVD);
+ rc = lsm_job_status_ss_get(c, "NO_SUCH_JOB", &status, &percent_complete, &ss, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_NOT_FOUND_JOB == rc, "rc %d", rc);
/* lsmJobFree */
char *bogus_job = strdup("NO_SUCH_JOB");
- rc = lsm_job_free(c, NULL, LSM_FLAG_RSVD);
+ rc = lsm_job_free(c, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
- rc = lsm_job_free(c, &bogus_job, LSM_FLAG_RSVD);
+ rc = lsm_job_free(c, &bogus_job, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_NOT_FOUND_JOB == rc, "rc %d", rc);
fail_unless(bogus_job != NULL, "Expected bogus job to != NULL!");
@@ -1323,90 +1323,90 @@ START_TEST(test_invalid_input)
uint32_t count = 0;
lsm_disk **disks = NULL;
- rc = lsm_disk_list(c, NULL, NULL, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_disk_list(c, NULL, NULL, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d, rc");
- rc = lsm_disk_list(c, "bogus_key", NULL, &disks, &count, LSM_FLAG_RSVD);
+ rc = lsm_disk_list(c, "bogus_key", NULL, &disks, &count, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d, rc");
- rc = lsm_disk_list(c, "bogus_key", "nope", &disks, &count, LSM_FLAG_RSVD);
+ rc = lsm_disk_list(c, "bogus_key", "nope", &disks, &count, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_UNSUPPORTED_SEARCH_KEY == rc, "rc %d, rc");
/* lsmPoolList */
- rc = lsm_pool_list(c, NULL, NULL, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_pool_list(c, NULL, NULL, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
lsm_pool **pools = NULL;
- rc = lsm_pool_list(c, NULL, NULL, &pools, NULL, LSM_FLAG_RSVD);
+ rc = lsm_pool_list(c, NULL, NULL, &pools, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
- rc = lsm_pool_list(c, NULL, NULL, NULL, &count, LSM_FLAG_RSVD);
+ rc = lsm_pool_list(c, NULL, NULL, NULL, &count, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
pools = (lsm_pool **)&bad;
- rc = lsm_pool_list(c, NULL, NULL, &pools, &count, LSM_FLAG_RSVD);
+ rc = lsm_pool_list(c, NULL, NULL, &pools, &count, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
pools = NULL;
- rc = lsm_pool_list(c, "bogus_key", "nope", &pools, &count, LSM_FLAG_RSVD);
+ rc = lsm_pool_list(c, "bogus_key", "nope", &pools, &count, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_UNSUPPORTED_SEARCH_KEY == rc, "rc %d", rc);
- rc = lsm_pool_list(c, "bogus_key", NULL, &pools, &count, LSM_FLAG_RSVD);
+ rc = lsm_pool_list(c, "bogus_key", NULL, &pools, &count, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
/* lsmVolumeList */
- rc = lsm_volume_list(c, NULL, NULL, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_volume_list(c, NULL, NULL, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
lsm_volume **vols = NULL;
- rc = lsm_volume_list(c, NULL, NULL, &vols, NULL, LSM_FLAG_RSVD);
+ rc = lsm_volume_list(c, NULL, NULL, &vols, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
- rc = lsm_volume_list(c, NULL, NULL, NULL, &count, LSM_FLAG_RSVD);
+ rc = lsm_volume_list(c, NULL, NULL, NULL, &count, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
vols = (lsm_volume **)&bad;
- rc = lsm_volume_list(c, NULL, NULL, &vols, &count, LSM_FLAG_RSVD);
+ rc = lsm_volume_list(c, NULL, NULL, &vols, &count, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
vols = NULL;
- rc = lsm_volume_list(c, "bogus_key", "nope", &vols, &count, LSM_FLAG_RSVD);
+ rc = lsm_volume_list(c, "bogus_key", "nope", &vols, &count, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_UNSUPPORTED_SEARCH_KEY == rc, "rc %d", rc);
- rc = lsm_volume_list(c, "bogus_key", NULL, &vols, &count, LSM_FLAG_RSVD);
+ rc = lsm_volume_list(c, "bogus_key", NULL, &vols, &count, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
/* lsmVolumeCreate */
lsm_volume *new_vol = NULL;
job = NULL;
- rc = lsm_volume_create(c, NULL, NULL, 0, 0, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_volume_create(c, NULL, NULL, 0, 0, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
rc = lsm_volume_create(c, (lsm_pool *)&bad, "BAD_POOL", 10000000,
- LSM_PROVISION_DEFAULT, &new_vol, &job, LSM_FLAG_RSVD);
+ LSM_VOLUME_PROVISION_DEFAULT, &new_vol, &job, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
- rc = lsm_volume_create(c, test_pool, "", 10000000, LSM_PROVISION_DEFAULT,
- &new_vol, &job, LSM_FLAG_RSVD);
+ rc = lsm_volume_create(c, test_pool, "", 10000000, LSM_VOLUME_PROVISION_DEFAULT,
+ &new_vol, &job, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
- rc = lsm_volume_create(c, test_pool, "ARG_TESTING", 10000000, LSM_PROVISION_DEFAULT,
- NULL, &job, LSM_FLAG_RSVD);
+ rc = lsm_volume_create(c, test_pool, "ARG_TESTING", 10000000, LSM_VOLUME_PROVISION_DEFAULT,
+ NULL, &job, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
- rc = lsm_volume_create(c, test_pool, "ARG_TESTING", 10000000, LSM_PROVISION_DEFAULT,
- &new_vol, NULL, LSM_FLAG_RSVD);
+ rc = lsm_volume_create(c, test_pool, "ARG_TESTING", 10000000, LSM_VOLUME_PROVISION_DEFAULT,
+ &new_vol, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
job = "NOT_NULL";
- rc = lsm_volume_create(c, test_pool, "ARG_TESTING", 10000000, LSM_PROVISION_DEFAULT,
- &new_vol, &job, LSM_FLAG_RSVD);
+ rc = lsm_volume_create(c, test_pool, "ARG_TESTING", 10000000, LSM_VOLUME_PROVISION_DEFAULT,
+ &new_vol, &job, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
job = NULL;
- rc = lsm_volume_create(c, test_pool, "ARG_TESTING", 10000000, LSM_PROVISION_DEFAULT,
- &new_vol, &job, LSM_FLAG_RSVD);
+ rc = lsm_volume_create(c, test_pool, "ARG_TESTING", 10000000, LSM_VOLUME_PROVISION_DEFAULT,
+ &new_vol, &job, LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_JOB_STARTED == rc ) {
new_vol = wait_for_job_vol(c, &job);
@@ -1415,24 +1415,24 @@ START_TEST(test_invalid_input)
}
/* lsmVolumeResize */
- rc = lsm_volume_resize(c, NULL, 0, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_volume_resize(c, NULL, 0, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
lsm_volume *resized = (lsm_volume *)&bad;
- rc = lsm_volume_resize(c, new_vol, 20000000, &resized, NULL, LSM_FLAG_RSVD);
+ rc = lsm_volume_resize(c, new_vol, 20000000, &resized, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
resized = NULL;
- rc = lsm_volume_resize(c, new_vol, 20000000, &resized, NULL, LSM_FLAG_RSVD);
+ rc = lsm_volume_resize(c, new_vol, 20000000, &resized, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
rc = lsm_volume_resize(c, new_vol, lsm_volume_number_of_blocks_get(new_vol) *
lsm_volume_block_size_get(new_vol),
- &resized, &job, LSM_FLAG_RSVD);
+ &resized, &job, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_NO_STATE_CHANGE == rc, "rc = %d", rc);
- rc = lsm_volume_resize(c, new_vol, 20000000, &resized, &job, LSM_FLAG_RSVD);
+ rc = lsm_volume_resize(c, new_vol, 20000000, &resized, &job, LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_JOB_STARTED == rc ) {
resized = wait_for_job_vol(c, &job);
@@ -1441,13 +1441,13 @@ START_TEST(test_invalid_input)
}
/* lsmVolumeDelete */
- rc = lsm_volume_delete(c, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_volume_delete(c, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
- rc = lsm_volume_delete(c, resized, NULL, LSM_FLAG_RSVD);
+ rc = lsm_volume_delete(c, resized, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc %d", rc);
- rc = lsm_volume_delete(c, resized, &job, LSM_FLAG_RSVD);
+ rc = lsm_volume_delete(c, resized, &job, LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_JOB_STARTED == rc ) {
wait_for_job(c, &job);
} else {
@@ -1457,65 +1457,65 @@ START_TEST(test_invalid_input)
/* lsmStorageCapabilities * */
lsm_system **sys = NULL;
uint32_t num_systems = 0;
- rc = lsm_system_list(c, &sys, &num_systems, LSM_FLAG_RSVD );
+ rc = lsm_system_list(c, &sys, &num_systems, LSM_CLIENT_FLAG_RSVD );
fail_unless(LSM_ERR_OK == rc, "rc %d", rc);
fail_unless( sys != NULL);
fail_unless( num_systems >= 1, "num_systems %d", num_systems);
- rc = lsm_capabilities(c, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_capabilities(c, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT, "rc %d", rc);
if( num_systems ) {
- rc = lsm_capabilities(c, sys[0], NULL, LSM_FLAG_RSVD);
+ rc = lsm_capabilities(c, sys[0], NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT, "rc %d", rc);
}
/* lsmVolumeReplicate */
lsm_volume *cloned = NULL;
- rc = lsm_volume_replicate(c, (lsm_pool *)&bad, 0, NULL, NULL, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_volume_replicate(c, (lsm_pool *)&bad, 0, NULL, NULL, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
rc = lsm_volume_replicate(c, test_pool, LSM_VOLUME_REPLICATE_CLONE, NULL,
- "cloned", &cloned, &job, LSM_FLAG_RSVD);
+ "cloned", &cloned, &job, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
rc = lsm_volume_replicate(c, test_pool, LSM_VOLUME_REPLICATE_CLONE, new_vol,
- "", &cloned, &job, LSM_FLAG_RSVD);
+ "", &cloned, &job, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
rc = lsm_volume_replicate(c, test_pool, LSM_VOLUME_REPLICATE_CLONE, new_vol,
- "cloned", NULL, &job, LSM_FLAG_RSVD);
+ "cloned", NULL, &job, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
rc = lsm_volume_replicate(c, test_pool, LSM_VOLUME_REPLICATE_CLONE, new_vol,
- "cloned", &cloned, NULL, LSM_FLAG_RSVD);
+ "cloned", &cloned, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
/* lsmVolumeReplicateRangeBlockSize */
- rc = lsm_volume_replicate_range_block_size(c, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_volume_replicate_range_block_size(c, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
/* lsmVolumeReplicateRange */
rc = lsm_volume_replicate_range(c, LSM_VOLUME_REPLICATE_CLONE, NULL, NULL,
- NULL, 0, NULL, LSM_FLAG_RSVD);
+ NULL, 0, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
rc = lsm_volume_replicate_range(c, LSM_VOLUME_REPLICATE_CLONE, new_vol,
- NULL, NULL, 0, NULL, LSM_FLAG_RSVD);
+ NULL, NULL, 0, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
rc = lsm_volume_replicate_range(c, LSM_VOLUME_REPLICATE_CLONE, new_vol, new_vol,
- NULL, 1, &job, LSM_FLAG_RSVD);
+ NULL, 1, &job, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_volume_enable(c, NULL, LSM_FLAG_RSVD);
+ rc = lsm_volume_enable(c, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_volume_disable(c, NULL, LSM_FLAG_RSVD);
+ rc = lsm_volume_disable(c, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
@@ -1524,109 +1524,109 @@ START_TEST(test_invalid_input)
lsm_system *system = NULL;
system = get_system(c);
- rc = lsm_access_group_create(c, NULL, NULL, 0, system, NULL, LSM_FLAG_RSVD);
+ rc = lsm_access_group_create(c, NULL, NULL, 0, system, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
rc = lsm_access_group_create(c, "my_group", ISCSI_HOST[0], LSM_ACCESS_GROUP_INIT_TYPE_OTHER,
- NULL, NULL, LSM_FLAG_RSVD);
+ NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
rc = lsm_access_group_create(c, "my_group", ISCSI_HOST[0], LSM_ACCESS_GROUP_INIT_TYPE_OTHER,
- system, &ag, LSM_FLAG_RSVD);
+ system, &ag, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_OK, "rc = %d", rc);
fail_unless(ag != NULL);
/* lsmAccessGroupDel */
- rc = lsm_access_group_delete(c, NULL, LSM_FLAG_RSVD);
+ rc = lsm_access_group_delete(c, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
/* lsmAccessGroupInitiatorAdd */
- rc = lsm_access_group_initiator_add(c, NULL, NULL, 0, NULL, LSM_FLAG_RSVD);
+ rc = lsm_access_group_initiator_add(c, NULL, NULL, 0, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_access_group_initiator_delete(c, NULL, NULL, 0, NULL, LSM_FLAG_RSVD);
+ rc = lsm_access_group_initiator_delete(c, NULL, NULL, 0, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
rc = lsm_access_group_initiator_delete(c, ag, NULL,
- LSM_ACCESS_GROUP_INIT_TYPE_OTHER, NULL, LSM_FLAG_RSVD);
+ LSM_ACCESS_GROUP_INIT_TYPE_OTHER, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_volume_mask(c, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_volume_mask(c, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_volume_mask(c, ag, NULL, LSM_FLAG_RSVD);
+ rc = lsm_volume_mask(c, ag, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_volume_unmask(c, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_volume_unmask(c, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_volume_unmask(c, ag, NULL, LSM_FLAG_RSVD);
+ rc = lsm_volume_unmask(c, ag, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
/* lsmVolumesAccessibleByAccessGroup */
- rc = lsm_volumes_accessible_by_access_group(c, NULL, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_volumes_accessible_by_access_group(c, NULL, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_volumes_accessible_by_access_group(c, ag, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_volumes_accessible_by_access_group(c, ag, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
/* lsmAccessGroupsGrantedToVolume */
- rc = lsm_access_groups_granted_to_volume(c, NULL, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_access_groups_granted_to_volume(c, NULL, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_access_groups_granted_to_volume(c, new_vol, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_access_groups_granted_to_volume(c, new_vol, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
/* lsmVolumeChildDependency */
- rc = lsm_volume_child_dependency(c, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_volume_child_dependency(c, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_volume_child_dependency(c, new_vol, NULL, LSM_FLAG_RSVD);
+ rc = lsm_volume_child_dependency(c, new_vol, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
/*lsmVolumeChildDependencyDelete*/
- rc = lsm_volume_child_dependency_delete(c, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_volume_child_dependency_delete(c, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_volume_child_dependency_delete(c, new_vol, NULL, LSM_FLAG_RSVD);
+ rc = lsm_volume_child_dependency_delete(c, new_vol, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
/* lsmSystemList */
lsm_system **systems = NULL;
- rc = lsm_system_list(c, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_system_list(c, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_system_list(c, &systems, NULL, LSM_FLAG_RSVD);
+ rc = lsm_system_list(c, &systems, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
/* lsmFsList */
- rc = lsm_fs_list(c, NULL, NULL, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_fs_list(c, NULL, NULL, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
lsm_fs **fsl = NULL;
- rc = lsm_fs_list(c, NULL, NULL, &fsl, NULL, LSM_FLAG_RSVD);
+ rc = lsm_fs_list(c, NULL, NULL, &fsl, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_fs_list(c, "bogus_key", "nope", &fsl, &count, LSM_FLAG_RSVD);
+ rc = lsm_fs_list(c, "bogus_key", "nope", &fsl, &count, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_UNSUPPORTED_SEARCH_KEY, "rc = %d", rc);
/*lsmFsCreate*/
- rc = lsm_fs_create(c, NULL, NULL, 0, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_fs_create(c, NULL, NULL, 0, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_fs_create(c, test_pool, NULL, 0, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_fs_create(c, test_pool, NULL, 0, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
lsm_fs *arg_fs = NULL;
rc = lsm_fs_create(c, test_pool, "argument_fs", 10000000, &arg_fs, &job,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_JOB_STARTED == rc ) {
arg_fs = wait_for_job_fs(c, &job);
@@ -1635,76 +1635,76 @@ START_TEST(test_invalid_input)
}
/* lsmFsDelete */
- rc = lsm_fs_delete(c, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_fs_delete(c, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_fs_delete(c, arg_fs, NULL, LSM_FLAG_RSVD);
+ rc = lsm_fs_delete(c, arg_fs, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
/* lsmFsResize */
- rc = lsm_fs_resize(c, NULL, 0, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_fs_resize(c, NULL, 0, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_fs_resize(c, arg_fs, 0, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_fs_resize(c, arg_fs, 0, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
/* lsmFsClone */
- rc = lsm_fs_clone(c, NULL, NULL, NULL, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_fs_clone(c, NULL, NULL, NULL, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_fs_clone(c, arg_fs, NULL, NULL, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_fs_clone(c, arg_fs, NULL, NULL, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
/*lsmFsFileClone*/
- rc = lsm_fs_file_clone(c, NULL, NULL, NULL, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_fs_file_clone(c, NULL, NULL, NULL, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_fs_file_clone(c, arg_fs, NULL, NULL, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_fs_file_clone(c, arg_fs, NULL, NULL, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_fs_child_dependency(c, NULL, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_fs_child_dependency(c, NULL, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
lsm_string_list *badf = (lsm_string_list *)&bad;
- rc = lsm_fs_child_dependency(c, arg_fs, badf, NULL, LSM_FLAG_RSVD);
+ rc = lsm_fs_child_dependency(c, arg_fs, badf, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
lsm_string_list *f = lsm_string_list_alloc(1);
- rc = lsm_fs_child_dependency(c, arg_fs, f, NULL, LSM_FLAG_RSVD);
+ rc = lsm_fs_child_dependency(c, arg_fs, f, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
/*lsmFsChildDependencyDelete*/
- rc = lsm_fs_child_dependency_delete(c, NULL, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_fs_child_dependency_delete(c, NULL, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_fs_child_dependency_delete(c, arg_fs, badf, NULL, LSM_FLAG_RSVD);
+ rc = lsm_fs_child_dependency_delete(c, arg_fs, badf, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_fs_child_dependency_delete(c, arg_fs, f, NULL, LSM_FLAG_RSVD);
+ rc = lsm_fs_child_dependency_delete(c, arg_fs, f, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_fs_ss_list(c, NULL, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_fs_ss_list(c, NULL, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_fs_ss_list(c, arg_fs, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_fs_ss_list(c, arg_fs, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_fs_ss_create(c, NULL, NULL, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_fs_ss_create(c, NULL, NULL, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_fs_ss_create(c, arg_fs, NULL, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_fs_ss_create(c, arg_fs, NULL, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
lsm_fs_ss *arg_ss = NULL;
rc = lsm_fs_ss_create(c, arg_fs, "arg_snapshot", &arg_ss, &job,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_JOB_STARTED == rc ) {
arg_ss = wait_for_job_ss(c, &job);
@@ -1712,32 +1712,32 @@ START_TEST(test_invalid_input)
fail_unless(rc == LSM_ERR_OK, "rc = %d", rc);
}
- rc = lsm_fs_ss_delete(c, NULL, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_fs_ss_delete(c, NULL, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_fs_ss_delete(c, arg_fs, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_fs_ss_delete(c, arg_fs, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_fs_ss_delete(c, arg_fs, arg_ss, NULL, LSM_FLAG_RSVD);
+ rc = lsm_fs_ss_delete(c, arg_fs, arg_ss, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_fs_ss_restore(c, NULL, NULL, NULL, NULL, 0, NULL, LSM_FLAG_RSVD);
+ rc = lsm_fs_ss_restore(c, NULL, NULL, NULL, NULL, 0, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_fs_ss_restore(c, arg_fs, NULL, NULL, NULL, 0, NULL, LSM_FLAG_RSVD);
+ rc = lsm_fs_ss_restore(c, arg_fs, NULL, NULL, NULL, 0, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_fs_ss_restore(c, arg_fs, arg_ss, badf, NULL, 0, NULL, LSM_FLAG_RSVD);
+ rc = lsm_fs_ss_restore(c, arg_fs, arg_ss, badf, NULL, 0, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_fs_ss_restore(c, arg_fs, arg_ss, badf, badf, 0, NULL, LSM_FLAG_RSVD);
+ rc = lsm_fs_ss_restore(c, arg_fs, arg_ss, badf, badf, 0, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_fs_ss_restore(c, arg_fs, arg_ss, f, f, 0, NULL, LSM_FLAG_RSVD);
+ rc = lsm_fs_ss_restore(c, arg_fs, arg_ss, f, f, 0, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_nfs_list(c, NULL, NULL, NULL, NULL, LSM_FLAG_RSVD);
+ rc = lsm_nfs_list(c, NULL, NULL, NULL, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
@@ -1754,27 +1754,27 @@ START_TEST(test_invalid_input)
arg_fs = NULL;
rc = lsm_nfs_export_fs(c, NULL, NULL, NULL, NULL, NULL, 0,0,NULL, NULL, NULL,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
rc = lsm_nfs_export_fs(c, NULL, NULL, badf, NULL, NULL, 0,0,NULL, NULL, NULL,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
rc = lsm_nfs_export_fs(c, NULL, NULL, f, badf, NULL, 0,0,NULL, NULL, NULL,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
rc = lsm_nfs_export_fs(c, NULL, NULL, f, f, badf, 0,0,NULL, NULL, NULL,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
rc = lsm_nfs_export_fs(c, NULL, NULL, f, f, f, 0,0, NULL, NULL, NULL,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
- rc = lsm_nfs_export_delete(c, NULL, LSM_FLAG_RSVD);
+ rc = lsm_nfs_export_delete(c, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT, "rc = %d", rc);
@@ -1819,11 +1819,11 @@ START_TEST(test_capabilities)
uint32_t sys_count = 0;
lsm_storage_capabilities *cap = NULL;
- G(rc, lsm_system_list, c, &sys, &sys_count, LSM_FLAG_RSVD);
+ G(rc, lsm_system_list, c, &sys, &sys_count, LSM_CLIENT_FLAG_RSVD);
fail_unless( sys_count >= 1, "count = %d", sys_count);
if( sys_count > 0 ) {
- G(rc, lsm_capabilities, c, sys[0], &cap, LSM_FLAG_RSVD);
+ G(rc, lsm_capabilities, c, sys[0], &cap, LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_OK == rc ) {
cap_test(cap, LSM_CAP_VOLUMES);
@@ -1890,7 +1890,8 @@ START_TEST(test_iscsi_auth_in)
printf("get_system() OK\n");
G(rc, lsm_access_group_create, c, "ISCSI_AUTH", ISCSI_HOST[0],
- LSM_ACCESS_GROUP_INIT_TYPE_ISCSI_IQN, system, &group, LSM_FLAG_RSVD);
+ LSM_ACCESS_GROUP_INIT_TYPE_ISCSI_IQN, system, &group,
+ LSM_CLIENT_FLAG_RSVD);
printf("lsm_access_group_create() OK\n");
fail_unless(LSM_ERR_OK == rc, "rc = %d", rc);
@@ -1903,11 +1904,11 @@ START_TEST(test_iscsi_auth_in)
rc = lsm_iscsi_chap_auth(
c, ISCSI_HOST[0], "username", "secret", NULL, NULL,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_OK == rc, "rc = %d", rc);
- rc = lsm_access_group_delete(c, group, LSM_FLAG_RSVD);
+ rc = lsm_access_group_delete(c, group, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_OK == rc );
@@ -1923,7 +1924,7 @@ START_TEST(test_plugin_info)
char *version = NULL;
int rc = 0;
- G(rc, lsm_plugin_info_get, c, &desc, &version, LSM_FLAG_RSVD);
+ G(rc, lsm_plugin_info_get, c, &desc, &version, LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_OK == rc ) {
printf("Desc: (%s), Version: (%s)\n", desc, version);
@@ -1931,13 +1932,13 @@ START_TEST(test_plugin_info)
free(version);
}
- rc = lsm_plugin_info_get(NULL, &desc, &version, LSM_FLAG_RSVD);
+ rc = lsm_plugin_info_get(NULL, &desc, &version, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc = %d", rc);
- rc = lsm_plugin_info_get(c, NULL, &version, LSM_FLAG_RSVD);
+ rc = lsm_plugin_info_get(c, NULL, &version, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc = %d", rc);
- rc = lsm_plugin_info_get(c, &desc, NULL, LSM_FLAG_RSVD);
+ rc = lsm_plugin_info_get(c, &desc, NULL, LSM_CLIENT_FLAG_RSVD);
fail_unless(LSM_ERR_INVALID_ARGUMENT == rc, "rc = %d", rc);
}
END_TEST
@@ -1972,9 +1973,7 @@ START_TEST(test_error_reporting)
void *debug_data = NULL;
uint32_t debug_size = 0;
- lsm_error_ptr e = lsm_error_create( LSM_ERR_LIB_BUG,
- LSM_ERR_DOMAIN_PLUG_IN,
- LSM_ERR_LEVEL_ERROR, msg,
+ lsm_error_ptr e = lsm_error_create(LSM_ERR_LIB_BUG, msg,
exception, debug_msg,
d, sizeof(d));
@@ -1982,8 +1981,6 @@ START_TEST(test_error_reporting)
if( e ) {
fail_unless(LSM_ERR_LIB_BUG == lsm_error_number_get(e));
- fail_unless(LSM_ERR_DOMAIN_PLUG_IN == lsm_error_domain_get(e));
- fail_unless(LSM_ERR_LEVEL_ERROR == lsm_error_level_get(e));
fail_unless(strcmp(msg, lsm_error_message_get(e)) == 0);
fail_unless(strcmp(exception, lsm_error_exception_get(e)) == 0);
fail_unless(strcmp(debug_msg, lsm_error_debug_get(e)) == 0);
@@ -2313,14 +2310,14 @@ START_TEST(test_search_pools)
lsm_pool **pools = NULL;
uint32_t poolCount = 0;
- G(rc, lsm_pool_list, c, NULL, NULL, &pools, &poolCount, LSM_FLAG_RSVD);
+ G(rc, lsm_pool_list, c, NULL, NULL, &pools, &poolCount, LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_OK == rc && poolCount ) {
lsm_pool **search_pools = NULL;
uint32_t search_count = 0;
G(rc, lsm_pool_list, c, "id", lsm_pool_id_get(pools[0]), &search_pools,
- &search_count, LSM_FLAG_RSVD);
+ &search_count, LSM_CLIENT_FLAG_RSVD);
fail_unless(search_count == 1, "Expecting 1 pool, got %d", search_count);
@@ -2331,13 +2328,13 @@ START_TEST(test_search_pools)
search_count = 0;
G(rc, lsm_pool_list, c, "id", "non-existent-id", &search_pools,
- &search_count, LSM_FLAG_RSVD);
+ &search_count, LSM_CLIENT_FLAG_RSVD);
fail_unless(search_count == 0, "Expecting no pools! %d", search_count);
/* Search which results in all pools */
G(rc, lsm_pool_list, c, "system_id", lsm_pool_system_id_get(pools[0]),
&search_pools,
- &search_count, LSM_FLAG_RSVD);
+ &search_count, LSM_CLIENT_FLAG_RSVD);
fail_unless(search_count == poolCount, "Expecting %d pools, got %d",
poolCount, search_count);
@@ -2367,7 +2364,7 @@ START_TEST(test_search_volumes)
create_volumes(c, pool, 10);
G(rc, lsm_volume_list, c, NULL, NULL, &volumes, &volume_count,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
fail_unless(volume_count > 0, "We are expecting some volumes!");
@@ -2377,7 +2374,7 @@ START_TEST(test_search_volumes)
G(rc, lsm_volume_list, c, "id", lsm_volume_id_get(volumes[0]),
&search_volume,
- &search_count, LSM_FLAG_RSVD);
+ &search_count, LSM_CLIENT_FLAG_RSVD);
fail_unless(search_count == 1, "Expecting 1 pool, got %d", search_count);
@@ -2387,14 +2384,14 @@ START_TEST(test_search_volumes)
/* Search for non-existent */
G(rc, lsm_volume_list, c, "id", "non-existent-id", &search_volume,
- &search_count, LSM_FLAG_RSVD);
+ &search_count, LSM_CLIENT_FLAG_RSVD);
fail_unless(search_count == 0, "Expecting no volumes! %d", search_count);
/* Search which results in all volumes */
G(rc, lsm_volume_list, c, "system_id",
lsm_volume_system_id_get(volumes[0]),
&search_volume,
- &search_count, LSM_FLAG_RSVD);
+ &search_count, LSM_CLIENT_FLAG_RSVD);
fail_unless(search_count == volume_count, "Expecting %d volumes, got %d",
volume_count, search_count);
@@ -2422,7 +2419,7 @@ START_TEST(test_search_disks)
lsm_pool *pool = get_test_pool(c);
- G(rc, lsm_disk_list, c, NULL, NULL, &disks, &disk_count, LSM_FLAG_RSVD);
+ G(rc, lsm_disk_list, c, NULL, NULL, &disks, &disk_count, LSM_CLIENT_FLAG_RSVD);
fail_unless(disk_count > 0, "We are expecting some disks!");
if( LSM_ERR_OK == rc && disk_count ) {
@@ -2432,7 +2429,7 @@ START_TEST(test_search_disks)
G(rc, lsm_disk_list, c, "id", lsm_disk_id_get(disks[0]),
&search_disks,
- &search_count, LSM_FLAG_RSVD);
+ &search_count, LSM_CLIENT_FLAG_RSVD);
fail_unless(search_count == 1, "Expecting 1 disk, got %d", search_count);
G(rc, lsm_disk_record_array_free, search_disks, search_count);
@@ -2441,14 +2438,14 @@ START_TEST(test_search_disks)
/* Search for non-existent */
G(rc, lsm_disk_list, c, "id", "non-existent-id", &search_disks,
- &search_count, LSM_FLAG_RSVD);
+ &search_count, LSM_CLIENT_FLAG_RSVD);
fail_unless(search_count == 0, "Expecting no disks! %d", search_count);
/* Search which results in all disks */
G(rc, lsm_disk_list, c, "system_id", lsm_disk_system_id_get(disks[0]),
&search_disks,
- &search_count, LSM_FLAG_RSVD);
+ &search_count, LSM_CLIENT_FLAG_RSVD);
fail_unless(search_count == disk_count, "Expecting %d disks, got %d",
disk_count, search_count);
@@ -2484,7 +2481,7 @@ START_TEST(test_search_access_groups)
G(rc, lsm_access_group_create, c, ag_name, ISCSI_HOST[i],
LSM_ACCESS_GROUP_INIT_TYPE_ISCSI_IQN,
- system, &group, LSM_FLAG_RSVD);
+ system, &group, LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_OK == rc ) {
G(rc, lsm_access_group_record_free, group);
@@ -2495,7 +2492,7 @@ START_TEST(test_search_access_groups)
G(rc, lsm_system_record_free, system);
system = NULL;
- G(rc, lsm_access_group_list, c, NULL, NULL, &ag, &count, LSM_FLAG_RSVD);
+ G(rc, lsm_access_group_list, c, NULL, NULL, &ag, &count, LSM_CLIENT_FLAG_RSVD);
fail_unless(count > 0, "We are expecting some access_groups!");
if( LSM_ERR_OK == rc && count ) {
@@ -2505,7 +2502,7 @@ START_TEST(test_search_access_groups)
G(rc, lsm_access_group_list, c, "id", lsm_access_group_id_get(ag[0]),
&search_ag,
- &search_count, LSM_FLAG_RSVD);
+ &search_count, LSM_CLIENT_FLAG_RSVD);
fail_unless(search_count == 1, "Expecting 1 access group, got %d",
search_count);
@@ -2516,7 +2513,7 @@ START_TEST(test_search_access_groups)
search_count = 0;
G(rc, lsm_access_group_list, c, "id", "non-existent-id", &search_ag,
- &search_count, LSM_FLAG_RSVD);
+ &search_count, LSM_CLIENT_FLAG_RSVD);
fail_unless(search_count == 0, "Expecting no access groups! %d",
search_count);
@@ -2524,7 +2521,7 @@ START_TEST(test_search_access_groups)
G(rc, lsm_access_group_list, c, "system_id",
lsm_access_group_system_id_get(ag[0]),
&search_ag,
- &search_count, LSM_FLAG_RSVD);
+ &search_count, LSM_CLIENT_FLAG_RSVD);
fail_unless(search_count == count, "Expecting %d access groups, got %d",
count, search_count);
@@ -2560,7 +2557,7 @@ START_TEST(test_search_fs)
snprintf(fs_name, sizeof(fs_name), "test_fs_%d", i);
- rc = lsm_fs_create(c, pool, fs_name, 50000000, &fs, &job, LSM_FLAG_RSVD);
+ rc = lsm_fs_create(c, pool, fs_name, 50000000, &fs, &job, LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_JOB_STARTED == rc ) {
fail_unless(NULL == fs);
@@ -2573,7 +2570,7 @@ START_TEST(test_search_fs)
fs = NULL;
}
- G(rc, lsm_fs_list, c, NULL, NULL, &fsl, &count, LSM_FLAG_RSVD);
+ G(rc, lsm_fs_list, c, NULL, NULL, &fsl, &count, LSM_CLIENT_FLAG_RSVD);
fail_unless(count > 0, "We are expecting some file systems!");
if( LSM_ERR_OK == rc && count ) {
@@ -2583,7 +2580,7 @@ START_TEST(test_search_fs)
G(rc, lsm_fs_list, c, "id", lsm_fs_id_get(fsl[0]),
&search_fs,
- &search_count, LSM_FLAG_RSVD);
+ &search_count, LSM_CLIENT_FLAG_RSVD);
fail_unless(search_count == 1, "Expecting 1 fs, got %d",
search_count);
@@ -2594,7 +2591,7 @@ START_TEST(test_search_fs)
/* Search for non-existent */
G(rc, lsm_fs_list, c, "id", "non-existent-id", &search_fs,
- &search_count, LSM_FLAG_RSVD);
+ &search_count, LSM_CLIENT_FLAG_RSVD);
fail_unless(search_count == 0, "Expecting no fs! %d", search_count);
@@ -2602,7 +2599,7 @@ START_TEST(test_search_fs)
G(rc, lsm_fs_list, c, "system_id",
lsm_fs_system_id_get(fsl[0]),
&search_fs,
- &search_count, LSM_FLAG_RSVD);
+ &search_count, LSM_CLIENT_FLAG_RSVD);
fail_unless(search_count == count, "Expecting %d fs, got %d",
count, search_count);
@@ -2634,7 +2631,7 @@ START_TEST(test_target_ports)
int rc = 0;
- G(rc, lsm_target_port_list, c, NULL, NULL, &tp, &count, LSM_FLAG_RSVD);
+ G(rc, lsm_target_port_list, c, NULL, NULL, &tp, &count, LSM_CLIENT_FLAG_RSVD);
if( LSM_ERR_OK == rc ) {
for( i = 0; i < count; ++i ) {
@@ -2667,12 +2664,12 @@ START_TEST(test_target_ports)
G(rc, lsm_target_port_list, c, "id", "does_not_exist",
&search, &search_count,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
fail_unless(search_count == 0, "%d", search_count);
G(rc, lsm_target_port_list, c, "system_id", "sim-01",
&search, &search_count,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
fail_unless(search_count == 5, "%d", search_count);
if( search_count ) {
@@ -2695,7 +2692,7 @@ START_TEST(test_initiator_id_verification)
uint32_t count = 0;
lsm_system *system = get_system(c);
- G(rc, lsm_access_group_list, c, NULL, NULL, &groups, &count, LSM_FLAG_RSVD);
+ G(rc, lsm_access_group_list, c, NULL, NULL, &groups, &count, LSM_CLIENT_FLAG_RSVD);
fail_unless(count == 0, "Expect 0 access groups, got %"PRIu32, count);
fail_unless(groups == NULL);
@@ -2704,12 +2701,12 @@ START_TEST(test_initiator_id_verification)
G(rc, lsm_access_group_create, c, "test_ag_iscsi",
"iqn.1994-05.com.domain.sub:whatever-the.users_wants",
LSM_ACCESS_GROUP_INIT_TYPE_ISCSI_IQN, system,
- &group, LSM_FLAG_RSVD);
+ &group, LSM_CLIENT_FLAG_RSVD);
G(rc, lsm_access_group_initiator_add, c, group,
"iqn.2001-04.com.example:storage:diskarrays-sn-a8675309",
LSM_ACCESS_GROUP_INIT_TYPE_ISCSI_IQN, &updated_group,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
G(rc, lsm_access_group_record_free, group);
group = updated_group;
@@ -2718,7 +2715,7 @@ START_TEST(test_initiator_id_verification)
G(rc, lsm_access_group_initiator_add, c, group,
"iqn.2001-04.com.example",
LSM_ACCESS_GROUP_INIT_TYPE_ISCSI_IQN, &updated_group,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
G(rc, lsm_access_group_record_free, group);
group = updated_group;
@@ -2727,7 +2724,7 @@ START_TEST(test_initiator_id_verification)
G(rc, lsm_access_group_initiator_add, c, group,
"iqn.2001-04.com.example:storage.tape1.sys1.xyz",
LSM_ACCESS_GROUP_INIT_TYPE_ISCSI_IQN, &updated_group,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
G(rc, lsm_access_group_record_free, group);
group = updated_group;
@@ -2736,7 +2733,7 @@ START_TEST(test_initiator_id_verification)
G(rc, lsm_access_group_initiator_add, c, group,
"iqn.2001-04.com.example:storage.disk2.sys1.xyz",
LSM_ACCESS_GROUP_INIT_TYPE_ISCSI_IQN, &updated_group,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
G(rc, lsm_access_group_record_free, group);
group = updated_group;
@@ -2745,7 +2742,7 @@ START_TEST(test_initiator_id_verification)
G(rc, lsm_access_group_initiator_add, c, group,
"0x0011223344556677",
LSM_ACCESS_GROUP_INIT_TYPE_WWPN, &updated_group,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
G(rc, lsm_access_group_record_free, group);
group = updated_group;
@@ -2754,7 +2751,7 @@ START_TEST(test_initiator_id_verification)
G(rc, lsm_access_group_initiator_add, c, group,
"00:11:22:33:44:55:66:78",
LSM_ACCESS_GROUP_INIT_TYPE_WWPN, &updated_group,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
G(rc, lsm_access_group_record_free, group);
group = updated_group;
@@ -2763,7 +2760,7 @@ START_TEST(test_initiator_id_verification)
G(rc, lsm_access_group_initiator_add, c, group,
"00-11-22-33-44-55-66-79",
LSM_ACCESS_GROUP_INIT_TYPE_WWPN, &updated_group,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
G(rc, lsm_access_group_record_free, group);
group = updated_group;
@@ -2772,7 +2769,7 @@ START_TEST(test_initiator_id_verification)
G(rc, lsm_access_group_initiator_add, c, group,
"0x00-11-22-33-44-55-66-80",
LSM_ACCESS_GROUP_INIT_TYPE_WWPN, &updated_group,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
G(rc, lsm_access_group_record_free, group);
group = updated_group;
@@ -2781,7 +2778,7 @@ START_TEST(test_initiator_id_verification)
/* Test invalid */
rc = lsm_access_group_initiator_add(c, group, "0x:0011223344556677",
LSM_ACCESS_GROUP_INIT_TYPE_WWPN, &updated_group,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT,
"Expected initiator id with invalid form to fail! %d", rc);
@@ -2789,7 +2786,7 @@ START_TEST(test_initiator_id_verification)
/* Test invalid iqn */
rc = lsm_access_group_initiator_add(c, group, "0011223344556677:",
LSM_ACCESS_GROUP_INIT_TYPE_WWPN, &updated_group,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT,
"Expected initiator id with invalid form to fail! %d", rc);
@@ -2797,7 +2794,7 @@ START_TEST(test_initiator_id_verification)
/* Test invalid iqn */
rc = lsm_access_group_initiator_add(c, group, "001122334455667788",
LSM_ACCESS_GROUP_INIT_TYPE_WWPN, &updated_group,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT,
"Expected initiator id with invalid form to fail! %d", rc);
@@ -2805,7 +2802,7 @@ START_TEST(test_initiator_id_verification)
/* Test invalid iqn */
rc = lsm_access_group_initiator_add(c, group, "0x001122334455",
LSM_ACCESS_GROUP_INIT_TYPE_WWPN, &updated_group,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT,
"Expected initiator id with invalid form to fail! %d", rc);
@@ -2813,13 +2810,13 @@ START_TEST(test_initiator_id_verification)
/* Test invalid iqn */
rc = lsm_access_group_initiator_add(c, group, "0x00+11:22:33:44:55:66:77",
LSM_ACCESS_GROUP_INIT_TYPE_WWPN, &updated_group,
- LSM_FLAG_RSVD);
+ LSM_CLIENT_FLAG_RSVD);
fail_unless(rc == LSM_ERR_INVALID_ARGUMENT,
"Expected initiator id with invalid form to fail! %d", rc);
/* Delete group */
- G(rc, lsm_access_group_delete, c, group, LSM_FLAG_RSVD);
+ G(rc, lsm_access_group_delete, c, group, LSM_CLIENT_FLAG_RSVD);
G(rc, lsm_access_group_record_free, group);
group = NULL;
diff --git a/tools/Makefile.am b/tools/Makefile.am
index d7815f5..1d41361 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,3 +1,3 @@
## Process this file with automake to produce Makefile.in
-SUBDIRS = lsmcli udev
+SUBDIRS = lsmcli udev utility
diff --git a/tools/lsmcli/data_display.py b/tools/lsmcli/data_display.py
index cc1732f..8fab818 100644
--- a/tools/lsmcli/data_display.py
+++ b/tools/lsmcli/data_display.py
@@ -219,11 +219,11 @@ def ag_init_type_str_to_lsm(init_type_str):
_TGT_PORT_TYPE_CONV = {
- TargetPort.PORT_TYPE_UNKNOWN: 'Unknown',
- TargetPort.PORT_TYPE_OTHER: 'Other',
- TargetPort.PORT_TYPE_FC: 'FC',
- TargetPort.PORT_TYPE_FCOE: 'FCoE',
- TargetPort.PORT_TYPE_ISCSI: 'iSCSI',
+ TargetPort.TYPE_UNKNOWN: 'Unknown',
+ TargetPort.TYPE_OTHER: 'Other',
+ TargetPort.TYPE_FC: 'FC',
+ TargetPort.TYPE_FCOE: 'FCoE',
+ TargetPort.TYPE_ISCSI: 'iSCSI',
}
diff --git a/tools/utility/Makefile.am b/tools/utility/Makefile.am
new file mode 100644
index 0000000..ccd31b9
--- /dev/null
+++ b/tools/utility/Makefile.am
@@ -0,0 +1 @@
+EXTRA_DIST = check_const.pl
--
1.8.2.1
1.8.2.1