kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-02 11:06:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "rest-api: Swagger scripts were not replacing format variable in file brief"

Browse Source
This commit is contained in:
zuul
2016-08-19 13:20:17 -05:00
committed by Gerrit Code Review
parent be26a93687 7ea133f2ab
commit 8932877044
12 changed files with 72 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rest-api-templates/swagger_model.py
View File

@@ -691,7 +691,7 @@ class ResourceApi(Stringify):
def load(self, api_json, processor, context):
context = context.next_stack(api_json, 'path')
validate_required_fields(api_json, self.required_fields, context)
self.path = api_json['path']
self.path = api_json['path'].replace('{format}', 'json')
self.description = api_json['description']
if not self.path or self.path[0] != '/':
@@ -700,7 +700,7 @@ class ResourceApi(Stringify):
return self
def load_api_declaration(self, base_dir, processor):
self.file = (base_dir + self.path).replace('{format}', 'json')
self.file = (base_dir + self.path)
self.api_declaration = ApiDeclaration().load_file(self.file, processor)
processor.process_resource_api(self, [self.file])