git://git.onelab.eu
/
plstackapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pick up, tweaked role/site/plcore_base or os_manager path when OpenStack not...
[plstackapi.git]
/
planetstack
/
core
/
models
/
key.py
diff --git
a/planetstack/core/models/key.py
b/planetstack/core/models/key.py
index
98cfb9b
..
7a8b322
100644
(file)
--- a/
planetstack/core/models/key.py
+++ b/
planetstack/core/models/key.py
@@
-1,23
+1,29
@@
import os
from django.db import models
from core.models import PlCoreBase
import os
from django.db import models
from core.models import PlCoreBase
+from openstack.manager import OpenStackManager
+
# Create your models here.
class Key(PlCoreBase):
# Create your models here.
class Key(PlCoreBase):
- name = models.CharField(max_length=256
, unique=True
)
- nkey_id = models.CharField(max_length=256, unique=True)
+ name = models.CharField(max_length=256)
+ nkey_id = models.CharField(
null=True, blank=True,
max_length=256, unique=True)
key = models.CharField(max_length=512)
type = models.CharField(max_length=256)
blacklisted = models.BooleanField(default=False)
key = models.CharField(max_length=512)
type = models.CharField(max_length=256)
blacklisted = models.BooleanField(default=False)
- def __unicode__(self): return u'%s' % (self.
name
)
+ def __unicode__(self): return u'%s' % (self.
key
)
def save(self, *args, **kwds):
def save(self, *args, **kwds):
- self.os_manager.save_key(self)
+ if not hasattr(self, 'os_manager'):
+ setattr(self, 'os_manager', OpenStackManager())
+ self.os_manager.save_key(self)
super(Key, self).save(*args, **kwds)
def delete(self, *args, **kwds):
super(Key, self).save(*args, **kwds)
def delete(self, *args, **kwds):
- self.os_manager.delete_key(self)
+ if not hasattr(self, 'os_manager'):
+ setattr(self, 'os_manager', OpenStackManager())
+ self.os_manager.delete_key(self)
super(Key, self).delete(*args, **kwds)
super(Key, self).delete(*args, **kwds)