diff options
| author | termie <github@anarkystic.com> | 2012-03-29 16:03:17 -0700 |
|---|---|---|
| committer | termie <github@anarkystic.com> | 2012-03-29 16:03:17 -0700 |
| commit | 05fa38e39fb0b825864c1cdf74f9b4360343c302 (patch) | |
| tree | d2b3ce307504ec40c4b589b092b9e99da81b0acb /keystone/catalog | |
| parent | 9cf91c951ed74e245693ca1f1b3df8965484dc94 (diff) | |
| download | keystone-05fa38e39fb0b825864c1cdf74f9b4360343c302.tar.gz keystone-05fa38e39fb0b825864c1cdf74f9b4360343c302.tar.xz keystone-05fa38e39fb0b825864c1cdf74f9b4360343c302.zip | |
don't duplicate the extra dict in extra
fixes bug 929815
Change-Id: Icfbe9a4b0eb2ef9b24bcf41113a6ec8e636210a9
Diffstat (limited to 'keystone/catalog')
| -rw-r--r-- | keystone/catalog/backends/sql.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/keystone/catalog/backends/sql.py b/keystone/catalog/backends/sql.py index ed78d010..3c553e0c 100644 --- a/keystone/catalog/backends/sql.py +++ b/keystone/catalog/backends/sql.py @@ -38,7 +38,7 @@ class Service(sql.ModelBase, sql.DictBase): def from_dict(cls, service_dict): extra = {} for k, v in service_dict.copy().iteritems(): - if k not in ['id', 'type']: + if k not in ['id', 'type', 'extra']: extra[k] = service_dict.pop(k) service_dict['extra'] = extra @@ -64,7 +64,7 @@ class Endpoint(sql.ModelBase, sql.DictBase): def from_dict(cls, endpoint_dict): extra = {} for k, v in endpoint_dict.copy().iteritems(): - if k not in ['id', 'region', 'service_id']: + if k not in ['id', 'region', 'service_id', 'extra']: extra[k] = endpoint_dict.pop(k) endpoint_dict['extra'] = extra return cls(**endpoint_dict) |