Fix the rating.get_quotation method
This updates the rating.get_quotation method of the client. Tests on this
method have been added.
Depends-On: https://review.openstack.org/#/c/648062/
Change-Id: Ie2de0162311c2d162c1573042187ac4e628bd966
(cherry picked from commit de96c61985
)
This commit is contained in:
parent
1e0ed2f044
commit
37c6bb0c8b
|
@ -35,7 +35,7 @@ class BaseFunctionalTest(utils.BaseTestCase):
|
||||||
if p.returncode != 0:
|
if p.returncode != 0:
|
||||||
raise RuntimeError('"{cmd}" returned {val}: {msg}'.format(
|
raise RuntimeError('"{cmd}" returned {val}: {msg}'.format(
|
||||||
cmd=' '.join(cmd), val=p.returncode, msg=stderr))
|
cmd=' '.join(cmd), val=p.returncode, msg=stderr))
|
||||||
return json.loads(stdout) if has_output else None
|
return json.loads(stdout.decode('ascii')) if has_output else None
|
||||||
|
|
||||||
def openstack(self, action,
|
def openstack(self, action,
|
||||||
flags='', params='', fmt='-f json', has_output=True):
|
flags='', params='', fmt='-f json', has_output=True):
|
||||||
|
|
|
@ -0,0 +1,48 @@
|
||||||
|
# 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 decimal
|
||||||
|
|
||||||
|
from cloudkittyclient import exc
|
||||||
|
from cloudkittyclient.tests.unit.v1 import base
|
||||||
|
|
||||||
|
|
||||||
|
class TestRating(base.BaseAPIEndpointTestCase):
|
||||||
|
|
||||||
|
def test_quote_request(self):
|
||||||
|
res_data = [{'usage': {
|
||||||
|
'instance': [{
|
||||||
|
'vol': {'unit': 'undef', 'qty': '1'},
|
||||||
|
'rating': {'price': decimal.Decimal(1)},
|
||||||
|
'desc': {
|
||||||
|
'disk_total_display': 1,
|
||||||
|
'image_id': 'c43a3e7d-c4e6-45d6-8c8d-e2832a45bc0a',
|
||||||
|
'ram': 64,
|
||||||
|
'ephemeral': 0,
|
||||||
|
'vcpus': 1,
|
||||||
|
'source_type': 'image',
|
||||||
|
'disk_total': 1,
|
||||||
|
'flavor_id': '42',
|
||||||
|
'flavor': 'm1.nano',
|
||||||
|
'disk': 1,
|
||||||
|
'source_val': 'c43a3e7d-c4e6-45d6-8c8d-e2832a45bc0a'}
|
||||||
|
}]
|
||||||
|
}}]
|
||||||
|
|
||||||
|
self.rating.get_quotation(res_data=res_data)
|
||||||
|
self.api_client.post.assert_called_once_with(
|
||||||
|
'/v1/rating/quote/', json={'resources': res_data})
|
||||||
|
|
||||||
|
def test_get_quotation_no_res_data(self):
|
||||||
|
self.assertRaises(exc.ArgumentRequired, self.rating.get_quotation)
|
|
@ -78,8 +78,10 @@ class RatingManager(base.BaseManager):
|
||||||
"""
|
"""
|
||||||
if not kwargs.get('res_data', None):
|
if not kwargs.get('res_data', None):
|
||||||
raise exc.ArgumentRequired("'res_data' argument is required.")
|
raise exc.ArgumentRequired("'res_data' argument is required.")
|
||||||
url = self.get_url('quote')
|
url = self.get_url('quote', {})
|
||||||
return self.api_client.post(url, kwargs['res_data'])
|
|
||||||
|
body = {'resources': kwargs['res_data']}
|
||||||
|
return self.api_client.post(url, json=body).json()
|
||||||
|
|
||||||
|
|
||||||
class CliModuleGet(lister.Lister):
|
class CliModuleGet(lister.Lister):
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
fixes:
|
||||||
|
- |
|
||||||
|
The ``rating.get_quotation`` method of the client has been fixed: the json
|
||||||
|
body has been updated to match the API reference.
|
Loading…
Reference in New Issue