Merge branch 'node-fixes' into 'master'

Node fixes

See merge request !265

circle/dashboard/templates/dashboard/node-detail/resources.html

@@ -12,11 +12,13 @@
     <dt>{% trans "Priority" %}:</dt><dd>{{ node.priority }}</dd>
     <dt>{% trans "Priority" %}:</dt><dd>{{ node.priority }}</dd>
     <dt>{% trans "Driver Version:" %}</dt>
     <dt>{% trans "Driver Version:" %}</dt>
     <dd>
     <dd>
+      {% if node.driver_version %}
         {{ node.driver_version.branch }} at
         {{ node.driver_version.branch }} at
         {{ node.driver_version.commit }} ({{ node.driver_version.commit_text }})
         {{ node.driver_version.commit }} ({{ node.driver_version.commit_text }})
         {% if node.driver_version.is_dirty %}
         {% if node.driver_version.is_dirty %}
           <span class="label label-danger">{% trans "with uncommitted changes!" %}</span>
           <span class="label label-danger">{% trans "with uncommitted changes!" %}</span>
         {% endif %}
         {% endif %}
+      {% endif %}
     </dd>
     </dd>
     <dt>{% trans "Host owner" %}:</dt>
     <dt>{% trans "Host owner" %}:</dt>
     <dd>
     <dd>

circle/vm/models/node.py

@@ -291,7 +291,7 @@ class Node(OperatedMixin, TimeStampedModel):
     @property
     @property
     @node_available
     @node_available
     def driver_version(self):
     def driver_version(self):
-        return self.info['driver_version']
+        return self.info.get('driver_version')
 
 
     @property
     @property
     @node_available
     @node_available

circle/vm/operations.py

@@ -1100,6 +1100,7 @@ class ActivateOperation(NodeOperation):
     def _operation(self):
     def _operation(self):
         self.node.enabled = True
         self.node.enabled = True
         self.node.schedule_enabled = True
         self.node.schedule_enabled = True
+        self.node.get_info(invalidate_cache=True)
         self.node.save()
         self.node.save()
 
 
 
 
@@ -1121,6 +1122,7 @@ class PassivateOperation(NodeOperation):
     def _operation(self):
     def _operation(self):
         self.node.enabled = True
         self.node.enabled = True
         self.node.schedule_enabled = False
         self.node.schedule_enabled = False
+        self.node.get_info(invalidate_cache=True)
         self.node.save()
         self.node.save()