From e93fbf41e639bc1d3b17c81dab4a3c0812124dcc Mon Sep 17 00:00:00 2001
From: Joshua Colp <jcolp@digium.com>
Date: Sat, 30 Nov 2013 14:12:50 +0000
Subject: [PATCH] res_ari: Add Recording events to the validator. ........
Merged revisions 403240 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@403241 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
res/ari/ari_model_validators.c | 141 +++++++++++++++++++++++++++++++++
res/ari/ari_model_validators.h | 9 +++
rest-api/api-docs/events.json | 3 +
3 files changed, 153 insertions(+)
diff --git a/res/ari/ari_model_validators.c b/res/ari/ari_model_validators.c
index f84a92ed76..7ddef278df 100644
--- a/res/ari/ari_model_validators.c
+++ b/res/ari/ari_model_validators.c
@@ -3032,6 +3032,15 @@ int ast_ari_validate_event(struct ast_json *json)
if (strcmp("PlaybackStarted", discriminator) == 0) {
return ast_ari_validate_playback_started(json);
} else
+ if (strcmp("RecordingFailed", discriminator) == 0) {
+ return ast_ari_validate_recording_failed(json);
+ } else
+ if (strcmp("RecordingFinished", discriminator) == 0) {
+ return ast_ari_validate_recording_finished(json);
+ } else
+ if (strcmp("RecordingStarted", discriminator) == 0) {
+ return ast_ari_validate_recording_started(json);
+ } else
if (strcmp("StasisEnd", discriminator) == 0) {
return ast_ari_validate_stasis_end(json);
} else
@@ -3179,6 +3188,15 @@ int ast_ari_validate_message(struct ast_json *json)
if (strcmp("PlaybackStarted", discriminator) == 0) {
return ast_ari_validate_playback_started(json);
} else
+ if (strcmp("RecordingFailed", discriminator) == 0) {
+ return ast_ari_validate_recording_failed(json);
+ } else
+ if (strcmp("RecordingFinished", discriminator) == 0) {
+ return ast_ari_validate_recording_finished(json);
+ } else
+ if (strcmp("RecordingStarted", discriminator) == 0) {
+ return ast_ari_validate_recording_started(json);
+ } else
if (strcmp("StasisEnd", discriminator) == 0) {
return ast_ari_validate_stasis_end(json);
} else
@@ -3440,9 +3458,40 @@ int ast_ari_validate_recording_failed(struct ast_json *json)
{
int res = 1;
struct ast_json_iter *iter;
+ int has_type = 0;
+ int has_application = 0;
int has_recording = 0;
for (iter = ast_json_object_iter(json); iter; iter = ast_json_object_iter_next(json, iter)) {
+ 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 RecordingFailed field type failed validation\n");
+ res = 0;
+ }
+ } else
+ if (strcmp("application", ast_json_object_iter_key(iter)) == 0) {
+ int prop_is_valid;
+ has_application = 1;
+ prop_is_valid = ast_ari_validate_string(
+ ast_json_object_iter_value(iter));
+ if (!prop_is_valid) {
+ ast_log(LOG_ERROR, "ARI RecordingFailed field application failed validation\n");
+ res = 0;
+ }
+ } else
+ if (strcmp("timestamp", ast_json_object_iter_key(iter)) == 0) {
+ int prop_is_valid;
+ prop_is_valid = ast_ari_validate_date(
+ ast_json_object_iter_value(iter));
+ if (!prop_is_valid) {
+ ast_log(LOG_ERROR, "ARI RecordingFailed field timestamp failed validation\n");
+ res = 0;
+ }
+ } else
if (strcmp("recording", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_recording = 1;
@@ -3461,6 +3510,16 @@ int ast_ari_validate_recording_failed(struct ast_json *json)
}
}
+ if (!has_type) {
+ ast_log(LOG_ERROR, "ARI RecordingFailed missing required field type\n");
+ res = 0;
+ }
+
+ if (!has_application) {
+ ast_log(LOG_ERROR, "ARI RecordingFailed missing required field application\n");
+ res = 0;
+ }
+
if (!has_recording) {
ast_log(LOG_ERROR, "ARI RecordingFailed missing required field recording\n");
res = 0;
@@ -3478,9 +3537,40 @@ int ast_ari_validate_recording_finished(struct ast_json *json)
{
int res = 1;
struct ast_json_iter *iter;
+ int has_type = 0;
+ int has_application = 0;
int has_recording = 0;
for (iter = ast_json_object_iter(json); iter; iter = ast_json_object_iter_next(json, iter)) {
+ 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 RecordingFinished field type failed validation\n");
+ res = 0;
+ }
+ } else
+ if (strcmp("application", ast_json_object_iter_key(iter)) == 0) {
+ int prop_is_valid;
+ has_application = 1;
+ prop_is_valid = ast_ari_validate_string(
+ ast_json_object_iter_value(iter));
+ if (!prop_is_valid) {
+ ast_log(LOG_ERROR, "ARI RecordingFinished field application failed validation\n");
+ res = 0;
+ }
+ } else
+ if (strcmp("timestamp", ast_json_object_iter_key(iter)) == 0) {
+ int prop_is_valid;
+ prop_is_valid = ast_ari_validate_date(
+ ast_json_object_iter_value(iter));
+ if (!prop_is_valid) {
+ ast_log(LOG_ERROR, "ARI RecordingFinished field timestamp failed validation\n");
+ res = 0;
+ }
+ } else
if (strcmp("recording", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_recording = 1;
@@ -3499,6 +3589,16 @@ int ast_ari_validate_recording_finished(struct ast_json *json)
}
}
+ if (!has_type) {
+ ast_log(LOG_ERROR, "ARI RecordingFinished missing required field type\n");
+ res = 0;
+ }
+
+ if (!has_application) {
+ ast_log(LOG_ERROR, "ARI RecordingFinished missing required field application\n");
+ res = 0;
+ }
+
if (!has_recording) {
ast_log(LOG_ERROR, "ARI RecordingFinished missing required field recording\n");
res = 0;
@@ -3516,9 +3616,40 @@ int ast_ari_validate_recording_started(struct ast_json *json)
{
int res = 1;
struct ast_json_iter *iter;
+ int has_type = 0;
+ int has_application = 0;
int has_recording = 0;
for (iter = ast_json_object_iter(json); iter; iter = ast_json_object_iter_next(json, iter)) {
+ 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 RecordingStarted field type failed validation\n");
+ res = 0;
+ }
+ } else
+ if (strcmp("application", ast_json_object_iter_key(iter)) == 0) {
+ int prop_is_valid;
+ has_application = 1;
+ prop_is_valid = ast_ari_validate_string(
+ ast_json_object_iter_value(iter));
+ if (!prop_is_valid) {
+ ast_log(LOG_ERROR, "ARI RecordingStarted field application failed validation\n");
+ res = 0;
+ }
+ } else
+ if (strcmp("timestamp", ast_json_object_iter_key(iter)) == 0) {
+ int prop_is_valid;
+ prop_is_valid = ast_ari_validate_date(
+ ast_json_object_iter_value(iter));
+ if (!prop_is_valid) {
+ ast_log(LOG_ERROR, "ARI RecordingStarted field timestamp failed validation\n");
+ res = 0;
+ }
+ } else
if (strcmp("recording", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_recording = 1;
@@ -3537,6 +3668,16 @@ int ast_ari_validate_recording_started(struct ast_json *json)
}
}
+ if (!has_type) {
+ ast_log(LOG_ERROR, "ARI RecordingStarted missing required field type\n");
+ res = 0;
+ }
+
+ if (!has_application) {
+ ast_log(LOG_ERROR, "ARI RecordingStarted missing required field application\n");
+ res = 0;
+ }
+
if (!has_recording) {
ast_log(LOG_ERROR, "ARI RecordingStarted missing required field recording\n");
res = 0;
diff --git a/res/ari/ari_model_validators.h b/res/ari/ari_model_validators.h
index 979fa4a476..1f9420cb0a 100644
--- a/res/ari/ari_model_validators.h
+++ b/res/ari/ari_model_validators.h
@@ -1212,10 +1212,19 @@ ari_validator ast_ari_validate_application_fn(void);
* - timestamp: Date
* - playback: Playback (required)
* RecordingFailed
+ * - type: string (required)
+ * - application: string (required)
+ * - timestamp: Date
* - recording: LiveRecording (required)
* RecordingFinished
+ * - type: string (required)
+ * - application: string (required)
+ * - timestamp: Date
* - recording: LiveRecording (required)
* RecordingStarted
+ * - type: string (required)
+ * - application: string (required)
+ * - timestamp: Date
* - recording: LiveRecording (required)
* StasisEnd
* - type: string (required)
diff --git a/rest-api/api-docs/events.json b/rest-api/api-docs/events.json
index a342099a81..5195a5bbbd 100644
--- a/rest-api/api-docs/events.json
+++ b/rest-api/api-docs/events.json
@@ -79,6 +79,9 @@
"DeviceStateChanged",
"PlaybackStarted",
"PlaybackFinished",
+ "RecordingStarted",
+ "RecordingFinished",
+ "RecordingFailed",
"ApplicationReplaced",
"BridgeCreated",
"BridgeDestroyed",
--
GitLab