mirror of
https://dev.iopsys.eu/bbf/bbfdm.git
synced 2026-03-11 03:39:11 +01:00
Extended fault code mapping for usp
This commit is contained in:
vdutta
Amin Ben Ramdhane
parent
3d740e4a66
commit
991fb4a74d
2 changed files with 116 additions and 38 deletions
113
dmentry.c
113
dmentry.c
|
|
@ -31,47 +31,84 @@ unsigned char dmcli_evaluatetest = 0;
|
|||
|
||||
int usp_fault_map(int fault)
|
||||
{
|
||||
int usp_fault;
|
||||
int out_fault;
|
||||
|
||||
if (bbfdatamodel_type != BBFDM_USP)
|
||||
return fault;
|
||||
|
||||
switch(fault) {
|
||||
case FAULT_9000:
|
||||
usp_fault = 7001;
|
||||
break;
|
||||
case FAULT_9001:
|
||||
usp_fault = 7002;
|
||||
break;
|
||||
case FAULT_9002:
|
||||
usp_fault = 7003;
|
||||
break;
|
||||
case FAULT_9003:
|
||||
usp_fault = 7004;
|
||||
break;
|
||||
case FAULT_9004:
|
||||
usp_fault = 7005;
|
||||
break;
|
||||
case FAULT_9005:
|
||||
usp_fault = 7026;
|
||||
break;
|
||||
case FAULT_9006:
|
||||
usp_fault = 7011;
|
||||
break;
|
||||
case FAULT_9007:
|
||||
usp_fault = 7012;
|
||||
break;
|
||||
case FAULT_9008:
|
||||
usp_fault = 7013;
|
||||
break;
|
||||
case FAULT_9027:
|
||||
usp_fault = 7013;
|
||||
break;
|
||||
default:
|
||||
usp_fault = fault;
|
||||
if (bbfdatamodel_type == BBFDM_USP) {
|
||||
switch(fault) {
|
||||
case FAULT_9000:
|
||||
out_fault = USP_FAULT_MESSAGE_NOT_UNDERSTOOD;
|
||||
break;
|
||||
case FAULT_9001:
|
||||
out_fault = USP_FAULT_REQUEST_DENIED;
|
||||
break;
|
||||
case FAULT_9002:
|
||||
out_fault = USP_FAULT_INTERNAL_ERROR;
|
||||
break;
|
||||
case FAULT_9003:
|
||||
out_fault = USP_FAULT_INVALID_ARGUMENT;
|
||||
break;
|
||||
case FAULT_9004:
|
||||
case FAULT_9027:
|
||||
out_fault = USP_FAULT_RESOURCES_EXCEEDED;
|
||||
break;
|
||||
case FAULT_9005:
|
||||
out_fault = USP_FAULT_INVALID_PATH;
|
||||
break;
|
||||
case FAULT_9006:
|
||||
out_fault = USP_FAULT_INVALID_TYPE;
|
||||
break;
|
||||
case FAULT_9007:
|
||||
out_fault = USP_FAULT_INVALID_VALUE;
|
||||
break;
|
||||
case FAULT_9008:
|
||||
out_fault = USP_FAULT_PARAM_READ_ONLY;
|
||||
break;
|
||||
default:
|
||||
if (fault)
|
||||
out_fault = USP_FAULT_GENERAL_FAILURE;
|
||||
else
|
||||
out_fault = fault;
|
||||
}
|
||||
} else if (bbfdatamodel_type == BBFDM_CWMP) {
|
||||
switch(fault) {
|
||||
case USP_FAULT_GENERAL_FAILURE:
|
||||
out_fault = FAULT_9002;
|
||||
break;
|
||||
case USP_FAULT_MESSAGE_NOT_UNDERSTOOD:
|
||||
out_fault = FAULT_9000;
|
||||
break;
|
||||
case USP_FAULT_REQUEST_DENIED:
|
||||
out_fault = FAULT_9001;
|
||||
break;
|
||||
case USP_FAULT_INTERNAL_ERROR:
|
||||
out_fault = FAULT_9002;
|
||||
break;
|
||||
case USP_FAULT_INVALID_ARGUMENT:
|
||||
out_fault = FAULT_9003;
|
||||
break;
|
||||
case USP_FAULT_RESOURCES_EXCEEDED:
|
||||
out_fault = FAULT_9004;
|
||||
break;
|
||||
case USP_FAULT_INVALID_TYPE:
|
||||
out_fault = FAULT_9006;
|
||||
break;
|
||||
case USP_FAULT_INVALID_VALUE:
|
||||
out_fault = FAULT_9007;
|
||||
break;
|
||||
case USP_FAULT_PARAM_READ_ONLY:
|
||||
out_fault = FAULT_9008;
|
||||
break;
|
||||
case USP_FAULT_INVALID_PATH:
|
||||
out_fault = FAULT_9005;
|
||||
break;
|
||||
default:
|
||||
out_fault = fault;
|
||||
}
|
||||
} else {
|
||||
out_fault = fault;
|
||||
}
|
||||
|
||||
return usp_fault;
|
||||
return out_fault;
|
||||
}
|
||||
|
||||
static void print_dm_help(void)
|
||||
|
|
|
|||
|
|
@ -349,6 +349,47 @@ enum {
|
|||
CMD_EXTERNAL_COMMAND
|
||||
};
|
||||
|
||||
enum usp_fault_code_enum {
|
||||
USP_FAULT_GENERAL_FAILURE = 7000, // general failure
|
||||
USP_FAULT_MESSAGE_NOT_UNDERSTOOD = 7001, // message was not understood
|
||||
USP_FAULT_REQUEST_DENIED = 7002, // Cannot or will not process message
|
||||
USP_FAULT_INTERNAL_ERROR = 7003, // Message failed due to an internal error
|
||||
USP_FAULT_INVALID_ARGUMENT = 7004, // invalid values in the request elements
|
||||
USP_FAULT_RESOURCES_EXCEEDED = 7005, // Message failed due to memory or processing limitations
|
||||
USP_FAULT_PERMISSION_DENIED = 7006, // Source endpoint does not have authorisation to use this message
|
||||
USP_FAULT_INVALID_CONFIGURATION = 7007, // invalid or unstable state
|
||||
|
||||
// ParamError codes
|
||||
USP_FAULT_INVALID_PATH_SYNTAX = 7008, // Requested path was invalid or a reference was invalid
|
||||
USP_FAULT_PARAM_ACTION_FAILED = 7009, // Parameter failed to update for a general reason described in an err_msg element.
|
||||
USP_FAULT_UNSUPPORTED_PARAM = 7010, // Requested Path Name associated with this ParamError did not match any instantiated parameters
|
||||
USP_FAULT_INVALID_TYPE = 7011, // Unable to convert string value to correct data type
|
||||
USP_FAULT_INVALID_VALUE = 7012, // Out of range or invalid enumeration
|
||||
USP_FAULT_PARAM_READ_ONLY = 7013, // Attempted to write to a read only parameter
|
||||
USP_FAULT_VALUE_CONFLICT = 7014, // Requested value would result in an invalid configuration
|
||||
|
||||
USP_FAULT_CRUD_FAILURE = 7015, // General failure to perform the CRUD operation
|
||||
USP_FAULT_OBJECT_DOES_NOT_EXIST = 7016, // Requested object instance does not exist
|
||||
USP_FAULT_CREATION_FAILURE = 7017, // General failure to create the object
|
||||
USP_FAULT_NOT_A_TABLE = 7018, // The requested pathname was expected to be a multi-instance object, but wasn't
|
||||
USP_FAULT_OBJECT_NOT_CREATABLE = 7019, // Attempted to create an object which was non-creatable (for non-writable multi-instance objects)
|
||||
USP_FAULT_SET_FAILURE = 7020, // General failure to set a parameter
|
||||
USP_FAULT_REQUIRED_PARAM_FAILED = 7021, // The CRUD operation failed because a required parameter failed to update
|
||||
|
||||
USP_FAULT_COMMAND_FAILURE = 7022, // Command failed to operate
|
||||
USP_FAULT_COMMAND_CANCELLED = 7023, // Command failed to complete because it was cancelled
|
||||
USP_FAULT_OBJECT_NOT_DELETABLE = 7024, // Attempted to delete an object which was non-deletable, or object failed to be deleted
|
||||
USP_FAULT_UNIQUE_KEY_CONFLICT = 7025, // unique keys would conflict
|
||||
USP_FAULT_INVALID_PATH = 7026, // Path is not present in the data model schema
|
||||
|
||||
// Brokered USP Record Errors
|
||||
USP_FAULT_RECORD_NOT_PARSED = 7100, // Record could not be parsed
|
||||
USP_FAULT_SECURE_SESS_REQUIRED = 7101, // A secure session must be started before pasing any records
|
||||
USP_FAULT_SECURE_SESS_NOT_SUPPORTED = 7102, // Secure session is not supported by this endpoint
|
||||
USP_FAULT_SEG_NOT_SUPPORTED = 7103, // Segmentation and reassembly is not supported by this endpoint
|
||||
USP_FAULT_RECORD_FIELD_INVALID = 7104, // A USP record field was invalid
|
||||
};
|
||||
|
||||
enum fault_code_enum {
|
||||
FAULT_9000 = 9000,// Method not supported
|
||||
FAULT_9001,// Request denied
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue