878e32e525
Currently, if we specify --timeout 30 in CLI commands. we will get 'a float is required' error. Since we already specify timeout is ingeter in ceilometer.v2.client, this patch converts CLI argument timeout to integer. Note, if zero is passed to v2.client, we treat it as disable timeout. Change-Id: I213b6c24964095297cb4e87c25bb871ebd668bb4 Closes-Bug: #1391606
90 lines
3.5 KiB
Python
90 lines
3.5 KiB
Python
# Copyright Ericsson AB 2014. All rights reserved
|
|
#
|
|
# Authors: Balazs Gibizer <balazs.gibizer@ericsson.com>
|
|
# Ildiko Vancsa <ildiko.vancsa@ericsson.com>
|
|
#
|
|
# 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 import client as ceiloclient
|
|
from ceilometerclient.openstack.common.apiclient import client
|
|
from ceilometerclient.v2 import alarms
|
|
from ceilometerclient.v2 import event_types
|
|
from ceilometerclient.v2 import events
|
|
from ceilometerclient.v2 import meters
|
|
from ceilometerclient.v2 import query
|
|
from ceilometerclient.v2 import resources
|
|
from ceilometerclient.v2 import samples
|
|
from ceilometerclient.v2 import statistics
|
|
from ceilometerclient.v2 import trait_descriptions
|
|
from ceilometerclient.v2 import traits
|
|
|
|
|
|
class Client(object):
|
|
"""Client for the Ceilometer v2 API.
|
|
|
|
:param endpoint: A user-supplied endpoint URL for the ceilometer
|
|
service.
|
|
:type endpoint: string
|
|
:param token: Provides token for authentication.
|
|
:type token: function
|
|
:param timeout: Allows customization of the timeout for client
|
|
http requests. (optional)
|
|
:type timeout: integer
|
|
"""
|
|
|
|
def __init__(self, *args, **kwargs):
|
|
|
|
"""Initialize a new client for the Ceilometer v2 API."""
|
|
self.auth_plugin = kwargs.get('auth_plugin') \
|
|
or ceiloclient.get_auth_plugin(*args, **kwargs)
|
|
|
|
timeout = kwargs.get('timeout')
|
|
if timeout is not None:
|
|
timeout = int(timeout)
|
|
if timeout <= 0:
|
|
timeout = None
|
|
|
|
self.client = client.HTTPClient(
|
|
auth_plugin=self.auth_plugin,
|
|
region_name=kwargs.get('region_name'),
|
|
endpoint_type=kwargs.get('endpoint_type'),
|
|
original_ip=kwargs.get('original_ip'),
|
|
verify=kwargs.get('verify'),
|
|
cert=kwargs.get('cacert'),
|
|
timeout=timeout,
|
|
timings=kwargs.get('timings'),
|
|
keyring_saver=kwargs.get('keyring_saver'),
|
|
debug=kwargs.get('debug'),
|
|
user_agent=kwargs.get('user_agent'),
|
|
http=kwargs.get('http')
|
|
)
|
|
|
|
self.http_client = client.BaseClient(self.client)
|
|
self.meters = meters.MeterManager(self.http_client)
|
|
self.samples = samples.SampleManager(self.http_client)
|
|
self.statistics = statistics.StatisticsManager(self.http_client)
|
|
self.resources = resources.ResourceManager(self.http_client)
|
|
self.alarms = alarms.AlarmManager(self.http_client)
|
|
self.events = events.EventManager(self.http_client)
|
|
self.event_types = event_types.EventTypeManager(self.http_client)
|
|
self.traits = traits.TraitManager(self.http_client)
|
|
self.trait_descriptions = trait_descriptions.\
|
|
TraitDescriptionManager(self.http_client)
|
|
|
|
self.query_samples = query.QuerySamplesManager(
|
|
self.http_client)
|
|
self.query_alarms = query.QueryAlarmsManager(
|
|
self.http_client)
|
|
self.query_alarm_history = query.QueryAlarmHistoryManager(
|
|
self.http_client)
|