Redfish boot progresss changes
Refer: https://gerrit.openbmc-project.xyz/c/openbmc/bmcweb/+/29344
Change-Id: I34af145431f774d83f4445576bbee8fc30dfccef
Signed-off-by: George Keishing <gkeishin@in.ibm.com>
diff --git a/data/boot_table_redfish.json b/data/boot_table_redfish.json
index 6039f4a..aaac314 100644
--- a/data/boot_table_redfish.json
+++ b/data/boot_table_redfish.json
@@ -12,7 +12,7 @@
"end": {
"redfish": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemHardwareInitializationComplete|OSRunning$",
+ "boot_progress": "^SystemHardwareInitializationComplete|OSBootStarted|OSRunning$",
"host": "^Enabled$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -34,7 +34,7 @@
"end": {
"redfish": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemHardwareInitializationComplete|OSRunning$",
+ "boot_progress": "^SystemHardwareInitializationComplete|OSBootStarted|OSRunning$",
"host": "^Enabled$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -133,7 +133,7 @@
"start": {
"redfish": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemHardwareInitializationComplete|OSRunning$",
+ "boot_progress": "^SystemHardwareInitializationComplete|OSBootStarted|OSRunning$",
"host": "^Enabled$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -162,7 +162,7 @@
"start": {
"redfish": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemHardwareInitializationComplete|OSRunning$",
+ "boot_progress": "^SystemHardwareInitializationComplete|OSBootStarted|OSRunning$",
"host": "^Enabled$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -171,7 +171,7 @@
"end": {
"redfish": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemHardwareInitializationComplete|OSRunning$",
+ "boot_progress": "^SystemHardwareInitializationComplete|OSBootStarted|OSRunning$",
"host": "^Enabled$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -187,7 +187,7 @@
"start": {
"redfish": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemHardwareInitializationComplete|OSRunning$",
+ "boot_progress": "^SystemHardwareInitializationComplete|OSBootStarted|OSRunning$",
"host": "^Enabled$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -196,7 +196,7 @@
"end": {
"redfish": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemHardwareInitializationComplete|OSRunning$",
+ "boot_progress": "^SystemHardwareInitializationComplete|OSBootStarted|OSRunning$",
"host": "^Enabled$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -211,7 +211,7 @@
"start": {
"redfish": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemHardwareInitializationComplete|OSRunning$",
+ "boot_progress": "^SystemHardwareInitializationComplete|OSBootStarted|OSRunning$",
"host": "^Enabled$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -220,7 +220,7 @@
"end": {
"redfish": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemHardwareInitializationComplete|OSRunning$",
+ "boot_progress": "^SystemHardwareInitializationComplete|OSBootStarted|OSRunning$",
"host": "^Enabled$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -269,7 +269,7 @@
"start": {
"redfish": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemHardwareInitializationComplete|OSRunning$",
+ "boot_progress": "^SystemHardwareInitializationComplete|OSBootStarted|OSRunning$",
"host": "^Enabled$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -278,7 +278,7 @@
"end": {
"redfish": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemHardwareInitializationComplete|OSRunning$",
+ "boot_progress": "^SystemHardwareInitializationComplete|OSBootStarted|OSRunning$",
"host": "^Enabled$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -312,7 +312,7 @@
"start": {
"redfish": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemHardwareInitializationComplete|OSRunning$",
+ "boot_progress": "^SystemHardwareInitializationComplete|OSBootStarted|OSRunning$",
"host": "^Enabled$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -321,7 +321,7 @@
"end": {
"redfish": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemHardwareInitializationComplete|OSRunning$",
+ "boot_progress": "^SystemHardwareInitializationComplete|OSBootStarted|OSRunning$",
"host": "^Enabled$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -356,7 +356,7 @@
"start": {
"redfish": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemHardwareInitializationComplete|OSRunning$",
+ "boot_progress": "^SystemHardwareInitializationComplete|OSBootStarted|OSRunning$",
"host": "^Enabled$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -365,7 +365,7 @@
"end": {
"redfish": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemHardwareInitializationComplete|OSRunning$",
+ "boot_progress": "^SystemHardwareInitializationComplete|OSBootStarted|OSRunning$",
"host": "^Enabled$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -400,7 +400,7 @@
"start": {
"redfish": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemHardwareInitializationComplete|OSRunning$",
+ "boot_progress": "^SystemHardwareInitializationComplete|OSBootStarted|OSRunning$",
"host": "^Enabled$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -409,7 +409,7 @@
"end": {
"redfish": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemHardwareInitializationComplete|OSRunning$",
+ "boot_progress": "^SystemHardwareInitializationComplete|OSBootStarted|OSRunning$",
"host": "^Enabled$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -444,7 +444,7 @@
"start": {
"redfish": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemHardwareInitializationComplete|OSRunning$",
+ "boot_progress": "^SystemHardwareInitializationComplete|OSBootStarted|OSRunning$",
"host": "^Enabled$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -453,7 +453,7 @@
"end": {
"redfish": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemHardwareInitializationComplete|OSRunning$",
+ "boot_progress": "^SystemHardwareInitializationComplete|OSBootStarted|OSRunning$",
"host": "^Enabled$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -490,7 +490,7 @@
"start": {
"redfish": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemHardwareInitializationComplete|OSRunning$",
+ "boot_progress": "^SystemHardwareInitializationComplete|OSBootStarted|OSRunning$",
"host": "^Enabled$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -499,7 +499,7 @@
"end": {
"redfish": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemHardwareInitializationComplete|OSRunning$",
+ "boot_progress": "^SystemHardwareInitializationComplete|OSBootStarted|OSRunning$",
"host": "^Enabled$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -516,7 +516,7 @@
"start": {
"redfish": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemHardwareInitializationComplete|OSRunning$",
+ "boot_progress": "^SystemHardwareInitializationComplete|OSBootStarted|OSRunning$",
"host": "^Enabled$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -525,7 +525,7 @@
"end": {
"redfish": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemHardwareInitializationComplete|OSRunning$",
+ "boot_progress": "^SystemHardwareInitializationComplete|OSBootStarted|OSRunning$",
"host": "^Enabled$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -541,7 +541,7 @@
"start": {
"redfish": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemHardwareInitializationComplete|OSRunning$",
+ "boot_progress": "^SystemHardwareInitializationComplete|OSBootStarted|OSRunning$",
"host": "^Enabled$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -550,7 +550,7 @@
"end": {
"redfish": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemHardwareInitializationComplete|OSRunning$",
+ "boot_progress": "^SystemHardwareInitializationComplete|OSBootStarted|OSRunning$",
"host": "^Enabled$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -566,7 +566,7 @@
"start": {
"redfish": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemHardwareInitializationComplete|OSRunning$",
+ "boot_progress": "^SystemHardwareInitializationComplete|OSBootStarted|OSRunning$",
"host": "^Enabled$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -575,7 +575,7 @@
"end": {
"redfish": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemHardwareInitializationComplete|OSRunning$",
+ "boot_progress": "^SystemHardwareInitializationComplete|OSBootStarted|OSRunning$",
"host": "^Enabled$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -591,7 +591,7 @@
"start": {
"redfish": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemHardwareInitializationComplete|OSRunning$",
+ "boot_progress": "^SystemHardwareInitializationComplete|OSBootStarted|OSRunning$",
"host": "^Enabled$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -600,7 +600,7 @@
"end": {
"redfish": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemHardwareInitializationComplete|OSRunning$",
+ "boot_progress": "^SystemHardwareInitializationComplete|OSBootStarted|OSRunning$",
"host": "^Enabled$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -616,7 +616,7 @@
"start": {
"redfish": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemHardwareInitializationComplete|OSRunning$",
+ "boot_progress": "^SystemHardwareInitializationComplete|OSBootStarted|OSRunning$",
"host": "^Enabled$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -625,7 +625,7 @@
"end": {
"redfish": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemHardwareInitializationComplete|OSRunning$",
+ "boot_progress": "^SystemHardwareInitializationComplete|OSBootStarted|OSRunning$",
"host": "^Enabled$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -641,7 +641,7 @@
"start": {
"redfish": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemHardwareInitializationComplete|OSRunning$",
+ "boot_progress": "^SystemHardwareInitializationComplete|OSBootStarted|OSRunning$",
"host": "^Enabled$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -650,7 +650,7 @@
"end": {
"redfish": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemHardwareInitializationComplete|OSRunning$",
+ "boot_progress": "^SystemHardwareInitializationComplete|OSBootStarted|OSRunning$",
"host": "^Enabled$",
"os_ping": "^1$",
"os_login": "^1$",
diff --git a/lib/state.py b/lib/state.py
index 44dc414..c715ba0 100755
--- a/lib/state.py
+++ b/lib/state.py
@@ -222,7 +222,8 @@
default_state = DotDict([('redfish', '1'),
('chassis', 'On'),
('bmc', 'Enabled'),
- ('boot_progress', 'SystemHardwareInitializationComplete|OSRunning'),
+ ('boot_progress',
+ 'SystemHardwareInitializationComplete|OSBootStarted|OSRunning'),
('host', 'Enabled'),
('os_ping', '1'),
('os_login', '1'),
@@ -239,7 +240,7 @@
os_running_match_state = DotDict([('chassis', '^On$'),
('bmc', '^Enabled$'),
('boot_progress',
- 'SystemHardwareInitializationComplete|OSRunning'),
+ 'SystemHardwareInitializationComplete|OSBootStarted|OSRunning'),
('host', '^Enabled$'),
('os_ping', '^1$'),
('os_login', '^1$'),
@@ -249,7 +250,7 @@
master_os_up_match = DotDict([('chassis', '^On$'),
('bmc', '^Enabled$'),
('boot_progress',
- 'SystemHardwareInitializationComplete|OSRunning'),
+ 'SystemHardwareInitializationComplete|OSBootStarted|OSRunning'),
('host', '^Enabled$')])
invalid_state_match = DotDict([('redfish', '^$'),