[asterisk-commits] kmoore: trunk r401019 - in /trunk: ./ res/ rest-api/api-docs/

[SVN commits to the Asterisk project]

Author: kmoore
Date: Tue Oct 15 15:03:19 2013
New Revision: 401019

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=401019
Log:
Ensure bridge record error responses validate

This adds the list of expected errors to the /bridges/{bridgeId}/record
ARI documentation so that outbound 4xx errors validate properly.
Previously, this would result in a response validation failure.

(closes issue ASTERISK-22627)
Reported by: Joshua Colp
........

Merged revisions 401018 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)
    trunk/res/res_ari_bridges.c
    trunk/rest-api/api-docs/bridges.json

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.

Modified: trunk/res/res_ari_bridges.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_ari_bridges.c?view=diff&rev=401019&r1=401018&r2=401019
==============================================================================
--- trunk/res/res_ari_bridges.c (original)
+++ trunk/res/res_ari_bridges.c Tue Oct 15 15:03:19 2013
@@ -742,6 +742,9 @@
 		break;
 	case 500: /* Internal Server Error */
 	case 501: /* Not Implemented */
+	case 400: /* Recording name invalid */
+	case 404: /* Bridge not found */
+	case 409: /* Bridge not in Stasis application; Recording already in progress */
 		is_valid = 1;
 		break;
 	default:

Modified: trunk/rest-api/api-docs/bridges.json
URL: http://svnview.digium.com/svn/asterisk/trunk/rest-api/api-docs/bridges.json?view=diff&rev=401019&r1=401018&r2=401019
==============================================================================
--- trunk/rest-api/api-docs/bridges.json (original)
+++ trunk/rest-api/api-docs/bridges.json Tue Oct 15 15:03:19 2013
@@ -452,6 +452,20 @@
 									"#"
 								]
 							}
+						}
+					],
+					"errorResponses": [
+						{
+							"code": 400,
+							"reason": "Recording name invalid"
+						},
+						{
+							"code": 404,
+							"reason": "Bridge not found"
+						},
+						{
+							"code": 409,
+							"reason": "Bridge not in Stasis application; Recording already in progress"
 						}
 					]
 				}