git://git.onelab.eu
/
plstackapi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
eec90bb
)
Link credentials to related objects -- usercredentials et al.
author
Sapan Bhatia
<sapanb@cs.princeton.edu>
Wed, 5 Nov 2014 04:04:48 +0000
(23:04 -0500)
committer
Sapan Bhatia
<sapanb@cs.princeton.edu>
Wed, 5 Nov 2014 04:04:48 +0000
(23:04 -0500)
planetstack/core/models/credential.py
patch
|
blob
|
history
diff --git
a/planetstack/core/models/credential.py
b/planetstack/core/models/credential.py
index
13bc1c8
..
b74e540
100644
(file)
--- a/
planetstack/core/models/credential.py
+++ b/
planetstack/core/models/credential.py
@@
-6,7
+6,7
@@
from encrypted_fields import EncryptedCharField
from core.models import Deployment,DeploymentLinkManager,DeploymentLinkDeletionManager
class UserCredential(PlCoreBase):
from core.models import Deployment,DeploymentLinkManager,DeploymentLinkDeletionManager
class UserCredential(PlCoreBase):
- user = models.ForeignKey(User, related_name='credentials', help_text="The User this credential is associated with")
+ user = models.ForeignKey(User, related_name='
user
credentials', help_text="The User this credential is associated with")
name = models.SlugField(help_text="The credential type, e.g. ec2", max_length=128)
key_id = models.CharField(help_text="The backend id of this credential", max_length=1024)
name = models.SlugField(help_text="The credential type, e.g. ec2", max_length=128)
key_id = models.CharField(help_text="The backend id of this credential", max_length=1024)
@@
-17,7
+17,7
@@
class UserCredential(PlCoreBase):
return self.name
class SiteCredential(PlCoreBase):
return self.name
class SiteCredential(PlCoreBase):
- site = models.ForeignKey(Site, related_name='credentials', help_text="The User this credential is associated with")
+ site = models.ForeignKey(Site, related_name='
site
credentials', help_text="The User this credential is associated with")
name = models.SlugField(help_text="The credential type, e.g. ec2", max_length=128)
key_id = models.CharField(help_text="The backend id of this credential", max_length=1024)
name = models.SlugField(help_text="The credential type, e.g. ec2", max_length=128)
key_id = models.CharField(help_text="The backend id of this credential", max_length=1024)
@@
-28,7
+28,7
@@
class SiteCredential(PlCoreBase):
return self.name
class SliceCredential(PlCoreBase):
return self.name
class SliceCredential(PlCoreBase):
- slice = models.ForeignKey(Slice, related_name='credentials', help_text="The User this credential is associated with")
+ slice = models.ForeignKey(Slice, related_name='
slice
credentials', help_text="The User this credential is associated with")
name = models.SlugField(help_text="The credential type, e.g. ec2", max_length=128)
key_id = models.CharField(help_text="The backend id of this credential", max_length=1024)
name = models.SlugField(help_text="The credential type, e.g. ec2", max_length=128)
key_id = models.CharField(help_text="The backend id of this credential", max_length=1024)
@@
-41,7
+41,7
@@
class SliceCredential(PlCoreBase):
class DeploymentCredential(PlCoreBase):
objects = DeploymentLinkManager()
deleted_objects = DeploymentLinkDeletionManager()
class DeploymentCredential(PlCoreBase):
objects = DeploymentLinkManager()
deleted_objects = DeploymentLinkDeletionManager()
- deployment = models.ForeignKey(Deployment, related_name='credentials', help_text="The User this credential is associated with")
+ deployment = models.ForeignKey(Deployment, related_name='
deployment
credentials', help_text="The User this credential is associated with")
name = models.SlugField(help_text="The credential type, e.g. ec2", max_length=128)
key_id = models.CharField(help_text="The backend id of this credential", max_length=1024)
name = models.SlugField(help_text="The credential type, e.g. ec2", max_length=128)
key_id = models.CharField(help_text="The backend id of this credential", max_length=1024)