Return non-indexed attrs, not 'extra' (bug 1075376)

(most of this is pulled from the v3 branch)

Change-Id: Id1118e7a2b245fb7ec95e41ec297c87036953db2

1 files changed, 14 insertions, 1 deletions

diff --git a/keystone/common/sql/core.py b/keystone/common/sql/core.py
index 27df8914..1a9d595f 100644
--- a/keystone/common/sql/core.py
+++ b/keystone/common/sql/core.py
@@ -57,9 +57,22 @@ class JsonBlob(sql_types.TypeDecorator):
 
 
 class DictBase(object):
+    attributes = []
+
+    @classmethod
+    def from_dict(cls, d):
+        new_d = d.copy()
+
+        new_d['extra'] = dict((k, new_d.pop(k)) for k in d.iterkeys()
+                              if k not in cls.attributes and k != 'extra')
+
+        return cls(**new_d)
 
     def to_dict(self):
-        return dict(self.iteritems())
+        d = self.extra.copy()
+        for attr in self.__class__.attributes:
+            d[attr] = getattr(self, attr)
+        return d
 
     def __setitem__(self, key, value):
         setattr(self, key, value)