summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Galarneau <sgalarneau@digium.com>2014-07-03 16:14:39 +0000
committerSam Galarneau <sgalarneau@digium.com>2014-07-03 16:14:39 +0000
commitaa370d6105e4d69fc6fc6c72baecfbf5d51534ef (patch)
treeafbaa01f2ec7897e3482823bc7ef89a16bb66a1d
parent5db3f38d5a8d49e4d07e6342b4557092496d28de (diff)
ARI: Improvements to body parameters documentation
The variables body parameter under the originate and originate with id operations of the channel resource showed invalid JSON in its description. The variables body parameter under the userEvent operation of the event resource made no mention that the custom key/value pairs should be wrapped in a variables key in order to be added to the custom user event. ASTERISK-23975 #close Review: https://reviewboard.asterisk.org/r/3692/ ........ Merged revisions 417878 from http://svn.asterisk.org/svn/asterisk/branches/12 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@417879 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r--res/ari/resource_channels.h4
-rw-r--r--res/ari/resource_events.h2
-rw-r--r--rest-api/api-docs/channels.json4
-rw-r--r--rest-api/api-docs/events.json2
4 files changed, 6 insertions, 6 deletions
diff --git a/res/ari/resource_channels.h b/res/ari/resource_channels.h
index 315ec7868..104e1bdb3 100644
--- a/res/ari/resource_channels.h
+++ b/res/ari/resource_channels.h
@@ -68,7 +68,7 @@ struct ast_ari_channels_originate_args {
const char *caller_id;
/*! Timeout (in seconds) before giving up dialing, or -1 for no timeout. */
int timeout;
- /*! The 'variables' key in the body object holds variable key/value pairs to set on the channel on creation. Other keys in the body object are interpreted as query parameters. Ex. { 'endpoint': 'SIP/Alice', 'variables': { 'CALLERID(name)': 'Alice' } } */
+ /*! The "variables" key in the body object holds variable key/value pairs to set on the channel on creation. Other keys in the body object are interpreted as query parameters. Ex. { "endpoint": "SIP/Alice", "variables": { "CALLERID(name)": "Alice" } } */
struct ast_json *variables;
/*! The unique id to assign the channel on creation. */
const char *channel_id;
@@ -129,7 +129,7 @@ struct ast_ari_channels_originate_with_id_args {
const char *caller_id;
/*! Timeout (in seconds) before giving up dialing, or -1 for no timeout. */
int timeout;
- /*! The 'variables' key in the body object holds variable key/value pairs to set on the channel on creation. Other keys in the body object are interpreted as query parameters. Ex. { 'endpoint': 'SIP/Alice', 'variables': { 'CALLERID(name)': 'Alice' } } */
+ /*! The "variables" key in the body object holds variable key/value pairs to set on the channel on creation. Other keys in the body object are interpreted as query parameters. Ex. { "endpoint": "SIP/Alice", "variables": { "CALLERID(name)": "Alice" } } */
struct ast_json *variables;
/*! The unique id to assign the second channel when using local channels. */
const char *other_channel_id;
diff --git a/res/ari/resource_events.h b/res/ari/resource_events.h
index 021a59636..646cf9bfc 100644
--- a/res/ari/resource_events.h
+++ b/res/ari/resource_events.h
@@ -68,7 +68,7 @@ struct ast_ari_events_user_event_args {
size_t source_count;
/*! Parsing context for source. */
char *source_parse;
- /*! custom key/value pairs added to the user event */
+ /*! The "variables" key in the body object holds custom key/value pairs to add to the user event. Ex. { "variables": { "key": "value" } } */
struct ast_json *variables;
};
/*!
diff --git a/rest-api/api-docs/channels.json b/rest-api/api-docs/channels.json
index 997c34501..96dbebd7d 100644
--- a/rest-api/api-docs/channels.json
+++ b/rest-api/api-docs/channels.json
@@ -91,7 +91,7 @@
},
{
"name": "variables",
- "description": "The 'variables' key in the body object holds variable key/value pairs to set on the channel on creation. Other keys in the body object are interpreted as query parameters. Ex. { 'endpoint': 'SIP/Alice', 'variables': { 'CALLERID(name)': 'Alice' } }",
+ "description": "The \"variables\" key in the body object holds variable key/value pairs to set on the channel on creation. Other keys in the body object are interpreted as query parameters. Ex. { \"endpoint\": \"SIP/Alice\", \"variables\": { \"CALLERID(name)\": \"Alice\" } }",
"paramType": "body",
"required": false,
"dataType": "containers",
@@ -231,7 +231,7 @@
},
{
"name": "variables",
- "description": "The 'variables' key in the body object holds variable key/value pairs to set on the channel on creation. Other keys in the body object are interpreted as query parameters. Ex. { 'endpoint': 'SIP/Alice', 'variables': { 'CALLERID(name)': 'Alice' } }",
+ "description": "The \"variables\" key in the body object holds variable key/value pairs to set on the channel on creation. Other keys in the body object are interpreted as query parameters. Ex. { \"endpoint\": \"SIP/Alice\", \"variables\": { \"CALLERID(name)\": \"Alice\" } }",
"paramType": "body",
"required": false,
"dataType": "containers",
diff --git a/rest-api/api-docs/events.json b/rest-api/api-docs/events.json
index a6879e858..3d07e3613 100644
--- a/rest-api/api-docs/events.json
+++ b/rest-api/api-docs/events.json
@@ -67,7 +67,7 @@
},
{
"name": "variables",
- "description": "custom key/value pairs added to the user event",
+ "description": "The \"variables\" key in the body object holds custom key/value pairs to add to the user event. Ex. { \"variables\": { \"key\": \"value\" } }",
"paramType": "body",
"required": false,
"allowMultiple": false,