observer for sites, slices and users

[plstackapi.git] / planetstack / core / models / user.py

diff --git a/planetstack/core/models/user.py b/planetstack/core/models/user.py
index 38c0d89..758bcbf 100644 (file)
--- a/planetstack/core/models/user.py
+++ b/planetstack/core/models/user.py
@@ -4,9 +4,8 @@ from collections import defaultdict
 from django.db import models
 from core.models import PlCoreBase
 from core.models import Site
-from core.models import Key
-from openstack.manager import OpenStackManager
 from django.contrib.auth.models import AbstractBaseUser, BaseUserManager
+from timezones.fields import TimeZoneField
 
 # Create your models here.
 class UserManager(BaseUserManager):
@@ -63,12 +62,18 @@ class User(AbstractBaseUser):
     phone = models.CharField(null=True, blank=True, help_text="phone number contact", max_length=100)
     user_url = models.URLField(null=True, blank=True)
     site = models.ForeignKey(Site, related_name='users', verbose_name="Site this user will be homed too", null=True)
-    key = models.ForeignKey(Key, related_name='user', null=True, blank=True)
+    public_key = models.TextField(null=True, blank=True, max_length=1024, help_text="Public key string")
 
     is_active = models.BooleanField(default=True)
     is_admin = models.BooleanField(default=True)
     is_staff = models.BooleanField(default=True)
 
+    created = models.DateTimeField(auto_now_add=True)
+    updated = models.DateTimeField(auto_now=True)
+    enacted = models.DateTimeField(null=True, default=None)
+
+    timezone = TimeZoneField()
+
     objects = UserManager()
 
     USERNAME_FIELD = 'email'
@@ -82,6 +87,10 @@ class User(AbstractBaseUser):
         # The user is identified by their email address
         return self.email
 
+    @property
+    def keyname(self):
+        return self.email[:self.email.find('@')]
+
     def __unicode__(self):
         return self.email
 
@@ -96,8 +105,8 @@ class User(AbstractBaseUser):
         return True
 
     def get_roles(self):
-        from plstackapi.core.models.site import SitePrivilege
-        from plstackapi.core.models.slice import SliceMembership
+        from core.models.site import SitePrivilege
+        from core.models.slice import SliceMembership
 
         site_privileges = SitePrivilege.objects.filter(user=self)
         slice_memberships = SliceMembership.objects.filter(user=self)
@@ -109,17 +118,6 @@ class User(AbstractBaseUser):
         return roles   
 
     def save(self, *args, **kwds):
-        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(User, self).save(*args, **kwds)   
-
-    def delete(self, *args, **kwds):
-        if not hasattr(self, 'os_manager'):
-            setattr(self, 'os_manager', OpenStackManager())
-            self.os_manager.delete_user(self)
-
-        super(User, self).delete(*args, **kwds)