openstack
/
deb-python-gnocchiclient
Code Issues Proposed changes

cli: make resource type non positional 

They are no real reason to make the resource type positional
if its optional, so make it non-positional with --type/-t.

Change-Id: I53e3062c991ef1a100a82e4d3f400f11bd4ffc4a
This commit is contained in:
Mehdi Abaakouk 2015-10-09 11:27:58 +02:00
parent 0c4e0855be
commit 08cd673f75
3 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -119,7 +119,7 @@ class MetricClientTest(base.ClientTestBase):
# PREPARE REQUIREMENT
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")
self.gnocchi("resource", params="create -a id:metric-res")
# CREATE
result = self.gnocchi(

23
gnocchiclient/tests/functional/test_resource.py
View File

@ -23,7 +23,8 @@ class ResourceClientTest(base.ClientTestBase):
def test_resource_scenario(self):
# CREATE
result = self.gnocchi(
u'resource', params=u"create generic -a id:%s" % self.RESOURCE_ID)
u'resource', params=u"create --type generic -a id:%s" %
self.RESOURCE_ID)
resource = self.details_multiple(result)
resource = self.details_multiple(result)[0]
self.assertEqual(self.RESOURCE_ID, resource["id"])
@ -32,7 +33,7 @@ class ResourceClientTest(base.ClientTestBase):
# UPDATE
result = self.gnocchi(
'resource', params=("update generic %s -a project_id:%s "
'resource', params=("update -t generic %s -a project_id:%s "
"-m temperature:high" %
(self.RESOURCE_ID, self.PROJECT_ID)))
resource_updated = self.details_multiple(result)[0]
@ -44,7 +45,7 @@ class ResourceClientTest(base.ClientTestBase):
# GET
result = self.gnocchi(
'resource', params="show generic %s" % self.RESOURCE_ID)
'resource', params="show -t generic %s" % self.RESOURCE_ID)
resource_got = self.details_multiple(result)[0]
self.assertEqual(self.RESOURCE_ID, resource_got["id"])
self.assertEqual(self.PROJECT_ID, resource_got["project_id"])
@ -53,7 +54,7 @@ class ResourceClientTest(base.ClientTestBase):
# HISTORY
result = self.gnocchi(
'resource', params="history generic %s" % self.RESOURCE_ID)
'resource', params="history --type generic %s" % self.RESOURCE_ID)
resource_history = self.parser.listing(result)
self.assertEqual(2, len(resource_history))
self.assertEqual(self.RESOURCE_ID, resource_history[0]["id"])
@ -62,7 +63,7 @@ class ResourceClientTest(base.ClientTestBase):
self.assertEqual(self.PROJECT_ID, resource_history[1]["project_id"])
# LIST
result = self.gnocchi('resource', params="list generic")
result = self.gnocchi('resource', params="list -t generic")
self.assertIn(self.RESOURCE_ID,
[r['id'] for r in self.parser.listing(result)])
resource_list = [r for r in self.parser.listing(result)
@ -73,7 +74,7 @@ class ResourceClientTest(base.ClientTestBase):
# Search
result = self.gnocchi('resource',
params=("search generic "
params=("search --type generic "
"--query 'project_id=%s'"
) % self.PROJECT_ID)
resource_list = self.parser.listing(result)[0]
@ -83,7 +84,7 @@ class ResourceClientTest(base.ClientTestBase):
# CREATE 2
result = self.gnocchi(
'resource', params=("create generic "
'resource', params=("create -t generic "
"-a id:%s "
"-a project_id:%s"
) % (self.RESOURCE_ID2, self.PROJECT_ID))
@ -94,7 +95,8 @@ class ResourceClientTest(base.ClientTestBase):
# Search + limit + short
result = self.gnocchi('resource',
params=("search generic "
params=("search "
"-t generic "
"--query 'project_id=%s' "
"--sort started_at:asc "
"--marker %s "
@ -115,7 +117,8 @@ class ResourceClientTest(base.ClientTestBase):
# GET FAIL
result = self.gnocchi('resource',
params="show generic %s" % self.RESOURCE_ID,
params="show --type generic %s" %
self.RESOURCE_ID,
fail_ok=True, merge_stderr=True)
self.assertFirstLineStartsWith(result.split('\n'),
"Not Found (HTTP 404)")
@ -128,7 +131,7 @@ class ResourceClientTest(base.ClientTestBase):
"Not Found (HTTP 404)")
# LIST EMPTY
result = self.gnocchi('resource', params="list generic")
result = self.gnocchi('resource', params="list -t generic")
resource_ids = [r['id'] for r in self.parser.listing(result)]
self.assertNotIn(self.RESOURCE_ID, resource_ids)
self.assertNotIn(self.RESOURCE_ID2, resource_ids)

18
gnocchiclient/v1/resource_cli.py
View File

@ -42,10 +42,8 @@ class CliResourceList(lister.Lister):
parser.add_argument("--sort", action="append", metavar="<SORT>",
help=("Sort of resource attribute ",
"(example: user_id:desc-nullslast"))
parser.add_argument("resource_type",
default="generic",
nargs='?',
help="Type of resource")
parser.add_argument("--type", "-t", dest="resource_type",
default="generic", help="Type of resource")
return parser
def take_action(self, parsed_args):
@ -106,10 +104,8 @@ def normalize_metrics(res):
class CliResourceShow(show.ShowOne):
def get_parser(self, prog_name):
parser = super(CliResourceShow, self).get_parser(prog_name)
parser.add_argument("resource_type",
default="generic",
nargs='?',
help="Type of resource")
parser.add_argument("--type", "-t", dest="resource_type",
default="generic", help="Type of resource")
parser.add_argument("resource_id",
help="ID of a resource")
return parser
@ -125,10 +121,8 @@ class CliResourceShow(show.ShowOne):
class CliResourceCreate(show.ShowOne):
def get_parser(self, prog_name):
parser = super(CliResourceCreate, self).get_parser(prog_name)
parser.add_argument("resource_type",
default="generic",
nargs='?',
help="Type of resource")
parser.add_argument("--type", "-t", dest="resource_type",
default="generic", help="Type of resource")
parser.add_argument("-a", "--attribute", action='append',
help=("name and value of a attribute "
"separated with a ':'"))