openstack
/
deb-python-gnocchiclient
Code Issues Proposed changes

metric: change all resource_id options to -r 

Change-Id: I4d6347395a0f41085ee26afb679a23f7b38f8c41
This commit is contained in:
Julien Danjou 2015-10-01 17:45:34 +02:00
parent 06f0a42aa7
commit a5c8b53a04
3 changed files with 18 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gnocchiclient/benchmark.py
View File

@ -15,7 +15,7 @@ import argparse
import logging
import time
from cliff import command
from cliff import show
import futurist
from oslo_utils import timeutils
import six.moves
@ -98,7 +98,7 @@ class BenchmarkPool(futurist.ThreadPoolExecutor):
}
class CliBenchmarkBase(command.Command):
class CliBenchmarkBase(show.ShowOne):
def get_parser(self, prog_name):
parser = super(CliBenchmarkBase, self).get_parser(prog_name)
parser.add_argument("--workers", "-w",
@ -109,7 +109,7 @@ class CliBenchmarkBase(command.Command):
class CliBenchmarkMetricShow(CliBenchmarkBase,
metric_cli.CliMetricShowBase):
metric_cli.CliMetricWithResourceID):
def get_parser(self, prog_name):
parser = super(CliBenchmarkMetricShow, self).get_parser(prog_name)
parser.add_argument("metric", nargs='+',

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

@ -174,14 +174,14 @@ class MetricClientTest(base.ClientTestBase):
# MEASURES ADD
result = self.gnocchi('measures',
params=("add metric-name metric-res "
params=("add metric-name -r metric-res "
"-m '2015-03-06T14:33:57@43.11' "
"--measure '2015-03-06T14:34:12@12'"))
self.assertEqual("", result)
# MEASURES GET
result = self.retry_gnocchi(
5, 'measures', params=("get metric-name metric-res "
5, 'measures', params=("get metric-name -r metric-res "
"--aggregation mean "
"--start 2015-03-06T14:32:00 "
"--end 2015-03-06T14:36:00"))

35
gnocchiclient/v1/metric_cli.py
View File

@ -18,6 +18,14 @@ from cliff import show
from gnocchiclient import utils
class CliMetricWithResourceID(command.Command):
def get_parser(self, prog_name):
parser = super(CliMetricWithResourceID, self).get_parser(prog_name)
parser.add_argument("--resource-id", "-r",
help="ID of the resource")
return parser
class CliMetricList(lister.Lister):
COLS = ('id', 'archive_policy/name', 'name', 'resource_id')
@ -29,15 +37,7 @@ class CliMetricList(lister.Lister):
return utils.list2cols(self.COLS, metrics)
class CliMetricShowBase(show.ShowOne):
def get_parser(self, prog_name):
parser = super(CliMetricShowBase, self).get_parser(prog_name)
parser.add_argument("--resource-id", "-r",
help="ID of the resource")
return parser
class CliMetricShow(CliMetricShowBase):
class CliMetricShow(CliMetricWithResourceID, show.ShowOne):
def get_parser(self, prog_name):
parser = super(CliMetricShow, self).get_parser(prog_name)
parser.add_argument("metric",
@ -53,15 +53,12 @@ class CliMetricShow(CliMetricShowBase):
return self.dict2columns(metric)
class CliMetricCreateBase(show.ShowOne):
class CliMetricCreateBase(show.ShowOne, CliMetricWithResourceID):
def get_parser(self, prog_name):
parser = super(CliMetricCreateBase, self).get_parser(prog_name)
parser.add_argument("--archive-policy-name", "-a",
dest="archive_policy_name",
help=("name of the archive policy"))
parser.add_argument("--resource-id", "-r",
dest="resource_id",
help="ID of the resource")
return parser
def take_action(self, parsed_args):
@ -89,13 +86,11 @@ class CliMetricCreate(CliMetricCreateBase):
return self.dict2columns(metric)
class CliMetricDelete(command.Command):
class CliMetricDelete(CliMetricWithResourceID):
def get_parser(self, prog_name):
parser = super(CliMetricDelete, self).get_parser(prog_name)
parser.add_argument("metric", nargs='+',
help="IDs or names of the metric")
parser.add_argument("--resource-id", "-r",
help="ID of the resource")
return parser
def take_action(self, parsed_args):
@ -104,15 +99,13 @@ class CliMetricDelete(command.Command):
resource_id=parsed_args.resource_id)
class CliMeasuresGet(lister.Lister):
class CliMeasuresGet(CliMetricWithResourceID, lister.Lister):
COLS = ('timestamp', 'granularity', 'value')
def get_parser(self, prog_name):
parser = super(CliMeasuresGet, self).get_parser(prog_name)
parser.add_argument("metric",
help="ID or name of the metric")
parser.add_argument("resource_id", nargs='?',
help="ID of the resource")
parser.add_argument("--aggregation",
help="aggregation to retrieve")
parser.add_argument("--start",
@ -132,7 +125,7 @@ class CliMeasuresGet(lister.Lister):
return self.COLS, measures
class CliMeasuresAdd(command.Command):
class CliMeasuresAdd(CliMetricWithResourceID):
def measure(self, measure):
timestamp, __, value = measure.rpartition("@")
return {'timestamp': timestamp, 'value': float(value)}
@ -141,8 +134,6 @@ class CliMeasuresAdd(command.Command):
parser = super(CliMeasuresAdd, self).get_parser(prog_name)
parser.add_argument("metric",
help="ID or name of the metric")
parser.add_argument("resource_id", nargs='?',
help="ID of the resource")
parser.add_argument("-m", "--measure", action='append',
required=True, type=self.measure,
help=("timestamp and value of a measure "