Closes #55, make api version used in responses dynamic

brogand93 · brogand93 · commit c8a361bb3ebf · 2014-06-09T19:51:22.000+01:00
diff --git a/ec2stack/helpers.py b/ec2stack/helpers.py
@@ -309,7 +309,8 @@ def successful_response(**kwargs):
     @param kwargs: Parameters to render the template with.
     @return: Response.
     """
-    content = render_template(request_id=uuid(), **kwargs)
+    api_version = str(get("Version"))
+    content = render_template(request_id=uuid(), api_version=api_version, **kwargs)
     response = make_response(content)
     return _create_response(response, '200')
 
diff --git a/ec2stack/providers/cloudstack/tags.py b/ec2stack/providers/cloudstack/tags.py
@@ -148,5 +148,5 @@ def _describe_tags_response(response):
     return {
         'template_name_or_list': 'tags.xml',
         'response_type': 'DescribeTagsResponse',
-        'response': response
+        'response': response['listtagsresponse']
     }
diff --git a/ec2stack/templates/response.xml b/ec2stack/templates/response.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<{{response_type}}{% if not error %} xmlns="http://ec2.amazonaws.com/doc/2014-05-01/"{%endif%}>
+<{{response_type}}{% if not error %} xmlns="http://ec2.amazonaws.com/doc/{{api_version}}/"{%endif%}>
     {% block response_content %}{% endblock %}
     {% if request_id %}
     <RequestId>{{request_id}}</RequestId>

Original file line number	Diff line number	Diff line change
`@@ -148,5 +148,5 @@ def _describe_tags_response(response):`
`148`	`148`	`return {`
`149`	`149`	`'template_name_or_list': 'tags.xml',`
`150`	`150`	`'response_type': 'DescribeTagsResponse',`
`151`		`- 'response': response`
	`151`	`+ 'response': response['listtagsresponse']`
`152`	`152`	`}`