From c2255edb72db14e8dd5ff12fb61219793d425cbc Mon Sep 17 00:00:00 2001 From: Sam Morrison Date: Mon, 7 May 2012 09:09:57 +1000 Subject: [PATCH] Corrects url conversion in export_legacy_catalog Fixes bug 994936 Change-Id: Ia63fdae7d0bcd7f8b0b587da588404765e22fb8f --- keystone/common/sql/legacy.py | 2 +- tests/test_import_legacy.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/keystone/common/sql/legacy.py b/keystone/common/sql/legacy.py index ca19ccb631..55e27b30b9 100644 --- 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 index 5d91a704b1..5b1412b199 100644 --- 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'])