Skip to content

Updating to 4.1.1 API #214

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 3, 2018
Merged

Updating to 4.1.1 API #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions src/ds3.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,11 @@ typedef enum {
DS3_QUIESCED_PENDING,
DS3_QUIESCED_YES
}ds3_quiesced;
typedef enum {
DS3_RESERVED_TASK_TYPE_ANY,
DS3_RESERVED_TASK_TYPE_READ,
DS3_RESERVED_TASK_TYPE_WRITE
}ds3_reserved_task_type;
typedef enum {
DS3_SEVERITY_CRITICAL,
DS3_SEVERITY_WARNING,
Expand Down Expand Up @@ -390,6 +395,7 @@ typedef enum {
DS3_TAPE_TYPE_LTO5,
DS3_TAPE_TYPE_LTO6,
DS3_TAPE_TYPE_LTO7,
DS3_TAPE_TYPE_LTOM8,
DS3_TAPE_TYPE_LTO8,
DS3_TAPE_TYPE_LTO_CLEANING_TAPE,
DS3_TAPE_TYPE_TS_JC,
Expand Down Expand Up @@ -694,8 +700,10 @@ typedef struct {
}ds3_completed_job_response;
typedef struct {
ds3_bool activated;
ds3_bool allow_new_job_requests;
int auto_activate_timeout_in_mins;
ds3_auto_inspect_mode auto_inspect;
int cache_available_retry_after_in_seconds;
ds3_import_conflict_resolution_mode default_import_conflict_resolution_mode;
ds3_priority default_verify_data_after_import;
ds3_bool default_verify_data_prior_to_import;
Expand Down Expand Up @@ -1195,6 +1203,7 @@ typedef struct {
ds3_str* mfg_serial_number;
ds3_str* partition_id;
ds3_quiesced quiesced;
ds3_reserved_task_type reserved_task_type;
ds3_str* serial_number;
ds3_tape_drive_state state;
ds3_str* tape_id;
Expand All @@ -1220,6 +1229,8 @@ typedef struct {
ds3_str* id;
ds3_import_export_configuration import_export_configuration;
ds3_str* library_id;
int minimum_read_reserved_drives;
int minimum_write_reserved_drives;
ds3_str* name;
ds3_quiesced quiesced;
ds3_str* serial_id;
Expand Down Expand Up @@ -1494,6 +1505,8 @@ typedef struct {
ds3_str* id;
ds3_import_export_configuration import_export_configuration;
ds3_str* library_id;
int minimum_read_reserved_drives;
int minimum_write_reserved_drives;
ds3_str* name;
ds3_quiesced quiesced;
ds3_str* serial_id;
Expand Down Expand Up @@ -1552,6 +1565,8 @@ typedef struct {
ds3_str* id;
ds3_import_export_configuration import_export_configuration;
ds3_str* library_id;
int minimum_read_reserved_drives;
int minimum_write_reserved_drives;
ds3_str* name;
ds3_quiesced quiesced;
ds3_str* serial_id;
Expand All @@ -1578,6 +1593,7 @@ typedef struct {
int number_of_type;
}ds3_type_response;
typedef struct {
int elapsed_hours;
uint64_t elapsed_millis;
int elapsed_minutes;
uint64_t elapsed_nanos;
Expand Down Expand Up @@ -2364,6 +2380,7 @@ LIBRARY_API void ds3_request_set_activated(const ds3_request* request, ds3_bool
LIBRARY_API void ds3_request_set_admin_auth_id(const ds3_request* request, const char * const value);
LIBRARY_API void ds3_request_set_admin_secret_key(const ds3_request* request, const char * const value);
LIBRARY_API void ds3_request_set_aggregating(const ds3_request* request, ds3_bool value);
LIBRARY_API void ds3_request_set_allow_new_job_requests(const ds3_request* request, ds3_bool value);
LIBRARY_API void ds3_request_set_always_force_put_job_creation(const ds3_request* request, ds3_bool value);
LIBRARY_API void ds3_request_set_always_minimize_spanning_across_media(const ds3_request* request, ds3_bool value);
LIBRARY_API void ds3_request_set_assigned_to_storage_domain(const ds3_request* request, ds3_bool value);
Expand All @@ -2385,6 +2402,7 @@ LIBRARY_API void ds3_request_set_blobbing_enabled(const ds3_request* request, ds
LIBRARY_API void ds3_request_set_bucket_id(const ds3_request* request, const char * const value);
LIBRARY_API void ds3_request_set_built_in(const ds3_request* request, ds3_bool value);
LIBRARY_API void ds3_request_set_burst_threshold(const ds3_request* request, const float value);
LIBRARY_API void ds3_request_set_cache_available_retry_after_in_seconds(const ds3_request* request, const int value);
LIBRARY_API void ds3_request_set_canceled_due_to_timeout(const ds3_request* request, ds3_bool value);
LIBRARY_API void ds3_request_set_checksum_type_ds3_checksum_type(const ds3_request* request, const ds3_checksum_type value);
LIBRARY_API void ds3_request_set_chunk_client_processing_order_guarantee_ds3_job_chunk_client_processing_order_guarantee(const ds3_request* request, const ds3_job_chunk_client_processing_order_guarantee value);
Expand Down Expand Up @@ -2457,6 +2475,8 @@ LIBRARY_API void ds3_request_set_member_group_id(const ds3_request* request, con
LIBRARY_API void ds3_request_set_member_user_id(const ds3_request* request, const char * const value);
LIBRARY_API void ds3_request_set_minimize_spanning_across_media(const ds3_request* request, ds3_bool value);
LIBRARY_API void ds3_request_set_minimum_days_to_retain(const ds3_request* request, const int value);
LIBRARY_API void ds3_request_set_minimum_read_reserved_drives(const ds3_request* request, const int value);
LIBRARY_API void ds3_request_set_minimum_write_reserved_drives(const ds3_request* request, const int value);
LIBRARY_API void ds3_request_set_name(const ds3_request* request, const char * const value);
LIBRARY_API void ds3_request_set_naming_convention_ds3_naming_convention_type(const ds3_request* request, const ds3_naming_convention_type value);
LIBRARY_API void ds3_request_set_node_id(const ds3_request* request, const char * const value);
Expand Down Expand Up @@ -2496,6 +2516,7 @@ LIBRARY_API void ds3_request_set_region_ds3_s3_region(const ds3_request* request
LIBRARY_API void ds3_request_set_replicate_deletes(const ds3_request* request, ds3_bool value);
LIBRARY_API void ds3_request_set_replicated_user_default_data_policy(const ds3_request* request, const char * const value);
LIBRARY_API void ds3_request_set_request_type_ds3_job_request_type(const ds3_request* request, const ds3_job_request_type value);
LIBRARY_API void ds3_request_set_reserved_task_type_ds3_reserved_task_type(const ds3_request* request, const ds3_reserved_task_type value);
LIBRARY_API void ds3_request_set_roll_back(const ds3_request* request, ds3_bool value);
LIBRARY_API void ds3_request_set_secret_key(const ds3_request* request, const char * const value);
LIBRARY_API void ds3_request_set_secure_media_allocation(const ds3_request* request, ds3_bool value);
Expand Down Expand Up @@ -2806,8 +2827,10 @@ LIBRARY_API ds3_error* ds3_get_data_planner_blob_store_tasks_spectra_s3_request(
* Optional Request Modifiers for ds3_init_modify_data_path_backend_spectra_s3_request
*
* void ds3_request_set_activated(const ds3_request* request, ds3_bool value)
* void ds3_request_set_allow_new_job_requests(const ds3_request* request, ds3_bool value)
* void ds3_request_set_auto_activate_timeout_in_mins(const ds3_request* request, const int value)
* void ds3_request_set_auto_inspect_ds3_auto_inspect_mode(const ds3_request* request, const ds3_auto_inspect_mode value)
* void ds3_request_set_cache_available_retry_after_in_seconds(const ds3_request* request, const int value)
* void ds3_request_set_default_import_conflict_resolution_mode_ds3_import_conflict_resolution_mode(const ds3_request* request, const ds3_import_conflict_resolution_mode value)
* void ds3_request_set_default_verify_data_after_import_ds3_priority(const ds3_request* request, const ds3_priority value)
* void ds3_request_set_default_verify_data_prior_to_import(const ds3_request* request, ds3_bool value)
Expand Down Expand Up @@ -4353,6 +4376,7 @@ LIBRARY_API ds3_error* ds3_get_tape_drive_spectra_s3_request(const ds3_client* c
* void ds3_request_set_page_offset(const ds3_request* request, const int value)
* void ds3_request_set_page_start_marker(const ds3_request* request, const char * const value)
* void ds3_request_set_partition_id(const ds3_request* request, const char * const value)
* void ds3_request_set_reserved_task_type_ds3_reserved_task_type(const ds3_request* request, const ds3_reserved_task_type value)
* void ds3_request_set_serial_number(const ds3_request* request, const char * const value)
* void ds3_request_set_state_ds3_tape_drive_state(const ds3_request* request, const ds3_tape_drive_state value)
* void ds3_request_set_type_ds3_tape_drive_type(const ds3_request* request, const ds3_tape_drive_type value)
Expand Down Expand Up @@ -4513,12 +4537,15 @@ LIBRARY_API ds3_error* ds3_modify_all_tape_partitions_spectra_s3_request(const d
* Optional Request Modifiers for ds3_init_modify_tape_drive_spectra_s3_request
*
* void ds3_request_set_quiesced_ds3_quiesced(const ds3_request* request, const ds3_quiesced value)
* void ds3_request_set_reserved_task_type_ds3_reserved_task_type(const ds3_request* request, const ds3_reserved_task_type value)
*/
LIBRARY_API ds3_request* ds3_init_modify_tape_drive_spectra_s3_request(const char *const resource_id);
LIBRARY_API ds3_error* ds3_modify_tape_drive_spectra_s3_request(const ds3_client* client, const ds3_request* request, ds3_tape_drive_response** response);
/**
* Optional Request Modifiers for ds3_init_modify_tape_partition_spectra_s3_request
*
* void ds3_request_set_minimum_read_reserved_drives(const ds3_request* request, const int value)
* void ds3_request_set_minimum_write_reserved_drives(const ds3_request* request, const int value)
* void ds3_request_set_quiesced_ds3_quiesced(const ds3_request* request, const ds3_quiesced value)
*/
LIBRARY_API ds3_request* ds3_init_modify_tape_partition_spectra_s3_request(const char *const resource_id);
Expand Down
32 changes: 32 additions & 0 deletions src/ds3_init_requests.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,6 +514,18 @@ static char* _get_ds3_tape_drive_type_str(ds3_tape_drive_type input) {
return "";
}

}
static char* _get_ds3_reserved_task_type_str(ds3_reserved_task_type input) {
if (input == DS3_RESERVED_TASK_TYPE_ANY) {
return "ANY";
} else if (input == DS3_RESERVED_TASK_TYPE_READ) {
return "READ";
} else if (input == DS3_RESERVED_TASK_TYPE_WRITE) {
return "WRITE";
} else {
return "";
}

}
static char* _get_ds3_tape_drive_state_str(ds3_tape_drive_state input) {
if (input == DS3_TAPE_DRIVE_STATE_OFFLINE) {
Expand Down Expand Up @@ -882,6 +894,10 @@ void ds3_request_set_admin_secret_key(const ds3_request* request, const char * c
void ds3_request_set_aggregating(const ds3_request* request, ds3_bool value) {
_set_query_param_flag(request, "aggregating", value);

}
void ds3_request_set_allow_new_job_requests(const ds3_request* request, ds3_bool value) {
_set_query_param_flag(request, "allow_new_job_requests", value);

}
void ds3_request_set_always_force_put_job_creation(const ds3_request* request, ds3_bool value) {
_set_query_param_flag(request, "always_force_put_job_creation", value);
Expand Down Expand Up @@ -966,6 +982,10 @@ void ds3_request_set_built_in(const ds3_request* request, ds3_bool value) {
void ds3_request_set_burst_threshold(const ds3_request* request, const float value) {
_set_query_param_float(request, "burst_threshold", value);

}
void ds3_request_set_cache_available_retry_after_in_seconds(const ds3_request* request, const int value) {
_set_query_param_int(request, "cache_available_retry_after_in_seconds", value);

}
void ds3_request_set_canceled_due_to_timeout(const ds3_request* request, ds3_bool value) {
_set_query_param_flag(request, "canceled_due_to_timeout", value);
Expand Down Expand Up @@ -1254,6 +1274,14 @@ void ds3_request_set_minimize_spanning_across_media(const ds3_request* request,
void ds3_request_set_minimum_days_to_retain(const ds3_request* request, const int value) {
_set_query_param_int(request, "minimum_days_to_retain", value);

}
void ds3_request_set_minimum_read_reserved_drives(const ds3_request* request, const int value) {
_set_query_param_int(request, "minimum_read_reserved_drives", value);

}
void ds3_request_set_minimum_write_reserved_drives(const ds3_request* request, const int value) {
_set_query_param_int(request, "minimum_write_reserved_drives", value);

}
void ds3_request_set_name(const ds3_request* request, const char * const value) {
_set_query_param(request, "name", value);
Expand Down Expand Up @@ -1410,6 +1438,10 @@ void ds3_request_set_replicated_user_default_data_policy(const ds3_request* requ
void ds3_request_set_request_type_ds3_job_request_type(const ds3_request* request, const ds3_job_request_type value) {
_set_query_param(request, "request_type", (const char*)_get_ds3_job_request_type_str(value));

}
void ds3_request_set_reserved_task_type_ds3_reserved_task_type(const ds3_request* request, const ds3_reserved_task_type value) {
_set_query_param(request, "reserved_task_type", (const char*)_get_ds3_reserved_task_type_str(value));

}
void ds3_request_set_roll_back(const ds3_request* request, ds3_bool value) {
_set_query_param_flag(request, "roll_back", value);
Expand Down
48 changes: 48 additions & 0 deletions src/ds3_requests.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -931,6 +931,18 @@ static ds3_quiesced _match_ds3_quiesced(const ds3_log* log, const xmlChar* text)
return DS3_QUIESCED_NO;
}
}
static ds3_reserved_task_type _match_ds3_reserved_task_type(const ds3_log* log, const xmlChar* text) {
if (xmlStrcmp(text, (const xmlChar*) "ANY") == 0) {
return DS3_RESERVED_TASK_TYPE_ANY;
} else if (xmlStrcmp(text, (const xmlChar*) "READ") == 0) {
return DS3_RESERVED_TASK_TYPE_READ;
} else if (xmlStrcmp(text, (const xmlChar*) "WRITE") == 0) {
return DS3_RESERVED_TASK_TYPE_WRITE;
} else {
ds3_log_message(log, DS3_ERROR, "ERROR: Unknown value of '%s'. Returning DS3_RESERVED_TASK_TYPE_ANY for safety.", text);
return DS3_RESERVED_TASK_TYPE_ANY;
}
}
static ds3_import_export_configuration _match_ds3_import_export_configuration(const ds3_log* log, const xmlChar* text) {
if (xmlStrcmp(text, (const xmlChar*) "SUPPORTED") == 0) {
return DS3_IMPORT_EXPORT_CONFIGURATION_SUPPORTED;
Expand Down Expand Up @@ -1138,6 +1150,8 @@ static ds3_tape_type _match_ds3_tape_type(const ds3_log* log, const xmlChar* tex
return DS3_TAPE_TYPE_LTO6;
} else if (xmlStrcmp(text, (const xmlChar*) "LTO7") == 0) {
return DS3_TAPE_TYPE_LTO7;
} else if (xmlStrcmp(text, (const xmlChar*) "LTOM8") == 0) {
return DS3_TAPE_TYPE_LTOM8;
} else if (xmlStrcmp(text, (const xmlChar*) "LTO8") == 0) {
return DS3_TAPE_TYPE_LTO8;
} else if (xmlStrcmp(text, (const xmlChar*) "LTO_CLEANING_TAPE") == 0) {
Expand Down Expand Up @@ -3857,6 +3871,13 @@ static ds3_error* _parse_ds3_tape_drive_response(const ds3_client* client, const
}
response->quiesced = _match_ds3_quiesced(client->log, text);
xmlFree(text);
} else if (element_equal(child_node, "ReservedTaskType")) {
xmlChar* text = xmlNodeListGetString(doc, child_node, 1);
if (text == NULL) {
continue;
}
response->reserved_task_type = _match_ds3_reserved_task_type(client->log, text);
xmlFree(text);
} else if (element_equal(child_node, "SerialNumber")) {
response->serial_number = xml_get_string(doc, child_node);
} else if (element_equal(child_node, "State")) {
Expand Down Expand Up @@ -3995,6 +4016,10 @@ static ds3_error* _parse_ds3_tape_partition_response(const ds3_client* client, c
xmlFree(text);
} else if (element_equal(child_node, "LibraryId")) {
response->library_id = xml_get_string(doc, child_node);
} else if (element_equal(child_node, "MinimumReadReservedDrives")) {
response->minimum_read_reserved_drives = xml_get_uint16(doc, child_node);
} else if (element_equal(child_node, "MinimumWriteReservedDrives")) {
response->minimum_write_reserved_drives = xml_get_uint16(doc, child_node);
} else if (element_equal(child_node, "Name")) {
response->name = xml_get_string(doc, child_node);
} else if (element_equal(child_node, "Quiesced")) {
Expand Down Expand Up @@ -5271,6 +5296,10 @@ static ds3_error* _parse_ds3_named_detailed_tape_partition_response(const ds3_cl
xmlFree(text);
} else if (element_equal(child_node, "LibraryId")) {
response->library_id = xml_get_string(doc, child_node);
} else if (element_equal(child_node, "MinimumReadReservedDrives")) {
response->minimum_read_reserved_drives = xml_get_uint16(doc, child_node);
} else if (element_equal(child_node, "MinimumWriteReservedDrives")) {
response->minimum_write_reserved_drives = xml_get_uint16(doc, child_node);
} else if (element_equal(child_node, "Name")) {
response->name = xml_get_string(doc, child_node);
} else if (element_equal(child_node, "Quiesced")) {
Expand Down Expand Up @@ -6227,6 +6256,8 @@ static ds3_error* _parse_top_level_ds3_data_path_backend_response(const ds3_clie
for (child_node = root->xmlChildrenNode; child_node != NULL; child_node = child_node->next) {
if (element_equal(child_node, "Activated")) {
response->activated = xml_get_bool(client->log, doc, child_node);
} else if (element_equal(child_node, "AllowNewJobRequests")) {
response->allow_new_job_requests = xml_get_bool(client->log, doc, child_node);
} else if (element_equal(child_node, "AutoActivateTimeoutInMins")) {
response->auto_activate_timeout_in_mins = xml_get_uint16(doc, child_node);
} else if (element_equal(child_node, "AutoInspect")) {
Expand All @@ -6236,6 +6267,8 @@ static ds3_error* _parse_top_level_ds3_data_path_backend_response(const ds3_clie
}
response->auto_inspect = _match_ds3_auto_inspect_mode(client->log, text);
xmlFree(text);
} else if (element_equal(child_node, "CacheAvailableRetryAfterInSeconds")) {
response->cache_available_retry_after_in_seconds = xml_get_uint16(doc, child_node);
} else if (element_equal(child_node, "DefaultImportConflictResolutionMode")) {
xmlChar* text = xmlNodeListGetString(doc, child_node, 1);
if (text == NULL) {
Expand Down Expand Up @@ -8577,6 +8610,13 @@ static ds3_error* _parse_top_level_ds3_tape_drive_response(const ds3_client* cli
}
response->quiesced = _match_ds3_quiesced(client->log, text);
xmlFree(text);
} else if (element_equal(child_node, "ReservedTaskType")) {
xmlChar* text = xmlNodeListGetString(doc, child_node, 1);
if (text == NULL) {
continue;
}
response->reserved_task_type = _match_ds3_reserved_task_type(client->log, text);
xmlFree(text);
} else if (element_equal(child_node, "SerialNumber")) {
response->serial_number = xml_get_string(doc, child_node);
} else if (element_equal(child_node, "State")) {
Expand Down Expand Up @@ -8695,6 +8735,10 @@ static ds3_error* _parse_top_level_ds3_tape_partition_response(const ds3_client*
xmlFree(text);
} else if (element_equal(child_node, "LibraryId")) {
response->library_id = xml_get_string(doc, child_node);
} else if (element_equal(child_node, "MinimumReadReservedDrives")) {
response->minimum_read_reserved_drives = xml_get_uint16(doc, child_node);
} else if (element_equal(child_node, "MinimumWriteReservedDrives")) {
response->minimum_write_reserved_drives = xml_get_uint16(doc, child_node);
} else if (element_equal(child_node, "Name")) {
response->name = xml_get_string(doc, child_node);
} else if (element_equal(child_node, "Quiesced")) {
Expand Down Expand Up @@ -9420,6 +9464,10 @@ static ds3_error* _parse_top_level_ds3_detailed_tape_partition_response(const ds
xmlFree(text);
} else if (element_equal(child_node, "LibraryId")) {
response->library_id = xml_get_string(doc, child_node);
} else if (element_equal(child_node, "MinimumReadReservedDrives")) {
response->minimum_read_reserved_drives = xml_get_uint16(doc, child_node);
} else if (element_equal(child_node, "MinimumWriteReservedDrives")) {
response->minimum_write_reserved_drives = xml_get_uint16(doc, child_node);
} else if (element_equal(child_node, "Name")) {
response->name = xml_get_string(doc, child_node);
} else if (element_equal(child_node, "Quiesced")) {
Expand Down