e2e: Use new host status constants.

features/environment.py

@@ -44,7 +44,7 @@
 
 from urllib.parse import urlparse
 
-from commissaire.constants import DEFAULT_CLUSTER_NETWORK_JSON
+from commissaire import constants as C
 
 # Fill in with context.ETCD after start_etcd().
 STORAGE_CONF_TEMPLATE = """
@@ -335,7 +335,7 @@ def before_all(context):
         except etcd.EtcdNotFile:
             pass
     context.etcd.write(
-        '/commissaire/networks/default', DEFAULT_CLUSTER_NETWORK_JSON)
+        '/commissaire/networks/default', C.DEFAULT_CLUSTER_NETWORK_JSON)
 
     context.etcd.write('/commissaire/config/kubetoken', 'test')
 
@@ -391,7 +391,7 @@ def before_scenario(context, scenario):
     context.HOST_DATA = {
         'address': '',
         'remote_user': 'vagrant',
-        'status': 'active',
+        'status': C.HOST_STATUS_ACTIVE,
         'os': 'fedora',
         'cpus': 1,
         'memory': 1234,
@@ -433,7 +433,9 @@ def after_scenario(context, scenario):
     Runs after every scenario.
     """
     # Wait for investigator processes to finish.
-    busy_states = ('investigating', 'bootstrapping')
+    busy_states = (
+        C.HOST_STATUS_INVESTIGATING,
+        C.HOST_STATUS_BOOTSTRAPPING)
     try:
         etcd_resp = context.etcd.read('/commissaire/hosts', recursive=True)
         for child in etcd_resp._children:

features/steps/hosts.py

@@ -19,6 +19,8 @@
 
 from behave import *
 
+from commissaire import constants as C
+
 from steps import (
     assert_status_code,
     VALID_USERNAME, VALID_PASSWORD)
@@ -56,7 +58,9 @@ def impl(context, host):
     # Poll until the host is finished bootstrapping.
     # We can't watch an etcd key because the host record
     # is only written to etcd after a successful bootstrap.
-    busy_states = ('investigating', 'bootstrapping')
+    busy_states = (
+        C.HOST_STATUS_INVESTIGATING,
+        C.HOST_STATUS_BOOTSTRAPPING)
     status_is_busy = True
     while status_is_busy:
         time.sleep(1)
@@ -67,7 +71,8 @@ def impl(context, host):
         data = request.json()
         status_is_busy = data['status'] in busy_states
 
-    assert data['status'] in ('active', 'disassociated'), \
+    assert data['status'] in (
+        C.HOST_STATUS_ACTIVE, C.HOST_STATUS_DISASSOCIATED), \
         'Host failed to bootstrap (status: {})'.format(data['status'])