Update log collection logic
Changes:
- Terminate log collection if SSH, and Redfish fails
Change-Id: Ib3dde69d1a1b4396640421160277909ccd83ef67
Signed-off-by: George Keishing <gkeishin@in.ibm.com>
diff --git a/lib/openbmc_ffdc.py b/lib/openbmc_ffdc.py
index 5a4657b..78f596c 100644
--- a/lib/openbmc_ffdc.py
+++ b/lib/openbmc_ffdc.py
@@ -59,12 +59,14 @@
return ffdc_file_list
if not int(state[interface]):
- gp.print_error("%s commands to the BMC are failing." % interface
- + " Terminating FFDC collection.\n")
- return ffdc_file_list
+ gp.print_error("%s commands to the BMC are failing." % interface)
if state['uptime'] == "":
- gp.print_error("BMC is not communicating via ssh. Terminating FFDC"
+ gp.print_error("BMC is not communicating via ssh.\n")
+
+ # If SSH and Redfish connection doesn't works, abort.
+ if not int(state[interface]) and state['uptime'] == "":
+ gp.print_error("BMC is not communicating via ssh or Redfish. Terminating FFDC"
+ " collection.\n")
return ffdc_file_list
diff --git a/tools/myffdc.robot b/tools/myffdc.robot
index 1dff23b..63bf1a1 100755
--- a/tools/myffdc.robot
+++ b/tools/myffdc.robot
@@ -45,5 +45,3 @@
[Documentation] Call point to call FFDC robot or FFDC script..
Run Keyword If ${FFDC_DEFAULT} == ${1} FFDC # Keyword from openbmc_ffdc.py
... ELSE ffdc_robot_script_cli # Keyword from ffdc_cli_robot_script.py
-
-