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
several bug fixes
[plstackapi.git]
/
planetstack
/
core
/
models
/
sliver.py
diff --git
a/planetstack/core/models/sliver.py
b/planetstack/core/models/sliver.py
index
8ebcbd4
..
13eb353
100644
(file)
--- a/
planetstack/core/models/sliver.py
+++ b/
planetstack/core/models/sliver.py
@@
-3,12
+3,11
@@
from django.db import models
from django.core import exceptions
from core.models import PlCoreBase
from core.models import Image
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 Slice
from core.models import Node
from core.models import Site
-from core.models import Deployment
Network
-from
openstack.manager import OpenStackManag
er
+from core.models import Deployment
+from
core.models import Us
er
# Create your models here.
class Sliver(PlCoreBase):
# Create your models here.
class Sliver(PlCoreBase):
@@
-17,10
+16,11
@@
class Sliver(PlCoreBase):
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')
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')
slice = models.ForeignKey(Slice, related_name='slivers')
node = models.ForeignKey(Node, related_name='slivers')
- deploymentNetwork = models.ForeignKey(Deployment
Network
, verbose_name='deployment', related_name='sliver_deploymentNetwork')
+ deploymentNetwork = models.ForeignKey(Deployment, verbose_name='deployment', related_name='sliver_deploymentNetwork')
numberCores = models.IntegerField(verbose_name="Number of Cores", help_text="Number of cores for sliver", default=0)
numberCores = models.IntegerField(verbose_name="Number of Cores", help_text="Number of cores for sliver", default=0)
@@
-29,13
+29,6
@@
class Sliver(PlCoreBase):
def save(self, *args, **kwds):
if not self.name:
self.name = self.slice.name
def save(self, *args, **kwds):
if not self.name:
self.name = self.slice.name
- if not hasattr(self, 'os_manager'):
- setattr(self, 'os_manager', OpenStackManager())
- self.os_manager.save_sliver(self)
+ if not self.creator and hasattr(self, 'caller'):
+ self.creator = self.caller
super(Sliver, self).save(*args, **kwds)
super(Sliver, self).save(*args, **kwds)
-
- def delete(self, *args, **kwds):
- if not hasattr(self, 'os_manager'):
- setattr(self, 'os_manager', OpenStackManager())
- self.os_manager.delete_sliver(self)
- super(Sliver, self).delete(*args, **kwds)