Refactor the data store a bit

Reduce code duplication, and clearly separates admin and user dbs.
Move plugin wrapper away and let plugin code use native functions.

This patch also changes the indexed data to use a uuid and assumes
2 identical uuid cannot be created concurrently.

Signed-off-by: Simo Sorce <simo@redhat.com>
Reviewed-by: Patrick Uiterwijk <puiterwijk@redhat.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/ipsilon/util/user.py b/ipsilon/util/user.py
index 2731d3c..47cb23c 100755
--- a/ipsilon/util/user.py
+++ b/ipsilon/util/user.py
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from ipsilon.util.data import Store
+from ipsilon.util.data import UserStore
 from ipsilon.util.log import Log
 import cherrypy
 
@@ -39,8 +39,8 @@ class User(object):
             self.name = username
 
     def _get_user_data(self, username):
-        store = Store()
-        return store.get_user_preferences(username)
+        store = UserStore()
+        return store.load_options('users', username)
 
     def reset(self):
         self.name = None