switch Sliver.ip from IpAddressField to GenericIPAddressField

[plstackapi.git] / plstackapi / core / models / sliver.py

diff --git a/plstackapi/core/models/sliver.py b/plstackapi/core/models/sliver.py
index 6f7aabe..2eabf23 100644 (file)
--- a/plstackapi/core/models/sliver.py
+++ b/plstackapi/core/models/sliver.py
@@ -1,5 +1,6 @@
 import os
 from django.db import models
+from django.core import exceptions
 from plstackapi.core.models import PlCoreBase
 from plstackapi.core.models import Flavor
 from plstackapi.core.models import Image
@@ -14,28 +15,34 @@ from plstackapi.openstack.driver import OpenStackDriver
 class Sliver(PlCoreBase):
     instance_id = models.CharField(max_length=200, help_text="Nova instance id")    
     name = models.CharField(max_length=200, help_text="Sliver name")
-    flavor = models.ForeignKey(Flavor, related_name='sliver_flavor')
-    image = models.ForeignKey(Image, related_name='sliver_image')
-    key = models.ForeignKey(Key, related_name='sliver_key')
-    slice = models.ForeignKey(Slice, related_name='sliver_slice')
-    node = models.ForeignKey(Node, related_name='sliver_node')
-    site = models.ForeignKey(Site, related_name='sliver_site')
+    ip = models.GenericIPAddressField(help_text="Sliver ip address", blank=True, null=True)
+    flavor = models.ForeignKey(Flavor, related_name='slivers')
+    image = models.ForeignKey(Image, related_name='slivers')
+    key = models.ForeignKey(Key, related_name='slivers')
+    slice = models.ForeignKey(Slice, related_name='slivers')
+    node = models.ForeignKey(Node, related_name='slivers')
     deploymentNetwork = models.ForeignKey(DeploymentNetwork, related_name='sliver_deploymentNetwork')
 
-    def __unicode__(self):  return u'%s::%s' % (self.slice, self.siteDeploymentNetwork)
+    def __unicode__(self):  return u'%s::%s' % (self.slice, self.deploymentNetwork)
 
     def save(self, *args, **kwds):
-        driver  = OpenStackDriver()
-        instance = driver.spawn_instances(name=self.name,
-                                          keyname=self.name,
-                                          hostnames=self.node.name,
-                                          flavor=self.flavor.name,
-                                          image=self.image.name)
-        self.instance_id = instance.id
+        if not self.slice.subnet.exists():
+            raise exceptions.ValidationError, "Slice %s has no subnet" % self.slice.name
+
+        if not self.instance_id:
+            driver = OpenStackDriver()
+            instance = driver.spawn_instance(name=self.name,
+                                   key_name = self.key.name,
+                                   flavor_id = self.flavor.flavor_id,
+                                   image_id = self.image.image_id,
+                                   hostname = self.node.name )
+            self.instance_id = instance.id
+
         super(Sliver, self).save(*args, **kwds)
 
     def delete(self, *args, **kwds):
-        driver  = OpenStackDriver()
-        driver.destroy_instance(name=self.name, id=self.instance_id)
-        super(Sliver, self).delete(*args, **kwds)
+        driver = OpenStackDriver()
+        if self.instance_id:
+            driver.destroy_instance(self.instance_id)
 
+        super(Sliver, self).delete(*args, **kwds)