ffdc: Change config file option to -c
- Change config file option to -c and expand printing of os-release info
Tests:
- Regression testing to OpenBmc, AIX and Ubuntu targets.
Signed-off-by: Peter D Phan <peterp@us.ibm.com>
Change-Id: I43e2e6c81a7a9b27422884bee77bf50f426da0df
diff --git a/ffdc/collect_ffdc.py b/ffdc/collect_ffdc.py
index 48a849e..ca56b41 100644
--- a/ffdc/collect_ffdc.py
+++ b/ffdc/collect_ffdc.py
@@ -28,7 +28,7 @@
help="User on the remote host with access to FFDC files.[default: OPENBMC_USERNAME]")
@click.option('-p', '--password', envvar='OPENBMC_PASSWORD',
help="Password for user on remote host. [default: OPENBMC_PASSWORD]")
-@click.option('-f', '--ffdc_config', default=abs_path + "/ffdc_config.yaml",
+@click.option('-c', '--ffdc_config', default=abs_path + "/ffdc_config.yaml",
show_default=True, help="YAML Configuration file listing commands and files for FFDC.")
@click.option('-l', '--location', default="/tmp",
show_default=True, help="Location to store collected FFDC data")
diff --git a/ffdc/ffdc_collector.py b/ffdc/ffdc_collector.py
index 6dbb530..9e18b69 100644
--- a/ffdc/ffdc_collector.py
+++ b/ffdc/ffdc_collector.py
@@ -107,7 +107,8 @@
response = self.remoteclient.execute_command(command)
if response:
print("\n\t[INFO] %s /etc/os-release\n" % self.hostname)
- print("\t\t %s" % self.find_os_type(response, 'PRETTY_NAME'))
+ for each_info in response:
+ print("\t\t %s" % each_info)
identity = self.find_os_type(response, 'ID').split('=')[1].upper()
else:
response = self.remoteclient.execute_command('uname -a')