Change from 'FW Progress, Starting OS' check to 'OSStart'.
Change-Id: Ic8df9568fca783f06063fcd8fd73ebe31ce631fa
Signed-off-by: Michael Walsh <micwalsh@us.ibm.com>
diff --git a/data/boot_table.json b/data/boot_table.json
index 6b3fd9b..3bd9b16 100644
--- a/data/boot_table.json
+++ b/data/boot_table.json
@@ -6,13 +6,15 @@
"start": {
"rest": "^1$",
"chassis": "^Off$",
- "boot_progress": "^Off$",
+# TO-DO: There is a known product code bug where boot_progress does not go to
+# 'Off'. Once that bug is fixed, this code may be commented back in.
+# "boot_progress": "^Off$",
"host": "^Off$"
},
"end": {
"rest": "^1$",
"chassis": "^On$",
- "boot_progress": "^FW Progress, Starting OS$",
+# "boot_progress": "^FW Progress, Starting OS|OSStart$",
"host": "^Running$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -28,13 +30,13 @@
"start": {
"rest": "^1$",
"chassis": "^Off$",
- "boot_progress": "^Off$",
+# "boot_progress": "^Off$",
"host": "^Off$"
},
"end": {
"rest": "^1$",
"chassis": "^On$",
- "boot_progress": "^FW Progress, Starting OS$",
+# "boot_progress": "^FW Progress, Starting OS|OSStart$",
"host": "^Running$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -57,7 +59,7 @@
"end": {
"rest": "^1$",
"chassis": "^Off$",
- "boot_progress": "^Off$",
+# "boot_progress": "^Off$",
"host": "^Off$",
"os_ping": "^0$",
"os_login": "^0$",
@@ -77,7 +79,7 @@
"end": {
"rest": "^1$",
"chassis": "^Off$",
- "boot_progress": "^Off$",
+# "boot_progress": "^Off$",
"host": "^Off$",
"os_ping": "^0$",
"os_login": "^0$",
@@ -97,7 +99,7 @@
"end": {
"rest": "^1$",
"chassis": "^Off$",
- "boot_progress": "^Off$",
+# "boot_progress": "^Off$",
"host": "^Off$",
"os_ping": "^0$",
"os_login": "^0$",
@@ -113,7 +115,7 @@
"start": {
"rest": "^1$",
"chassis": "^On$",
- "boot_progress": "^FW Progress, Starting OS$",
+# "boot_progress": "^FW Progress, Starting OS|OSStart$",
"host": "^Running$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -122,7 +124,7 @@
"end": {
"rest": "^1$",
"chassis": "^Off$",
- "boot_progress": "^Off$",
+# "boot_progress": "^Off$",
"host": "^Off$",
"os_ping": "^0$",
"os_login": "^0$",
@@ -142,7 +144,7 @@
"start": {
"rest": "^1$",
"chassis": "^On$",
- "boot_progress": "^FW Progress, Starting OS$",
+# "boot_progress": "^FW Progress, Starting OS|OSStart$",
"host": "^Running$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -151,7 +153,7 @@
"end": {
"rest": "^1$",
"chassis": "^On$",
- "boot_progress": "^FW Progress, Starting OS$",
+# "boot_progress": "^FW Progress, Starting OS|OSStart$",
"host": "^Running$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -167,7 +169,7 @@
"start": {
"rest": "^1$",
"chassis": "^On$",
- "boot_progress": "^FW Progress, Starting OS$",
+# "boot_progress": "^FW Progress, Starting OS|OSStart$",
"host": "^Running$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -176,7 +178,7 @@
"end": {
"rest": "^1$",
"chassis": "^On$",
- "boot_progress": "^FW Progress, Starting OS$",
+# "boot_progress": "^FW Progress, Starting OS|OSStart$",
"host": "^Running$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -195,7 +197,7 @@
"end": {
"rest": "^1$",
"chassis": "^Off$",
- "boot_progress": "^Off$",
+# "boot_progress": "^Off$",
"host": "^Off$"
},
"bmc_reboot": 1,
@@ -207,7 +209,7 @@
"start": {
"rest": "^1$",
"chassis": "^On$",
- "boot_progress": "^FW Progress, Starting OS$",
+# "boot_progress": "^FW Progress, Starting OS|OSStart$",
"host": "^Running$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -216,7 +218,7 @@
"end": {
"rest": "^1$",
"chassis": "^On$",
- "boot_progress": "^FW Progress, Starting OS$",
+# "boot_progress": "^FW Progress, Starting OS|OSStart$",
"host": "^Running$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -236,7 +238,7 @@
"end": {
"rest": "^1$",
"chassis": "^Off$",
- "boot_progress": "^Off$",
+# "boot_progress": "^Off$",
"host": "^Off$"
},
"bmc_reboot": 1,
@@ -250,7 +252,7 @@
"start": {
"rest": "^1$",
"chassis": "^On$",
- "boot_progress": "^FW Progress, Starting OS$",
+# "boot_progress": "^FW Progress, Starting OS|OSStart$",
"host": "^Running$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -259,7 +261,7 @@
"end": {
"rest": "^1$",
"chassis": "^On$",
- "boot_progress": "^FW Progress, Starting OS$",
+# "boot_progress": "^FW Progress, Starting OS|OSStart$",
"host": "^Running$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -280,7 +282,7 @@
"end": {
"rest": "^1$",
"chassis": "^Off$",
- "boot_progress": "^Off$",
+# "boot_progress": "^Off$",
"host": "^Off$"
},
"bmc_reboot": 1,
@@ -296,7 +298,7 @@
"start": {
"rest": "^1$",
"chassis": "^On$",
- "boot_progress": "^FW Progress, Starting OS$",
+# "boot_progress": "^FW Progress, Starting OS|OSStart$",
"host": "^Running$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -305,7 +307,7 @@
"end": {
"rest": "^1$",
"chassis": "^On$",
- "boot_progress": "^FW Progress, Starting OS$",
+# "boot_progress": "^FW Progress, Starting OS|OSStart$",
"host": "^Running$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -322,7 +324,7 @@
"start": {
"rest": "^1$",
"chassis": "^On$",
- "boot_progress": "^FW Progress, Starting OS$",
+# "boot_progress": "^FW Progress, Starting OS|OSStart$",
"host": "^Running$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -331,7 +333,7 @@
"end": {
"rest": "^1$",
"chassis": "^On$",
- "boot_progress": "^FW Progress, Starting OS$",
+# "boot_progress": "^FW Progress, Starting OS|OSStart$",
"host": "^Running$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -347,7 +349,7 @@
"start": {
"rest": "^1$",
"chassis": "^On$",
- "boot_progress": "^FW Progress, Starting OS$",
+# "boot_progress": "^FW Progress, Starting OS|OSStart$",
"host": "^Running$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -356,7 +358,7 @@
"end": {
"rest": "^1$",
"chassis": "^On$",
- "boot_progress": "^FW Progress, Starting OS$",
+# "boot_progress": "^FW Progress, Starting OS|OSStart$",
"host": "^Running$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -372,7 +374,7 @@
"start": {
"rest": "^1$",
"chassis": "^On$",
- "boot_progress": "^FW Progress, Starting OS$",
+# "boot_progress": "^FW Progress, Starting OS|OSStart$",
"host": "^Running$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -381,7 +383,7 @@
"end": {
"rest": "^1$",
"chassis": "^On$",
- "boot_progress": "^FW Progress, Starting OS$",
+# "boot_progress": "^FW Progress, Starting OS|OSStart$",
"host": "^Running$",
"os_ping": "^1$",
"os_login": "^1$",
diff --git a/lib/state.py b/lib/state.py
index e3028e8..83ca5bc 100755
--- a/lib/state.py
+++ b/lib/state.py
@@ -10,7 +10,7 @@
default_state:
default_state[chassis]: On
- default_state[boot_progress]: FW Progress, Starting OS
+ default_state[boot_progress]: OSStart
default_state[host]: Running
default_state[os_ping]: 1
default_state[os_login]: 1
@@ -115,7 +115,7 @@
default_state = DotDict([('rest', '1'),
('chassis', 'On'),
('bmc', 'Ready'),
- ('boot_progress', 'FW Progress, Starting OS'),
+ ('boot_progress', 'OSStart'),
('host', 'Running'),
('os_ping', '1'),
('os_login', '1'),
@@ -125,7 +125,7 @@
master_os_up_match = DotDict([('chassis', '^On$'),
('bmc', '^Ready$'),
('boot_progress',
- 'FW Progress, Starting OS'),
+ 'FW Progress, Starting OS|OSStart'),
('host', '^Running$')])
@@ -658,7 +658,7 @@
regular expression. Example call from robot:
${match_state}= Create Dictionary chassis=^On$
... bmc=^Ready$
- ... boot_progress=^FW Progress, Starting OS$
+ ... boot_progress=^OSStart$
${state}= Check State &{match_state}
invert If this flag is set, this function will succeed if the
states do NOT match.
@@ -860,16 +860,7 @@
# that the uptime is less than the elapsed boot time. Further proof that
# a reboot has indeed occurred (vs random network instability giving a
# false positive.
-
- # By waiting for a valid float and int for uptime and epoch_seconds, we
- # effectively retry on failure to obtain data from the BMC.
- float_regex = '[0-9]+\.[0-9]+'
- int_regex = '[0-9]+'
- match_state = anchor_state(DotDict([('uptime', float_regex),
- ('epoch_seconds', int_regex)]))
-
- state = wait_state(match_state, wait_time="4 mins", interval="0 seconds",
- quiet=1)
+ state = get_state(req_states=['uptime', 'epoch_seconds'], quiet=quiet)
elapsed_boot_time = int(state['epoch_seconds']) - start_boot_seconds
gp.qprint_var(elapsed_boot_time)
diff --git a/lib/utils.robot b/lib/utils.robot
index df00d2d..e09a445 100755
--- a/lib/utils.robot
+++ b/lib/utils.robot
@@ -411,7 +411,7 @@
Is OS Starting
[Documentation] Check if boot progress is OS starting.
${boot_progress}= Get Boot Progress
- Should Be Equal ${boot_progress} FW Progress, Starting OS
+ Should Be Equal ${boot_progress} OSStart
Is OS Off
[Documentation] Check if boot progress is "Off".
@@ -423,7 +423,7 @@
... Starting OS'.
${boot_progress}= Get Boot Progress
- Run Keyword If '${boot_progress}' == 'FW Progress, Starting OS'
+ Run Keyword If '${boot_progress}' == 'OSStart'
... Log Host is already in OS starting state
... ELSE
... Run Keywords Initiate Host PowerOff AND Initiate Host Boot