Bug 888170: Fixing references to incorrect schema.

Change-Id: I738d8c45078a17481856a3b2661fa9436d86df78
openstack · Nov 9, 2011 · fb98f6b · fb98f6b
1 parent 009f2c9
commit fb98f6b
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/keystone/logic/types/endpoint.py b/keystone/logic/types/endpoint.py
@@ -29,7 +29,7 @@ def from_xml(xml_str):
             dom.append(etree.fromstring(xml_str))
             root = dom.find(
                 "{http://docs.openstack.org/identity"\
-                "/api/ext/OSKSCATALOG/v1.0}" \
+                "/api/ext/OS-KSCATALOG/v1.0}" \
                 "endpointTemplate")
             if root == None:
                 raise fault.BadRequestFault("Expecting endpointTemplate")
@@ -155,7 +155,7 @@ def __init__(self, id, region, name, type, public_url, admin_url,
     def to_dom(self):
         dom = etree.Element("endpointTemplate",
             xmlns="http://docs.openstack.org/"
-            "identity/api/ext/OSKSCATALOG/v1.0")
+            "identity/api/ext/OS-KSCATALOG/v1.0")
         if self.id:
             dom.set("id", str(self.id))
         if self.region:
@@ -231,7 +231,7 @@ def __init__(self, values, links):
     def to_xml(self):
         dom = etree.Element("endpointTemplates")
         dom.set(u"xmlns",
-            "http://docs.openstack.org/identity/api/ext/OSKSCATALOG/v1.0")
+            "http://docs.openstack.org/identity/api/ext/OS-KSCATALOG/v1.0")
 
         for t in self.values:
             dom.append(t.to_dom())

diff --git a/keystone/test/functional/common.py b/keystone/test/functional/common.py
@@ -601,7 +601,7 @@ class FunctionalTestCase(ApiTestCase):
     xmlns = 'http://docs.openstack.org/identity/api/v2.0'
     xmlns_ksadm = 'http://docs.openstack.org/identity/api/ext/OS-KSADM/v1.0'
     xmlns_kscatalog = "http://docs.openstack.org/identity/api/ext"\
-        + "/OSKSCATALOG/v1.0"
+        + "/OS-KSCATALOG/v1.0"
 
     def setUp(self):
         """Prepare keystone for system tests"""

diff --git a/keystone/test/functional/test_endpoints.py b/keystone/test/functional/test_endpoints.py
@@ -202,11 +202,11 @@ def test_update_endpoint_xml(self):
 
         data = ('<?xml version="1.0" encoding="UTF-8"?> '
             '<endpointTemplate '
-            'xmlns="http://docs.openstack.org'
-            '/identity/api/ext/OSKSCATALOG/v1.0" '
+            'xmlns="%s" '
             'region="%s" name="%s" type="%s"'
             ' publicURL="%s" adminURL="%s"'
-            ' internalURL="%s" enabled="%s" global="%s"/>') % (region,
+            ' internalURL="%s" enabled="%s" global="%s"/>') % (
+                self.xmlns_kscatalog, region,
                 self.service['name'], self.service['type'],
                 public_url, admin_url, internal_url,
                 enabled, is_global)
@@ -354,11 +354,11 @@ def test_endpoint_create_xml_using_expired_token(self):
         self.admin_token = self.expired_admin_token
         data = ('<?xml version="1.0" encoding="UTF-8"?> '
             '<endpointTemplate '
-            'xmlns="http://docs.openstack.org/identity'
-            '/api/ext/OSKSCATALOG/v1.0" '
+            'xmlns="%s" '
             'region="%s" name="%s"'
             ' type="%s" publicURL="%s" adminURL="%s" '
             'internalURL="%s" enabled="%s" global="%s"/>') % (
+                self.xmlns_kscatalog,
                 common.unique_str(),
                 self.service['name'],
                 self.service['type'], common.unique_url(),
@@ -370,11 +370,11 @@ def test_endpoint_create_xml_using_disabled_token(self):
         self.admin_token = self.disabled_admin_token
         data = ('<?xml version="1.0" encoding="UTF-8"?> '
             '<endpointTemplate '
-            'xmlns="http://docs.openstack.org/identity'
-            '/api/ext/OSKSCATALOG/v1.0" '
+            'xmlns="%s" '
             'region="%s" name="%s" type="%s" publicURL="%s" adminURL="%s" '
             'internalURL="%s" enabled="%s" global="%s"/>') % (
-                common.unique_str(), self.service['name'],
+                self.xmlns_kscatalog, common.unique_str(),
+                self.service['name'],
                 self.service['type'], common.unique_url(),
                 common.unique_url(), common.unique_url(), True, True)
         self.post_endpoint_template(as_xml=data, assert_status=403, headers={
@@ -384,10 +384,10 @@ def test_endpoint_create_xml_using_missing_token(self):
         self.admin_token = ''
         data = ('<?xml version="1.0" encoding="UTF-8"?> '
             '<endpointTemplate '
-            'xmlns="http://docs.openstack.org'
-            '/identity/api/ext/OSKSCATALOG/v1.0" '
+            'xmlns="%s" '
             'region="%s" name="%s" type="%s"  publicURL="%s" adminURL="%s" '
             'internalURL="%s" enabled="%s" global="%s"/>') % (
+                self.xmlns_kscatalog,
                 common.unique_str(),
                 self.service['name'], self.service['type'],
                 common.unique_url(),
@@ -399,11 +399,11 @@ def test_endpoint_create_xml_using_invalid_token(self):
         self.admin_token = common.unique_str()
         data = ('<?xml version="1.0" encoding="UTF-8"?> '
             '<endpointTemplate '
-            'xmlns="http://docs.openstack.org/'
-            'identity/api/ext/OSKSCATALOG/v1.0" '
+            'xmlns="%s" '
             'region="%s" name="%s" type="%s" publicURL="%s" adminURL="%s" '
             'internalURL="%s" enabled="%s" global="%s"/>') % (
-                common.unique_str(), self.service['name'],
+                self.xmlns_kscatalog, common.unique_str(),
+                self.service['name'],
                 self.service['type'], common.unique_url(),
                 common.unique_url(), common.unique_url(), True, True)
         self.post_endpoint_template(as_xml=data, assert_status=401, headers={