Redfish boot table and introduce transition varaible
Changes:
- Update redfish boot table.
- Added REDFISH_SUPPORT_TRANS_STATE transition flag
to enable REST vs Redfish and new boot progress
changes.
Change-Id: I82d422bc811b91061a4f007c606712665c660c48
Signed-off-by: George Keishing <gkeishin@in.ibm.com>
diff --git a/data/boot_table_redfish.json b/data/boot_table_redfish.json
index 4099355..cb5d55c 100644
--- a/data/boot_table_redfish.json
+++ b/data/boot_table_redfish.json
@@ -12,7 +12,7 @@
"end": {
"rest": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
+ "boot_progress": "^SystemInitComplete|OSRunning$",
"host": "^Running$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -34,7 +34,7 @@
"end": {
"rest": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
+ "boot_progress": "^SystemInitComplete|OSRunning$",
"host": "^Running$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -133,7 +133,7 @@
"start": {
"rest": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
+ "boot_progress": "^SystemInitComplete|OSRunning$",
"host": "^Running$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -162,7 +162,7 @@
"start": {
"rest": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
+ "boot_progress": "^SystemInitComplete|OSRunning$",
"host": "^Running$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -171,7 +171,7 @@
"end": {
"rest": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
+ "boot_progress": "^SystemInitComplete|OSRunning$",
"host": "^Running$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -187,7 +187,7 @@
"start": {
"rest": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
+ "boot_progress": "^SystemInitComplete|OSRunning$",
"host": "^Running$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -196,7 +196,7 @@
"end": {
"rest": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
+ "boot_progress": "^SystemInitComplete|OSRunning$",
"host": "^Running$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -211,7 +211,7 @@
"start": {
"rest": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
+ "boot_progress": "^SystemInitComplete|OSRunning$",
"host": "^Running$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -220,7 +220,7 @@
"end": {
"rest": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
+ "boot_progress": "^SystemInitComplete|OSRunning$",
"host": "^Running$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -236,7 +236,7 @@
"start": {
"rest": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
+ "boot_progress": "^SystemInitComplete|OSRunning$",
"host": "^Running$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -245,7 +245,7 @@
"end": {
"rest": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
+ "boot_progress": "^SystemInitComplete|OSRunning$",
"host": "^Running$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -294,7 +294,7 @@
"start": {
"rest": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
+ "boot_progress": "^SystemInitComplete|OSRunning$",
"host": "^Running$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -303,7 +303,7 @@
"end": {
"rest": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
+ "boot_progress": "^SystemInitComplete|OSRunning$",
"host": "^Running$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -337,7 +337,7 @@
"start": {
"rest": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
+ "boot_progress": "^SystemInitComplete|OSRunning$",
"host": "^Running$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -346,7 +346,7 @@
"end": {
"rest": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
+ "boot_progress": "^SystemInitComplete|OSRunning$",
"host": "^Running$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -381,7 +381,7 @@
"start": {
"rest": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
+ "boot_progress": "^SystemInitComplete|OSRunning$",
"host": "^Running$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -390,7 +390,7 @@
"end": {
"rest": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
+ "boot_progress": "^SystemInitComplete|OSRunning$",
"host": "^Running$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -425,7 +425,7 @@
"start": {
"rest": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
+ "boot_progress": "^SystemInitComplete|OSRunning$",
"host": "^Running$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -434,7 +434,7 @@
"end": {
"rest": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
+ "boot_progress": "^SystemInitComplete|OSRunning$",
"host": "^Running$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -469,7 +469,7 @@
"start": {
"rest": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
+ "boot_progress": "^SystemInitComplete|OSRunning$",
"host": "^Running$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -478,7 +478,7 @@
"end": {
"rest": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
+ "boot_progress": "^SystemInitComplete|OSRunning$",
"host": "^Running$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -515,7 +515,7 @@
"start": {
"rest": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
+ "boot_progress": "^SystemInitComplete|OSRunning$",
"host": "^Running$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -524,7 +524,7 @@
"end": {
"rest": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
+ "boot_progress": "^SystemInitComplete|OSRunning$",
"host": "^Running$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -541,7 +541,7 @@
"start": {
"rest": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
+ "boot_progress": "^SystemInitComplete|OSRunning$",
"host": "^Running$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -550,7 +550,7 @@
"end": {
"rest": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
+ "boot_progress": "^SystemInitComplete|OSRunning$",
"host": "^Running$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -566,7 +566,7 @@
"start": {
"rest": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
+ "boot_progress": "^SystemInitComplete|OSRunning$",
"host": "^Running$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -575,7 +575,7 @@
"end": {
"rest": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
+ "boot_progress": "^SystemInitComplete|OSRunning$",
"host": "^Running$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -591,7 +591,7 @@
"start": {
"rest": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
+ "boot_progress": "^SystemInitComplete|OSRunning$",
"host": "^Running$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -600,7 +600,7 @@
"end": {
"rest": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
+ "boot_progress": "^SystemInitComplete|OSRunning$",
"host": "^Running$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -616,7 +616,7 @@
"start": {
"rest": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
+ "boot_progress": "^SystemInitComplete|OSRunning$",
"host": "^Running$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -625,7 +625,7 @@
"end": {
"rest": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
+ "boot_progress": "^SystemInitComplete|OSRunning$",
"host": "^Running$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -641,7 +641,7 @@
"start": {
"rest": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
+ "boot_progress": "^SystemInitComplete|OSRunning$",
"host": "^Running$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -650,7 +650,7 @@
"end": {
"rest": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
+ "boot_progress": "^SystemInitComplete|OSRunning$",
"host": "^Running$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -666,7 +666,7 @@
"start": {
"rest": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
+ "boot_progress": "^SystemInitComplete|OSRunning$",
"host": "^Running$",
"os_ping": "^1$",
"os_login": "^1$",
@@ -675,7 +675,7 @@
"end": {
"rest": "^1$",
"chassis": "^On$",
- "boot_progress": "^SystemInitComplete|OSBootStarted|OSRunning$",
+ "boot_progress": "^SystemInitComplete|OSRunning$",
"host": "^Running$",
"os_ping": "^1$",
"os_login": "^1$",
diff --git a/lib/resource.robot b/lib/resource.robot
index dfd7a67..9d5379e 100755
--- a/lib/resource.robot
+++ b/lib/resource.robot
@@ -7,6 +7,10 @@
*** Variables ***
+# Transition REST vs Redfish ONLY temporary changes for stagging
+# automation infrastructure change and for continuity.
+${REDFISH_SUPPORT_TRANS_STATE} 0
+
${OPENBMC_MODEL} ${EMPTY}
${OPENBMC_HOST} ${EMPTY}
${DBUS_PREFIX} ${EMPTY}