Merge "Fix XML namespaces for limits extensions and versions"

9 files changed, 9 insertions, 8 deletions

diff --git a/nova/api/openstack/compute/limits.py b/nova/api/openstack/compute/limits.py
index 4d533d522..c45f7a21c 100644
--- a/nova/api/openstack/compute/limits.py
+++ b/nova/api/openstack/compute/limits.py
@@ -43,7 +43,7 @@ PER_HOUR = 60 * 60
 PER_DAY = 60 * 60 * 24
 
 
-limits_nsmap = {None: xmlutil.XMLNS_V11, 'atom': xmlutil.XMLNS_ATOM}
+limits_nsmap = {None: xmlutil.XMLNS_COMMON_V10, 'atom': xmlutil.XMLNS_ATOM}
 
 
 class LimitsTemplate(xmlutil.TemplateBuilder):
diff --git a/nova/api/openstack/compute/schemas/v1.1/extension.rng b/nova/api/openstack/compute/schemas/v1.1/extension.rng
index 336659755..b16d8c130 100644
--- a/nova/api/openstack/compute/schemas/v1.1/extension.rng
+++ b/nova/api/openstack/compute/schemas/v1.1/extension.rng
@@ -1,4 +1,4 @@
-<element name="extension" ns="http://docs.openstack.org/compute/api/v1.1"
+<element name="extension" ns="http://docs.openstack.org/common/api/v1.0"
     xmlns="http://relaxng.org/ns/structure/1.0">
   <attribute name="alias">     <text/> </attribute>
   <attribute name="name">      <text/> </attribute>
diff --git a/nova/api/openstack/compute/schemas/v1.1/extensions.rng b/nova/api/openstack/compute/schemas/v1.1/extensions.rng
index 4d8bff646..8538eaf2d 100644
--- a/nova/api/openstack/compute/schemas/v1.1/extensions.rng
+++ b/nova/api/openstack/compute/schemas/v1.1/extensions.rng
@@ -1,5 +1,5 @@
 <element name="extensions" xmlns="http://relaxng.org/ns/structure/1.0"
-         ns="http://docs.openstack.org/compute/api/v1.1">
+         ns="http://docs.openstack.org/common/api/v1.0">
   <zeroOrMore>
     <externalRef href="extension.rng"/>
   </zeroOrMore>
diff --git a/nova/api/openstack/compute/schemas/v1.1/limits.rng b/nova/api/openstack/compute/schemas/v1.1/limits.rng
index 1af8108ec..a66af4b9c 100644
--- a/nova/api/openstack/compute/schemas/v1.1/limits.rng
+++ b/nova/api/openstack/compute/schemas/v1.1/limits.rng
@@ -1,4 +1,4 @@
-<element name="limits" ns="http://docs.openstack.org/compute/api/v1.1"
+<element name="limits" ns="http://docs.openstack.org/common/api/v1.0"
   xmlns="http://relaxng.org/ns/structure/1.0">
   <element name="rates">
     <zeroOrMore>
diff --git a/nova/api/openstack/compute/schemas/v1.1/version.rng b/nova/api/openstack/compute/schemas/v1.1/version.rng
index ae76270ba..5b36fe8db 100644
--- a/nova/api/openstack/compute/schemas/v1.1/version.rng
+++ b/nova/api/openstack/compute/schemas/v1.1/version.rng
@@ -1,4 +1,4 @@
-<element name="version" ns="http://docs.openstack.org/compute/api/v1.1"
+<element name="version" ns="http://docs.openstack.org/common/api/v1.0"
     xmlns="http://relaxng.org/ns/structure/1.0">
   <attribute name="id"/>
   <attribute name="status"/>
diff --git a/nova/api/openstack/compute/schemas/v1.1/versions.rng b/nova/api/openstack/compute/schemas/v1.1/versions.rng
index 8b2cc7f71..4b5d73645 100644
--- a/nova/api/openstack/compute/schemas/v1.1/versions.rng
+++ b/nova/api/openstack/compute/schemas/v1.1/versions.rng
@@ -1,5 +1,5 @@
 <element name="versions" xmlns="http://relaxng.org/ns/structure/1.0"
-         ns="http://docs.openstack.org/compute/api/v1.1">
+         ns="http://docs.openstack.org/common/api/v1.0">
   <oneOrMore>
     <element name="version">
       <attribute name="id"/>
diff --git a/nova/api/openstack/compute/versions.py b/nova/api/openstack/compute/versions.py
index 3ba8d80d7..b964d87fe 100644
--- a/nova/api/openstack/compute/versions.py
+++ b/nova/api/openstack/compute/versions.py
@@ -85,7 +85,7 @@ def make_version(elem):
     xmlutil.make_links(elem, 'links')
 
 
-version_nsmap = {None: xmlutil.XMLNS_V11, 'atom': xmlutil.XMLNS_ATOM}
+version_nsmap = {None: xmlutil.XMLNS_COMMON_V10, 'atom': xmlutil.XMLNS_ATOM}
 
 
 class VersionTemplate(xmlutil.TemplateBuilder):
diff --git a/nova/api/openstack/extensions.py b/nova/api/openstack/extensions.py
index 87d215974..055b16a7b 100644
--- a/nova/api/openstack/extensions.py
+++ b/nova/api/openstack/extensions.py
@@ -112,7 +112,7 @@ def make_ext(elem):
     xmlutil.make_links(elem, 'links')
 
 
-ext_nsmap = {None: xmlutil.XMLNS_V11, 'atom': xmlutil.XMLNS_ATOM}
+ext_nsmap = {None: xmlutil.XMLNS_COMMON_V10, 'atom': xmlutil.XMLNS_ATOM}
 
 
 class ExtensionTemplate(xmlutil.TemplateBuilder):
diff --git a/nova/api/openstack/xmlutil.py b/nova/api/openstack/xmlutil.py
index e5f83a3e5..290732759 100644
--- a/nova/api/openstack/xmlutil.py
+++ b/nova/api/openstack/xmlutil.py
@@ -24,6 +24,7 @@ from nova import utils
 
 XMLNS_V10 = 'http://docs.rackspacecloud.com/servers/api/v1.0'
 XMLNS_V11 = 'http://docs.openstack.org/compute/api/v1.1'
+XMLNS_COMMON_V10 = 'http://docs.openstack.org/common/api/v1.0'
 XMLNS_ATOM = 'http://www.w3.org/2005/Atom'