aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzhihui wu <wu.zhihui1@zte.com.cn>2017-09-11 01:19:41 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-09-11 01:19:41 +0000
commitb2336bd1742797e0f38063f654646f115dd62e45 (patch)
tree59038678cb8bca10fda338fff335319bd5ba0ba0
parent4154a75853f6ba004de775194ebffbe00b591012 (diff)
parent9d52bb9dd0500fa98ce3bdd8142af316adf1804e (diff)
Merge "Mitigating for missing values in storage QPI."
-rw-r--r--qtip/cli/commands/cmd_qpi.py8
-rw-r--r--tests/unit/cli/cmd_qpi_test.py7
2 files changed, 11 insertions, 4 deletions
diff --git a/qtip/cli/commands/cmd_qpi.py b/qtip/cli/commands/cmd_qpi.py
index 4865b7ae..a2802032 100644
--- a/qtip/cli/commands/cmd_qpi.py
+++ b/qtip/cli/commands/cmd_qpi.py
@@ -44,6 +44,10 @@ def show(name):
with open('{}/{}.yaml'.format(QPI_PATH, name)) as conf:
qpi = yaml.safe_load(conf)
for section in qpi['sections']:
- table.add_row([section['name'], section['description'],
- section['formula']])
+ try:
+ table.add_row([section['name'], section['description'],
+ section['formula']])
+ except Exception:
+ table.add_row([section['name'], section['description'],
+ 'Not Available'])
click.echo(table)
diff --git a/tests/unit/cli/cmd_qpi_test.py b/tests/unit/cli/cmd_qpi_test.py
index ba5f814e..fa0c859d 100644
--- a/tests/unit/cli/cmd_qpi_test.py
+++ b/tests/unit/cli/cmd_qpi_test.py
@@ -26,8 +26,11 @@ def test_list(runner):
assert 'QTIP Performance Index of compute' in result.output
-def test_show(runner):
- result = runner.invoke(cli, ['qpi', 'show', 'compute'])
+@pytest.mark.parametrize("test_input", [
+ 'storage',
+ 'compute'])
+def test_show(runner, test_input):
+ result = runner.invoke(cli, ['qpi', 'show', test_input])
assert 'QPI' in result.output
assert 'Description' in result.output
assert 'Formula' in result.output