openstack
/
deb-python-gnocchiclient
Code Issues Proposed changes

Replaces 'archive policy' by 'archive-policy' 

For consistency aspect the first word of the command must be
the resource to view/change, this is not really true for achive policy
and archive policy rule.

This change adds a '-' instead of space to fix that.

Also this change cleanup the command list for more readability.

Change-Id: Ic0218d1977584b33b73c12beaca04352f472971e
This commit is contained in:
Mehdi Abaakouk 2015-09-18 09:08:51 +02:00
parent cf0f9b7539
commit d00f361255
4 changed files with 37 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
gnocchiclient/shell.py
View File

@ -36,28 +36,28 @@ from gnocchiclient.version import __version__
LOG = logging.getLogger(__name__)
SHELL_COMMANDS = {
"resource_list": resource_cli.CliResourceList,
"resource_show": resource_cli.CliResourceShow,
"resource_history": resource_cli.CliResourceHistory,
"resource_search": resource_cli.CliResourceSearch,
"resource_create": resource_cli.CliResourceCreate,
"resource_update": resource_cli.CliResourceUpdate,
"resource_delete": resource_cli.CliResourceDelete,
"archive_policy_list": archive_policy_cli.CliArchivePolicyList,
"archive_policy_show": archive_policy_cli.CliArchivePolicyShow,
"archive_policy_create": archive_policy_cli.CliArchivePolicyCreate,
"archive_policy_delete": archive_policy_cli.CliArchivePolicyDelete,
"archive_policy_rule_list": ap_rule_cli.CliArchivePolicyRuleList,
"archive_policy_rule_show": ap_rule_cli.CliArchivePolicyRuleShow,
"archive_policy_rule_create": ap_rule_cli.CliArchivePolicyRuleCreate,
"archive_policy_rule_delete": ap_rule_cli.CliArchivePolicyRuleDelete,
"metric_list": metric_cli.CliMetricList,
"metric_show": metric_cli.CliMetricShow,
"metric_create": metric_cli.CliMetricCreate,
"metric_delete": metric_cli.CliMetricDelete,
"measures_get": metric_cli.CliMeasuresGet,
"measures_add": metric_cli.CliMeasuresAdd,
"measures_aggregation": metric_cli.CliMeasuresAggregation,
"resource list": resource_cli.CliResourceList,
"resource show": resource_cli.CliResourceShow,
"resource history": resource_cli.CliResourceHistory,
"resource search": resource_cli.CliResourceSearch,
"resource create": resource_cli.CliResourceCreate,
"resource update": resource_cli.CliResourceUpdate,
"resource delete": resource_cli.CliResourceDelete,
"archive-policy list": archive_policy_cli.CliArchivePolicyList,
"archive-policy show": archive_policy_cli.CliArchivePolicyShow,
"archive-policy create": archive_policy_cli.CliArchivePolicyCreate,
"archive-policy delete": archive_policy_cli.CliArchivePolicyDelete,
"archive-policy-rule list": ap_rule_cli.CliArchivePolicyRuleList,
"archive-policy-rule show": ap_rule_cli.CliArchivePolicyRuleShow,
"archive-policy-rule create": ap_rule_cli.CliArchivePolicyRuleCreate,
"archive-policy-rule delete": ap_rule_cli.CliArchivePolicyRuleDelete,
"metric list": metric_cli.CliMetricList,
"metric show": metric_cli.CliMetricShow,
"metric create": metric_cli.CliMetricCreate,
"metric delete": metric_cli.CliMetricDelete,
"measures get": metric_cli.CliMeasuresGet,
"measures add": metric_cli.CliMeasuresAdd,
"measures aggregation": metric_cli.CliMeasuresAggregation,
}
@ -78,9 +78,7 @@ def _positive_non_zero_int(argument_value):
class GnocchiCommandManager(commandmanager.CommandManager):
def load_commands(self, namespace):
for name, command_class in SHELL_COMMANDS.items():
self.add_command(
name.replace('_', ' ') if self.convert_underscores else name,
command_class)
self.add_command(name, command_class)
class GnocchiShell(app.App):

12
gnocchiclient/tests/functional/test_archive_policy.py
View File

