call user.set_password() in PLUser.save() instead of PLUserAdmin.save()

[plstackapi.git] / plstackapi / core / models / pluser.py

diff --git a/plstackapi/core/models/pluser.py b/plstackapi/core/models/pluser.py
index a59cb97..f914662 100644 (file)
--- a/plstackapi/core/models/pluser.py
+++ b/plstackapi/core/models/pluser.py
@@ -1,8 +1,9 @@
 import os
 import datetime
 from django.db import models
-from core.models import PlCoreBase
-from core.models import Site
+from plstackapi.core.models import PlCoreBase
+from plstackapi.core.models import Site
+from plstackapi.openstack.driver import OpenStackDriver
 from django.contrib.auth.models import User, AbstractBaseUser, UserManager, BaseUserManager
 
 # Create your models here.
@@ -54,7 +55,7 @@ class PLUser(AbstractBaseUser):
         db_index=True,
     )
 
-    
+    user_id = models.CharField(help_text="keystone user id", max_length=200) 
     firstname = models.CharField(help_text="person's given name", max_length=200)
     lastname = models.CharField(help_text="person's surname", max_length=200)
 
@@ -99,3 +100,23 @@ class PLUser(AbstractBaseUser):
         return self.is_admin
 
 
+    def save(self, *args, **kwds):
+        if not self.user_id:
+            if not self.driver:
+                setattr(self, 'driver', OpenStackDriver())
+            name = self.email[:self.email.find('@')]
+            user_fields = {'name': name,
+                           'email': self.email,
+                           'password': self.password,
+                           'enabled': True}
+            keystone_user = self.driver.create_user(**user_fields)
+            self.user_id = keystone_user.id
+        self.set_password(self.password)    
+        super(PLUser, self).save(*args, **kwds)   
+
+    def delete(self, *args, **kwds):
+        if self.user_id:
+            if not getattr(self, 'driver'):
+                setattr(self, 'driver', OpenStackDriver())
+            self.driver.delete_user(self.user_id)
+        super(PLUser, self).delete(*args, **kwds)