f61a487fa1
We have a capability to know what constructor is needed for make_client,
but we didn't plumb it in. Make sure that the only thing needed is:
os_client_config.make_client('compute')
Change-Id: I02aa1c46fa7cdfdb1409f8e1232e364b5ba48cd2
59 lines
2.5 KiB
Python
59 lines
2.5 KiB
Python
# Copyright (c) 2014 Hewlett-Packard Development Company, L.P.
|
|
#
|
|
# 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 sys
|
|
|
|
from os_client_config import cloud_config
|
|
from os_client_config.config import OpenStackConfig # noqa
|
|
|
|
|
|
def simple_client(service_key, cloud=None, region_name=None):
|
|
"""Simple wrapper function. It has almost no features.
|
|
|
|
This will get you a raw requests Session Adapter that is mounted
|
|
on the given service from the keystone service catalog. If you leave
|
|
off cloud and region_name, it will assume that you've got env vars
|
|
set, but if you give them, it'll use clouds.yaml as you'd expect.
|
|
|
|
This function is deliberately simple. It has no flexibility. If you
|
|
want flexibility, you can make a cloud config object and call
|
|
get_session_client on it. This function is to make it easy to poke
|
|
at OpenStack REST APIs with a properly configured keystone session.
|
|
"""
|
|
return OpenStackConfig().get_one_cloud(
|
|
cloud=cloud, region_name=region_name).get_session_client(service_key)
|
|
|
|
|
|
def make_client(service_key, constructor=None, options=None, **kwargs):
|
|
"""Simple wrapper for getting a client instance from a client lib.
|
|
|
|
OpenStack Client Libraries all have a fairly consistent constructor
|
|
interface which os-client-config supports. In the simple case, there
|
|
is one and only one right way to construct a client object. If as a user
|
|
you don't want to do fancy things, just use this. It honors OS_ environment
|
|
variables and clouds.yaml - and takes as **kwargs anything you'd expect
|
|
to pass in.
|
|
"""
|
|
if not constructor:
|
|
constructor = cloud_config._get_client(service_key)
|
|
config = OpenStackConfig()
|
|
if options:
|
|
config.register_argparse_options(options, sys.argv, service_key)
|
|
parsed_options = options.parse_args(sys.argv)
|
|
else:
|
|
parsed_options = None
|
|
|
|
cloud = config.get_one_cloud(options=parsed_options, **kwargs)
|
|
return cloud.get_legacy_client(service_key, constructor)
|