@ -17,7 +17,7 @@ class ArchivePolicyClientTest(base.ClientTestBase):
def test_archive_policy_scenario(self):
# CREATE
result = self.gnocchi(
u'archive policy', params=u"create low"
u'archive-policy', params=u"create low"
u" --back-window 0"
u" -d granularity:1s,points:86400")
policy = self.details_multiple(result)[0]
@ -25,13 +25,13 @@ class ArchivePolicyClientTest(base.ClientTestBase):
# GET
result = self.gnocchi(
'archive policy', params="show low")
'archive-policy', params="show low")
policy = self.details_multiple(result)[0]
self.assertEqual("low", policy["name"])
# LIST
result = self.gnocchi(
'archive policy', params="list")
'archive-policy', params="list")
policies = self.parser.listing(result)
policy_from_list = [p for p in policies
if p['name'] == 'low'][0]
@ -39,19 +39,19 @@ class ArchivePolicyClientTest(base.ClientTestBase):
self.assertEqual(policy[field], policy_from_list[field])
# DELETE
result = self.gnocchi('archive policy',
result = self.gnocchi('archive-policy',
params="delete low")
self.assertEqual("", result)
# GET FAIL
result = self.gnocchi('archive policy',
result = self.gnocchi('archive-policy',
params="show low",
fail_ok=True, merge_stderr=True)
self.assertFirstLineStartsWith(result.split('\n'),
"Not Found (HTTP 404)")
# DELETE FAIL
result = self.gnocchi('archive policy',
result = self.gnocchi('archive-policy',
params="delete low",
fail_ok=True, merge_stderr=True)
self.assertFirstLineStartsWith(result.split('\n'),

12
gnocchiclient/tests/functional/test_archive_policy_rule.py
View File

@ -17,7 +17,7 @@ class ArchivePolicyRuleClientTest(base.ClientTestBase):
def test_archive_policy_rule_scenario(self):
# CREATE
result = self.gnocchi(
u'archive policy rule', params=u"create test"
u'archive-policy-rule', params=u"create test"
u" --archive-policy high"
u" --metric-pattern 'disk.io.*'")
policy_rule = self.details_multiple(result)[0]
@ -25,12 +25,12 @@ class ArchivePolicyRuleClientTest(base.ClientTestBase):
# GET
result = self.gnocchi(
'archive policy rule', params="show test")
'archive-policy-rule', params="show test")
policy_rule = self.details_multiple(result)[0]
self.assertEqual("test", policy_rule["name"])
# LIST
result = self.gnocchi('archive policy rule', params="list")
result = self.gnocchi('archive-policy-rule', params="list")
rules = self.parser.listing(result)
rule_from_list = [p for p in rules
if p['name'] == 'test'][0]
@ -38,19 +38,19 @@ class ArchivePolicyRuleClientTest(base.ClientTestBase):
self.assertEqual(policy_rule[field], rule_from_list[field])
# DELETE
result = self.gnocchi('archive policy rule',
result = self.gnocchi('archive-policy-rule',
params="delete test")
self.assertEqual("", result)
# GET FAIL
result = self.gnocchi('archive policy rule',
result = self.gnocchi('archive-policy-rule',
params="show test",
fail_ok=True, merge_stderr=True)
self.assertFirstLineStartsWith(result.split('\n'),
"Not Found (HTTP 404)")
# DELETE FAIL
result = self.gnocchi('archive policy rule',
result = self.gnocchi('archive-policy-rule',
params="delete test",
fail_ok=True, merge_stderr=True)
self.assertFirstLineStartsWith(result.split('\n'),

4
gnocchiclient/tests/functional/test_metric.py
View File

@ -16,7 +16,7 @@ from gnocchiclient.tests.functional import base
class MetricClientTest(base.ClientTestBase):
def test_metric_scenario(self):
# PREPARE AN ACHIVE POLICY
self.gnocchi("archive policy", params="create metric-test "
self.gnocchi("archive-policy", params="create metric-test "
"--back-window 0 -d granularity:1s,points:86400")
# CREATE
@ -104,7 +104,7 @@ class MetricClientTest(base.ClientTestBase):
def test_metric_by_name_scenario(self):
# PREPARE REQUIREMENT
self.gnocchi("archive policy", params="create metric-test2 "
self.gnocchi("archive-policy", params="create metric-test2 "
"--back-window 0 -d granularity:1s,points:86400")
self.gnocchi("resource", params="create generic -a id:metric-res")