Corrects url conversion in export_legacy_catalog

Fixes bug 994936 Change-Id: Ia63fdae7d0bcd7f8b0b587da588404765e22fb8f
openstack · Jun 11, 2012 · 4265499 · 4265499
1 parent 7715d6c
commit 4265499
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -86,6 +86,7 @@ Russell Bryant <rbryant@redhat.com>
 saikrishna1511@gmail.com <psaikrishna@ubudesk1004.(none)>
 Sai Krishna <saikrishna1511@gmail.com>
 Salvatore Orlando <salvatore.orlando@eu.citrix.com>
+Sam Morrison <sorrison@gmail.com>
 Sandy Walsh <sandy@sandywalsh.com>
 Shevek <shevek@nebula.com>
 sirish bitra <sirish.bitra@gmail.com>

diff --git a/keystone/common/sql/legacy.py b/keystone/common/sql/legacy.py
@@ -77,7 +77,7 @@ def dump_catalog(self):
                  'region': row['region']}
 
             for x in ['internal_url', 'public_url', 'admin_url', 'enabled']:
-                d['key'] = x.replace('_u', 'U')
+                d['key'] = x.replace('_url', 'URL')
                 d['value'] = _translate_replacements(row[x])
                 o.append(template % d)
 

diff --git a/tests/test_import_legacy.py b/tests/test_import_legacy.py
@@ -108,4 +108,4 @@ def _check_catalog(self, migration):
         catalog = catalog_templated.parse_templates(catalog_lines)
         self.assert_('RegionOne' in catalog)
         self.assert_('compute' in catalog['RegionOne'])
-        self.assert_('adminUrl' in catalog['RegionOne']['compute'])
+        self.assert_('adminURL' in catalog['RegionOne']['compute'])