add missing code to sync_slivers
[plstackapi.git] / planetstack / observer / steps / sync_slivers.py
index a8ef822..1580c5a 100644 (file)
@@ -1,26 +1,54 @@
 import os
 import base64
+from django.db.models import F, Q
 from planetstack.config import Config
+from observer.openstacksyncstep import OpenStackSyncStep
+from core.models.sliver import Sliver
 
 class SyncSlivers(OpenStackSyncStep):
-       provides=[Sliver]
-       def sync_record(self, slice):
-               if not sliver.instance_id:
-                               nics = self.get_requested_networks(sliver.slice)
-                               file("/tmp/scott-manager","a").write("slice: %s\nreq: %s\n" % (str(sliver.slice.name), str(nics)))
-                               slice_memberships = SliceMembership.objects.filter(slice=sliver.slice)
-                               pubkeys = [sm.user.public_key for sm in slice_memberships if sm.user.public_key]
-                               pubkeys.append(sliver.creator.public_key)
-                               instance = self.driver.spawn_instance(name=sliver.name,
-                                                                          key_name = sliver.creator.keyname,
-                                                                          image_id = sliver.image.image_id,
-                                                                          hostname = sliver.node.name,
-                                                                          pubkeys = pubkeys,
-                                                                          nics = nics )
-                               sliver.instance_id = instance.id
-                               sliver.instance_name = getattr(instance, 'OS-EXT-SRV-ATTR:instance_name')
-
-                       if sliver.instance_id and ("numberCores" in sliver.changed_fields):
-                               self.driver.update_instance_metadata(sliver.instance_id, {"cpu_cores": str(sliver.numberCores)})
-
-                       sliver.save()   
+    provides=[Sliver]
+    requested_interval=0
+
+    def fetch_pending(self):
+        return Sliver.objects.filter(Q(enacted__lt=F('updated')) | Q(enacted=None))
+
+    def get_requested_networks(self, slice):
+        network_ids = [x.network_id for x in slice.networks.all()]
+
+        if slice.network_id is not None:
+            network_ids.append(slice.network_id)
+
+        networks = []
+        for network_id in network_ids:
+            networks.append({"net-id": network_id})
+
+        return networks
+
+    def sync_record(self, slice):
+        metadata_update = {}
+        if ("numberCores" in sliver.changed_fields):
+            metadata_update["cpu_cores"] = str(sliver.numberCores)
+
+        for tag in sliver.slice.tags.all():
+            if tag.name.startswith("sysctl-"):
+                metadata_update[tag.name] = tag.value
+
+        if not sliver.instance_id:
+            nics = self.get_requested_networks(sliver.slice)
+            file("/tmp/scott-manager","a").write("slice: %s\nreq: %s\n" % (str(sliver.slice.name), str(nics)))
+            slice_memberships = SliceMembership.objects.filter(slice=sliver.slice)
+            pubkeys = [sm.user.public_key for sm in slice_memberships if sm.user.public_key]
+            pubkeys.append(sliver.creator.public_key)
+            instance = self.driver.spawn_instance(name=sliver.name,
+                                key_name = sliver.creator.keyname,
+                                image_id = sliver.image.image_id,
+                                hostname = sliver.node.name,
+                                pubkeys = pubkeys,
+                                nics = nics )
+            sliver.instance_id = instance.id
+            sliver.instance_name = getattr(instance, 'OS-EXT-SRV-ATTR:instance_name')
+
+        if sliver.instance_id and metadata_update:
+            self.driver.update_instance_metadata(sliver.instance_id, metadata_update)
+
+        sliver.save()