summaryrefslogtreecommitdiff
path: root/rest-api
diff options
context:
space:
mode:
authorMark Michelson <mmichelson@digium.com>2015-01-07 18:54:06 +0000
committerMark Michelson <mmichelson@digium.com>2015-01-07 18:54:06 +0000
commit7f836c1c15ce521bf01ab86db27fdfc84967e615 (patch)
tree1649e06a083a0eb7cb6ccda6d0bf148cf4259b4b /rest-api
parente83853eebc901a3b0c6c0b66acc268fa62b3fd32 (diff)
Add the ability to continue and originate using priority labels.
With this patch, the following two ARI commands POST /channels POST /channels/{id}/continue Accept a new parameter, label, that can be used to continue to or originate to a priority label in the dialplan. Because this is adding a new parameter to ARI commands, the API version of ARI has been bumped from 1.6.0 to 1.7.0. This patch comes courtesy of Nir Simionovich from Greenfield Tech. Thanks! ASTERISK-24412 #close Reported by Nir Simionovich Review: https://reviewboard.asterisk.org/r/4285 ........ Merged revisions 430337 from http://svn.asterisk.org/svn/asterisk/branches/13 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@430338 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'rest-api')
-rw-r--r--rest-api/api-docs/channels.json24
-rw-r--r--rest-api/resources.json2
2 files changed, 25 insertions, 1 deletions
diff --git a/rest-api/api-docs/channels.json b/rest-api/api-docs/channels.json
index cd309db10..87dee7c84 100644
--- a/rest-api/api-docs/channels.json
+++ b/rest-api/api-docs/channels.json
@@ -57,6 +57,14 @@
"dataType": "long"
},
{
+ "name": "label",
+ "description": "The label to dial after the endpoint answers. Will supersede 'priority' if provided.",
+ "paramType": "query",
+ "required": false,
+ "allowMultiple": false,
+ "dataType": "string"
+ },
+ {
"name": "app",
"description": "The application that is subscribed to the originated channel, and passed to the Stasis application.",
"paramType": "query",
@@ -205,6 +213,14 @@
"dataType": "long"
},
{
+ "name": "label",
+ "description": "The label to dial after the endpoint answers. Will supersede priority, if provided",
+ "paramType": "query",
+ "required": false,
+ "allowMultiple": false,
+ "dataType": "string"
+ },
+ {
"name": "app",
"description": "The application that is subscribed to the originated channel, and passed to the Stasis application.",
"paramType": "query",
@@ -356,6 +372,14 @@
"required": false,
"allowMultiple": false,
"dataType": "int"
+ },
+ {
+ "name": "label",
+ "description": "The label to continue to - will supersede 'priority' if both are provided.",
+ "paramType": "query",
+ "required": false,
+ "allowMultiple": false,
+ "dataType": "string"
}
],
"errorResponses": [
diff --git a/rest-api/resources.json b/rest-api/resources.json
index 2cc039dc3..4a098f51f 100644
--- a/rest-api/resources.json
+++ b/rest-api/resources.json
@@ -2,7 +2,7 @@
"_copyright": "Copyright (C) 2012 - 2013, Digium, Inc.",
"_author": "David M. Lee, II <dlee@digium.com>",
"_svn_revision": "$Revision$",
- "apiVersion": "1.6.0",
+ "apiVersion": "1.7.0",
"swaggerVersion": "1.1",
"basePath": "http://localhost:8088/ari",
"apis": [