vm: use Node.schedule_enabled in Node states

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

@@ -55,10 +55,9 @@
     <div class="col-md-2" id="node-info-pane">
     <div class="col-md-2" id="node-info-pane">
       <div id="node-info-data" class="big">
       <div id="node-info-data" class="big">
         <span id="node-details-state" class="label
         <span id="node-details-state" class="label
-          {% if node.state == 'ONLINE' %}label-success
-          {% elif node.state == 'MISSING' %}label-danger
-          {% elif node.state == 'DISABLED' %}label-warning
-          {% elif node.state == 'OFFLINE' %}label-warning{% endif %}">
+          {% if node.state == 'ACTIVE' %}label-success
+          {% elif node.state == 'PASSIVE' %}label-danger
+          {% else %}label-warning{% endif %}">
           <i class="fa {{ node.get_status_icon }}"></i> {{ node.get_status_display|upper }}
           <i class="fa {{ node.get_status_icon }}"></i> {{ node.get_status_display|upper }}
         </span>
         </span>
       </div>
       </div>

circle/vm/models/node.py

@@ -130,20 +130,26 @@ class Node(OperatedMixin, TimeStampedModel):
         warn('Use Node.info["core_num"]', DeprecationWarning)
         warn('Use Node.info["core_num"]', DeprecationWarning)
         return self.info['core_num']
         return self.info['core_num']
 
 
-    STATES = {False: {False: ('OFFLINE', _('offline')),
-                      True: ('DISABLED', _('disabled'))},
-              True: {False: ('MISSING', _('missing')),
-                     True: ('ONLINE', _('online'))}}
+    STATES = {None: ('MISSING', _('missing')),
+              False: {False: ('DISABLED', _('disabled'))},
+              True: {False: ('PASSIVE', _('passive')),
+                     True: ('ACTIVE', _('active'))}}
 
 
-    def get_state(self):
-        """The state combined of online and enabled attributes.
+    def _get_state(self):
+        """The state tuple based on online and enabled attributes.
         """
         """
-        return self.STATES[self.enabled][self.online][0]
-
-    state = property(get_state)
+        if self.online:
+            return self.STATES[self.enabled][self.schedule_enabled]
+        else:
+            return self.STATES[None]
 
 
     def get_status_display(self):
     def get_status_display(self):
-        return self.STATES[self.enabled][self.online][1]
+        return self._get_state()[1]
+
+    def get_state(self):
+        return self._get_state()[0]
+
+    state = property(get_state)
 
 
     def enable(self, user=None, base_activity=None):
     def enable(self, user=None, base_activity=None):
         raise NotImplementedError("Use activate or passivate instead.")
         raise NotImplementedError("Use activate or passivate instead.")
@@ -291,10 +297,10 @@ class Node(OperatedMixin, TimeStampedModel):
 
 
     def get_status_icon(self):
     def get_status_icon(self):
         return {
         return {
-            'OFFLINE': 'fa-minus-circle',
-            'DISABLED': 'fa-moon-o',
+            'DISABLED': 'times-circle-o',
             'MISSING': 'fa-warning',
             'MISSING': 'fa-warning',
-            'ONLINE': 'fa-play-circle'}.get(self.get_state(),
+            'PASSIVE': 'fa-play-circle-o',
+            'ACTIVE': 'fa-play-circle'}.get(self.get_state(),
                                             'fa-question-circle')
                                             'fa-question-circle')
 
 
     def get_status_label(self):
     def get_status_label(self):

circle/vm/tests/test_models.py

@@ -208,8 +208,10 @@ class NodeTestCase(TestCase):
         node = Mock(spec=Node)
         node = Mock(spec=Node)
         node.online = True
         node.online = True
         node.enabled = True
         node.enabled = True
+        node.schedule_enabled = True
         node.STATES = Node.STATES
         node.STATES = Node.STATES
-        self.assertEqual(Node.get_state(node), "ONLINE")
+        node._get_state = lambda: Node._get_state(node)
+        self.assertEqual(Node.get_state(node), "ACTIVE")
         assert isinstance(Node.get_status_display(node), _("x").__class__)
         assert isinstance(Node.get_status_display(node), _("x").__class__)