allow openstack fields to contain null/blank values. separate User.is_admin from...

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

diff --git a/plstackapi/core/models/pluser.py b/plstackapi/core/models/pluser.py
index 1c01a42..6688cfe 100644 (file)
--- a/plstackapi/core/models/pluser.py
+++ b/plstackapi/core/models/pluser.py
@@ -3,7 +3,7 @@ import datetime
 from django.db import models
 from plstackapi.core.models import PlCoreBase
 from plstackapi.core.models import Site
-from plstackapi.openstack.driver import OpenStackDriver
+from plstackapi.openstack.manager import OpenStackManager
 from django.contrib.auth.models import User, AbstractBaseUser, UserManager, BaseUserManager
 
 # Create your models here.
@@ -20,10 +20,10 @@ class PLUserManager(BaseUserManager):
         user = self.model(
             email=PLUserManager.normalize_email(email),
             firstname=firstname,
-            lastname=lastname
+            lastname=lastname,
+            password=password
         )
-
-        user.set_password(password)
+        #user.set_password(password)
         user.is_admin = True
         user.save(using=self._db)
         return user
@@ -55,7 +55,7 @@ class PLUser(AbstractBaseUser):
         db_index=True,
     )
 
-    user_id = models.CharField(help_text="keystone user id", max_length=200) 
+    user_id = models.CharField(null=True, blank=True, 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)
 
@@ -64,7 +64,7 @@ class PLUser(AbstractBaseUser):
     site = models.ForeignKey(Site, related_name='users', verbose_name="Site this user will be homed too", null=True)
 
     is_active = models.BooleanField(default=True)
-    is_admin = models.BooleanField(default=True)
+    is_admin = models.BooleanField(default=False)
     is_staff = models.BooleanField(default=True)
 
     objects = PLUserManager()
@@ -93,29 +93,18 @@ class PLUser(AbstractBaseUser):
         # Simplest possible answer: Yes, always
         return True
 
-    @property
-    def is_staff(self):
-        "Is the user a member of staff?"
-        # Simplest possible answer: All admins are staff
-        return self.is_admin
-
-
     def save(self, *args, **kwds):
-        if not self.user_id:
-            if not hasattr(self, 'driver'):
-                setattr(self, 'driver', OpenStackDriver())
-            name = self.email[:self.email.find('@')]
-            user_fields = {'name': name,
-                           'email': self.email,
-                           'password': self.password,
-                           'enabled': self.is_active}
-            user = self.driver.create_user(**user_fields)
-            self.user_id = user.id
+        if not hasattr(self, 'os_manager'):
+            setattr(self, 'os_manager', OpenStackManager())
+
+        self.os_manager.save_user(self)
+        if not self.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)
+        if not hasattr(self, 'os_manager'):
+            setattr(self, 'os_manager', OpenStackManager())
+
+        self.os_manager.delete_user(self)
         super(PLUser, self).delete(*args, **kwds)