b8a3fe54c0
Resource classes of managers should have methods like delete() and get(). Basicly base.Resource class has method get(), which uses id attribute, but classes Alarm, Event, etc. have no this attribute. Added intercept getting of id in the resource classes. Also added catch of HTTPNotFound for alarm get() because it affects correct functionality of scenario tests. Closes-Bug: #1312146 Change-Id: Ie598b73c64dece2185955467936dc6544a8a3dc7
43 lines
1.3 KiB
Python
43 lines
1.3 KiB
Python
#
|
|
# Copyright 2013 Red Hat, Inc
|
|
#
|
|
# 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 Resource(base.Resource):
|
|
def __repr__(self):
|
|
return "<Resource %s>" % self._info
|
|
|
|
def __getattr__(self, k):
|
|
if k == 'id':
|
|
return self.resource_id
|
|
return super(Resource, self).__getattr__(k)
|
|
|
|
|
|
class ResourceManager(base.Manager):
|
|
resource_class = Resource
|
|
|
|
def list(self, q=None):
|
|
path = '/v2/resources'
|
|
return self._list(options.build_url(path, q))
|
|
|
|
def get(self, resource_id):
|
|
path = '/v2/resources/%s' % resource_id
|
|
try:
|
|
return self._list(path, expect_single=True)[0]
|
|
except IndexError:
|
|
return None
|