diff options
| author | Sam Morrison <sorrison@gmail.com> | 2012-05-07 09:09:57 +1000 |
|---|---|---|
| committer | Sam Morrison <sorrison@gmail.com> | 2012-05-07 09:09:57 +1000 |
| commit | c2255edb72db14e8dd5ff12fb61219793d425cbc (patch) | |
| tree | cd3f75d4211ba64faef2326cd218a98a9699468d | |
| parent | a1c2dd19633dfe7d792bfec524104bcf683a5d77 (diff) | |
| download | keystone-c2255edb72db14e8dd5ff12fb61219793d425cbc.tar.gz keystone-c2255edb72db14e8dd5ff12fb61219793d425cbc.tar.xz keystone-c2255edb72db14e8dd5ff12fb61219793d425cbc.zip | |
Corrects url conversion in export_legacy_catalog
Fixes bug 994936
Change-Id: Ia63fdae7d0bcd7f8b0b587da588404765e22fb8f
| -rw-r--r-- | keystone/common/sql/legacy.py | 2 | ||||
| -rw-r--r-- | 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 ca19ccb6..55e27b30 100644 --- a/keystone/common/sql/legacy.py +++ b/keystone/common/sql/legacy.py @@ -77,7 +77,7 @@ class LegacyMigration(object): '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 5d91a704..5b1412b1 100644 --- a/tests/test_import_legacy.py +++ b/tests/test_import_legacy.py @@ -108,4 +108,4 @@ class ImportLegacy(test.TestCase): 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']) |