diff options
Diffstat (limited to 'ceilometerclient/v2/client.py')
| -rw-r--r-- | ceilometerclient/v2/client.py | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/ceilometerclient/v2/client.py b/ceilometerclient/v2/client.py index ba5ca43..95be8f5 100644 --- a/ceilometerclient/v2/client.py +++ b/ceilometerclient/v2/client.py @@ -15,7 +15,8 @@ # License for the specific language governing permissions and limitations # under the License. -from ceilometerclient.common import http +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 @@ -39,8 +40,26 @@ class Client(object): """ def __init__(self, *args, **kwargs): + """Initialize a new client for the Ceilometer v2 API.""" - self.http_client = http.HTTPClient(*args, **kwargs) + self.auth_plugin = kwargs.get('auth_plugin') \ + or ceiloclient.get_auth_plugin(*args, **kwargs) + 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=kwargs.get('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) @@ -51,6 +70,7 @@ class Client(object): 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( |