This adds an optional param to resource-list CLI to enable meter-links. By default, meter links are not generated, this patch adds an optional param to generate links. Change-Id: I308b94c8a57833cf30b4815ecec2ff9a50e91af6 Closes-Bug: #1508709
148 lines
4.7 KiB
Python
148 lines
4.7 KiB
Python
# Copyright 2012 OpenStack Foundation
|
|
# All Rights Reserved.
|
|
#
|
|
# 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.openstack.common.apiclient import client
|
|
from ceilometerclient.openstack.common.apiclient import fake_client
|
|
from ceilometerclient.tests.unit import utils
|
|
import ceilometerclient.v2.resources
|
|
|
|
|
|
fixtures = {
|
|
'/v2/resources?meter_links=0': {
|
|
'GET': (
|
|
{},
|
|
[
|
|
{
|
|
'resource_id': 'a',
|
|
'project_id': 'project_bla',
|
|
'user_id': 'freddy',
|
|
'metadata': {'zxc_id': 'bla'},
|
|
},
|
|
{
|
|
'resource_id': 'b',
|
|
'project_id': 'dig_the_ditch',
|
|
'user_id': 'joey',
|
|
'metadata': {'zxc_id': 'foo'},
|
|
},
|
|
]
|
|
),
|
|
},
|
|
'/v2/resources?q.field=resource_id&q.op=&q.type=&q.value=a&meter_links=0':
|
|
{
|
|
'GET': (
|
|
{},
|
|
[
|
|
{
|
|
'resource_id': 'a',
|
|
'project_id': 'project_bla',
|
|
'user_id': 'freddy',
|
|
'metadata': {'zxc_id': 'bla'},
|
|
},
|
|
]
|
|
),
|
|
},
|
|
'/v2/resources?meter_links=1': {
|
|
'GET': (
|
|
{},
|
|
[
|
|
{
|
|
'resource_id': 'c',
|
|
'project_id': 'project_blah',
|
|
'user_id': 'fred',
|
|
'metadata': {'zxc_id': 'blah'},
|
|
},
|
|
{
|
|
'resource_id': 'd',
|
|
'project_id': 'bury_the_ditch',
|
|
'user_id': 'jack',
|
|
'metadata': {'zxc_id': 'foobar'},
|
|
},
|
|
]
|
|
),
|
|
},
|
|
'/v2/resources/a':
|
|
{
|
|
'GET': (
|
|
{},
|
|
{
|
|
'resource_id': 'a',
|
|
'project_id': 'project_bla',
|
|
'user_id': 'freddy',
|
|
'metadata': {'zxc_id': 'bla'},
|
|
},
|
|
),
|
|
},
|
|
}
|
|
|
|
|
|
class ResourceManagerTest(utils.BaseTestCase):
|
|
|
|
def setUp(self):
|
|
super(ResourceManagerTest, self).setUp()
|
|
self.http_client = fake_client.FakeHTTPClient(fixtures=fixtures)
|
|
self.api = client.BaseClient(self.http_client)
|
|
self.mgr = ceilometerclient.v2.resources.ResourceManager(self.api)
|
|
|
|
def test_list_all(self):
|
|
resources = list(self.mgr.list())
|
|
expect = [
|
|
'GET', '/v2/resources?meter_links=0'
|
|
]
|
|
self.http_client.assert_called(*expect)
|
|
self.assertEqual(len(resources), 2)
|
|
self.assertEqual(resources[0].resource_id, 'a')
|
|
self.assertEqual(resources[1].resource_id, 'b')
|
|
|
|
def test_list_all_with_links_enabled(self):
|
|
resources = list(self.mgr.list(links=True))
|
|
expect = [
|
|
'GET', '/v2/resources?meter_links=1'
|
|
]
|
|
self.http_client.assert_called(*expect)
|
|
self.assertEqual(2, len(resources))
|
|
self.assertEqual('c', resources[0].resource_id)
|
|
self.assertEqual('d', resources[1].resource_id)
|
|
|
|
def test_list_one(self):
|
|
resource = self.mgr.get(resource_id='a')
|
|
expect = [
|
|
'GET', '/v2/resources/a'
|
|
]
|
|
self.http_client.assert_called(*expect)
|
|
self.assertIsNotNone(resource)
|
|
self.assertEqual(resource.resource_id, 'a')
|
|
|
|
def test_list_by_query(self):
|
|
resources = list(self.mgr.list(q=[{"field": "resource_id",
|
|
"value": "a"},
|
|
]))
|
|
expect = [
|
|
'GET', '/v2/resources?q.field=resource_id&q.op='
|
|
'&q.type=&q.value=a&meter_links=0'
|
|
]
|
|
self.http_client.assert_called(*expect)
|
|
self.assertEqual(len(resources), 1)
|
|
self.assertEqual(resources[0].resource_id, 'a')
|
|
|
|
def test_get_from_resource_class(self):
|
|
resource = self.mgr.get(resource_id='a')
|
|
self.assertIsNotNone(resource)
|
|
resource.get()
|
|
expect = [
|
|
'GET', '/v2/resources/a'
|
|
]
|
|
self.http_client.assert_called(*expect, pos=0)
|
|
self.http_client.assert_called(*expect, pos=1)
|
|
self.assertEqual('a', resource.resource_id)
|