defbb95855
Fixes bug 1298528 Due to WSME re-ordering of query parameters, in the mixed case any parameterized aggregates must be specified in the URL first, prior to any unparameterized aggregates. Otherwise the aggregate parameter will be associated with the wrong aggregate function. Change-Id: Ib2c76d03a4fc91d13074a03caade2c776d2309b3
51 lines
1.8 KiB
Python
51 lines
1.8 KiB
Python
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
from ceilometerclient.common import base
|
|
from ceilometerclient.v2 import options
|
|
|
|
|
|
class Statistics(base.Resource):
|
|
def __repr__(self):
|
|
return "<Statistics %s>" % self._info
|
|
|
|
|
|
class StatisticsManager(base.Manager):
|
|
resource_class = Statistics
|
|
|
|
def _build_aggregates(self, aggregates):
|
|
url_aggregates = []
|
|
for aggregate in aggregates:
|
|
if 'param' in aggregate:
|
|
url_aggregates.insert(
|
|
0,
|
|
"aggregate.param=%(param)s" % aggregate
|
|
)
|
|
url_aggregates.insert(
|
|
0,
|
|
"aggregate.func=%(func)s" % aggregate
|
|
)
|
|
else:
|
|
url_aggregates.append(
|
|
"aggregate.func=%(func)s" % aggregate
|
|
)
|
|
return url_aggregates
|
|
|
|
def list(self, meter_name, q=None, period=None, groupby=[], aggregates=[]):
|
|
p = ['period=%s' % period] if period else []
|
|
p.extend(['groupby=%s' % g for g in groupby] if groupby else [])
|
|
p.extend(self._build_aggregates(aggregates))
|
|
return self._list(options.build_url(
|
|
'/v2/meters/' + meter_name + '/statistics',
|
|
q, p))
|