Merge "Pass 'type' as metric_types in /v2/summary endpoints"
This commit is contained in:
commit
c920108d5a
|
@ -47,10 +47,12 @@ class Summary(base.BaseResource):
|
||||||
if not flask.request.context.is_admin:
|
if not flask.request.context.is_admin:
|
||||||
filters['project_id'] = flask.request.context.project_id
|
filters['project_id'] = flask.request.context.project_id
|
||||||
|
|
||||||
|
metric_types = [filters.pop('type')] if 'type' in filters else None
|
||||||
total = self._storage.total(
|
total = self._storage.total(
|
||||||
begin=begin, end=end,
|
begin=begin, end=end,
|
||||||
groupby=groupby,
|
groupby=groupby,
|
||||||
filters=filters,
|
filters=filters,
|
||||||
|
metric_types=metric_types,
|
||||||
offset=offset,
|
offset=offset,
|
||||||
limit=limit,
|
limit=limit,
|
||||||
paginate=True,
|
paginate=True,
|
||||||
|
|
|
@ -0,0 +1,46 @@
|
||||||
|
# Copyright 2019 Objectif Libre
|
||||||
|
#
|
||||||
|
# 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.
|
||||||
|
#
|
||||||
|
import unittest
|
||||||
|
|
||||||
|
import mock
|
||||||
|
|
||||||
|
from cloudkitty.api.v2.summary import summary
|
||||||
|
from cloudkitty import tzutils
|
||||||
|
|
||||||
|
|
||||||
|
class TestSummaryEndpoint(unittest.TestCase):
|
||||||
|
|
||||||
|
def setUp(self):
|
||||||
|
super(TestSummaryEndpoint, self).setUp()
|
||||||
|
self.endpoint = summary.Summary()
|
||||||
|
|
||||||
|
def test_type_filter_is_passed_separately(self):
|
||||||
|
policy_mock = mock.patch('cloudkitty.common.policy.authorize')
|
||||||
|
with mock.patch.object(self.endpoint._storage, 'total') as total_mock:
|
||||||
|
with policy_mock, mock.patch('flask.request') as fmock:
|
||||||
|
total_mock.return_value = {'total': 0, 'results': []}
|
||||||
|
fmock.args.lists.return_value = [
|
||||||
|
('filters', 'a:b,type:awesome')]
|
||||||
|
self.endpoint.get()
|
||||||
|
total_mock.assert_called_once_with(
|
||||||
|
begin=tzutils.get_month_start(),
|
||||||
|
end=tzutils.get_next_month(),
|
||||||
|
groupby=None,
|
||||||
|
filters={'a': 'b'},
|
||||||
|
metric_types=['awesome'],
|
||||||
|
offset=0,
|
||||||
|
limit=100,
|
||||||
|
paginate=True,
|
||||||
|
)
|
Loading…
Reference in New Issue