From e29e918159b7c8e34dffb4cd1409f28936242de3 Mon Sep 17 00:00:00 2001 From: Isaku Yamahata Date: Thu, 9 Apr 2015 14:39:24 -0700 Subject: [PATCH] XML_NS_V20 -> XML_NS_V10 Change-Id: I4a2b42728145ef8e3c17ebeb3b794a5c29c30e9d --- tacker/api/v1/attributes.py | 2 +- tacker/common/constants.py | 2 +- tacker/wsgi.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tacker/api/v1/attributes.py b/tacker/api/v1/attributes.py index 480775de3..82499d658 100644 --- a/tacker/api/v1/attributes.py +++ b/tacker/api/v1/attributes.py @@ -619,6 +619,6 @@ EXT_NSES_BC = {} def get_attr_metadata(): return {'plurals': PLURALS, - 'xmlns': constants.XML_NS_V20, + 'xmlns': constants.XML_NS_V10, constants.EXT_NS: EXT_NSES, constants.EXT_NS_COMP: EXT_NSES_BC} diff --git a/tacker/common/constants.py b/tacker/common/constants.py index 6b3068e0c..9c5957572 100644 --- a/tacker/common/constants.py +++ b/tacker/common/constants.py @@ -18,7 +18,7 @@ EXT_NS_COMP = '_backward_comp_e_ns' EXT_NS = '_extension_ns' -XML_NS_V20 = 'http://openstack.org/tacker/api/v2.0' +XML_NS_V10 = 'http://openstack.org/tacker/api/v1.0' XSI_NAMESPACE = "http://www.w3.org/2001/XMLSchema-instance" XSI_ATTR = "xsi:nil" XSI_NIL_ATTR = "xmlns:xsi" diff --git a/tacker/wsgi.py b/tacker/wsgi.py index 2e5a6cd33..737c44fb6 100644 --- a/tacker/wsgi.py +++ b/tacker/wsgi.py @@ -412,7 +412,7 @@ class XMLDictSerializer(DictSerializer): if not xmlns: xmlns = self.metadata.get('xmlns') if not xmlns: - xmlns = constants.XML_NS_V20 + xmlns = constants.XML_NS_V10 self.xmlns = xmlns def default(self, data): @@ -644,7 +644,7 @@ class XMLDeserializer(TextDeserializer): self.metadata = metadata or {} xmlns = self.metadata.get('xmlns') if not xmlns: - xmlns = constants.XML_NS_V20 + xmlns = constants.XML_NS_V10 self.xmlns = xmlns def _get_key(self, tag):