key is now just an attribute of the user model. Added 'creator' field to sliver model
diff --git a/planetstack/core/models/plcorebase.py b/planetstack/core/models/plcorebase.py
index ed7c3ff..709fdc6 100644
--- a/planetstack/core/models/plcorebase.py
+++ b/planetstack/core/models/plcorebase.py
@@ -6,6 +6,7 @@
created = models.DateTimeField(auto_now_add=True)
updated = models.DateTimeField(auto_now=True)
+ enacted = models.DateTimeField(null=True, default=None)
class Meta:
abstract = True
diff --git a/planetstack/core/models/sliver.py b/planetstack/core/models/sliver.py
index 03fa1d8..72ad66d 100644
--- a/planetstack/core/models/sliver.py
+++ b/planetstack/core/models/sliver.py
@@ -3,11 +3,11 @@
from django.core import exceptions
from core.models import PlCoreBase
from core.models import Image
-from core.models import Key
from core.models import Slice
from core.models import Node
from core.models import Site
from core.models import Deployment
+from core.models import User
# Create your models here.
class Sliver(PlCoreBase):
@@ -16,7 +16,8 @@
instance_name = models.CharField(blank=True, null=True, max_length=200, help_text="OpenStack generated name")
ip = models.GenericIPAddressField(help_text="Sliver ip address", blank=True, null=True)
image = models.ForeignKey(Image, related_name='slivers')
- key = models.ForeignKey(Key, related_name='slivers')
+ #key = models.ForeignKey(Key, related_name='slivers')
+ creator = models.ForeignKey(User, related_name='slivers', blank=True, null=True)
slice = models.ForeignKey(Slice, related_name='slivers')
node = models.ForeignKey(Node, related_name='slivers')
deploymentNetwork = models.ForeignKey(Deployment, verbose_name='deployment', related_name='sliver_deploymentNetwork')
diff --git a/planetstack/core/models/user.py b/planetstack/core/models/user.py
index 055b6cd..d494ede 100644
--- a/planetstack/core/models/user.py
+++ b/planetstack/core/models/user.py
@@ -63,7 +63,8 @@
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)
+ #key = models.ForeignKey(Key, related_name='user', null=True, blank=True)
+ public_key = models.CharField(null=True, blank=True, max_length=1024, help_text="Public key string")
is_active = models.BooleanField(default=True)
is_admin = models.BooleanField(default=True)
@@ -84,6 +85,10 @@
# 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