diff options
Diffstat (limited to 'res/ari/ari_model_validators.c')
| -rw-r--r-- | res/ari/ari_model_validators.c | 49 |
1 files changed, 40 insertions, 9 deletions
diff --git a/res/ari/ari_model_validators.c b/res/ari/ari_model_validators.c index 120daf546..26e9b74b7 100644 --- a/res/ari/ari_model_validators.c +++ b/res/ari/ari_model_validators.c @@ -366,18 +366,19 @@ int ast_ari_validate_log_channel(struct ast_json *json) { int res = 1; struct ast_json_iter *iter; - int has_logging_levels = 0; + int has_configuration = 0; int has_name = 0; + int has_status = 0; + int has_type = 0; for (iter = ast_json_object_iter(json); iter; iter = ast_json_object_iter_next(json, iter)) { - if (strcmp("logging_levels", ast_json_object_iter_key(iter)) == 0) { + if (strcmp("configuration", ast_json_object_iter_key(iter)) == 0) { int prop_is_valid; - has_logging_levels = 1; - prop_is_valid = ast_ari_validate_list( - ast_json_object_iter_value(iter), - ast_ari_validate_string); + has_configuration = 1; + prop_is_valid = ast_ari_validate_string( + ast_json_object_iter_value(iter)); if (!prop_is_valid) { - ast_log(LOG_ERROR, "ARI LogChannel field logging_levels failed validation\n"); + ast_log(LOG_ERROR, "ARI LogChannel field configuration failed validation\n"); res = 0; } } else @@ -391,6 +392,26 @@ int ast_ari_validate_log_channel(struct ast_json *json) res = 0; } } else + if (strcmp("status", ast_json_object_iter_key(iter)) == 0) { + int prop_is_valid; + has_status = 1; + prop_is_valid = ast_ari_validate_string( + ast_json_object_iter_value(iter)); + if (!prop_is_valid) { + ast_log(LOG_ERROR, "ARI LogChannel field status failed validation\n"); + res = 0; + } + } else + if (strcmp("type", ast_json_object_iter_key(iter)) == 0) { + int prop_is_valid; + has_type = 1; + prop_is_valid = ast_ari_validate_string( + ast_json_object_iter_value(iter)); + if (!prop_is_valid) { + ast_log(LOG_ERROR, "ARI LogChannel field type failed validation\n"); + res = 0; + } + } else { ast_log(LOG_ERROR, "ARI LogChannel has undocumented field %s\n", @@ -399,8 +420,8 @@ int ast_ari_validate_log_channel(struct ast_json *json) } } - if (!has_logging_levels) { - ast_log(LOG_ERROR, "ARI LogChannel missing required field logging_levels\n"); + if (!has_configuration) { + ast_log(LOG_ERROR, "ARI LogChannel missing required field configuration\n"); res = 0; } @@ -409,6 +430,16 @@ int ast_ari_validate_log_channel(struct ast_json *json) res = 0; } + if (!has_status) { + ast_log(LOG_ERROR, "ARI LogChannel missing required field status\n"); + res = 0; + } + + if (!has_type) { + ast_log(LOG_ERROR, "ARI LogChannel missing required field type\n"); + res = 0; + } + return res; } |