Improvements to state.py:

- Re-ordered some state constants
- Defined new os_running_match_state constant
- Deleted return_default_state which is made obsolete by
  return_state_constant
- Improved return_state_constant to dynamically return constant state
  without the lengthy if statement
- compare_states: Change to allow match_state to be the name of a
  state constant (like "os_running_match_state")
- obmc_boot_test.py:  Changed from using return_default_state to use
  return_state_constant('default_state')

Change-Id: I660b1a3f0dd9032ae9d5c369f7fe5b61b954f8c9
Signed-off-by: Michael Walsh <micwalsh@us.ibm.com>
diff --git a/lib/obmc_boot_test.py b/lib/obmc_boot_test.py
index 0c81a0b..25324fe 100755
--- a/lib/obmc_boot_test.py
+++ b/lib/obmc_boot_test.py
@@ -46,7 +46,7 @@
 boot_lists = read_boot_lists()
 last_ten = []
 
-state = st.return_default_state()
+state = st.return_state_constant('default_state')
 cp_setup_called = 0
 next_boot = ""
 base_tool_dir_path = os.path.normpath(os.environ.get(