vm: add EnsureAgentMixin

circle/vm/models/instance.py

@@ -290,6 +290,10 @@ class Instance(AclBase, VirtualMachineDescModel, StatusModel, OperatedMixin,
         message = ugettext_noop(
         message = ugettext_noop(
             "Instance %(instance)s has already been destroyed.")
             "Instance %(instance)s has already been destroyed.")
 
 
+    class NoAgentError(InstanceError):
+        message = ugettext_noop(
+            "No agent software is running on instance %(instance)s.")
+
     class WrongStateError(InstanceError):
     class WrongStateError(InstanceError):
         message = ugettext_noop(
         message = ugettext_noop(
             "Current state (%(state)s) of instance %(instance)s is "
             "Current state (%(state)s) of instance %(instance)s is "

circle/vm/operations.py

@@ -903,6 +903,25 @@ class ResourcesOperation(InstanceOperation):
 register_operation(ResourcesOperation)
 register_operation(ResourcesOperation)
 
 
 
 
+class EnsureAgentMixin(object):
+    accept_states = ('RUNNING', )
+
+    def check_precond(self):
+        super(EnsureAgentMixin, self).check_precond()
+
+        last_boot_time = self.instance.activity_log.filter(
+            succeeded=True, activity_code__in=(
+                "vm.Instance.deploy", "vm.Instance.reset",
+                "vm.Instance.reboot")).latest("finished").finished
+
+        try:
+            InstanceActivity.objects.filter(
+                activity_code="vm.Instance.agent.starting",
+                started__gt=last_boot_time).latest("started")
+        except InstanceActivity.DoesNotExist:  # no agent since last boot
+            raise self.instance.NoAgentError(self.instance)
+
+
 class PasswordResetOperation(InstanceOperation):
 class PasswordResetOperation(InstanceOperation):
     activity_code_suffix = 'Password reset'
     activity_code_suffix = 'Password reset'
     id = 'password_reset'
     id = 'password_reset'