The cyclical dependency from client to manager then back on client has caused problems in other projects as the client doesn't always get properly destroyed which can lead to it holding open network connections. Remove this dependency and instead simply pass the constructed HTTPClient to the managers. Change-Id: Id112ab366ad19bc6ae239cfcadb5eb98f6cb8abf
129 lines
5.0 KiB
Python
129 lines
5.0 KiB
Python
# Copyright (c) 2013 Mirantis 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 keystoneclient import adapter
|
|
from keystoneclient.v2_0 import client as keystone_client_v2
|
|
from keystoneclient.v3 import client as keystone_client_v3
|
|
|
|
from saharaclient.api import cluster_templates
|
|
from saharaclient.api import clusters
|
|
from saharaclient.api import data_sources
|
|
from saharaclient.api import httpclient
|
|
from saharaclient.api import images
|
|
from saharaclient.api import job_binaries
|
|
from saharaclient.api import job_binary_internals
|
|
from saharaclient.api import job_executions
|
|
from saharaclient.api import jobs
|
|
from saharaclient.api import node_group_templates
|
|
from saharaclient.api import plugins
|
|
|
|
|
|
class Client(object):
|
|
def __init__(self, username=None, api_key=None, project_id=None,
|
|
project_name=None, auth_url=None, sahara_url=None,
|
|
endpoint_type='publicURL', service_type='data-processing',
|
|
service_name=None, region_name=None,
|
|
input_auth_token=None, session=None, auth=None):
|
|
|
|
keystone = None
|
|
sahara_catalog_url = sahara_url
|
|
|
|
if not input_auth_token:
|
|
|
|
if session:
|
|
keystone = adapter.LegacyJsonAdapter(
|
|
session=session,
|
|
auth=auth,
|
|
interface=endpoint_type,
|
|
service_type=service_type,
|
|
service_name=service_name,
|
|
region_name=region_name)
|
|
input_auth_token = keystone.session.get_token(auth)
|
|
sahara_catalog_url = keystone.session.get_endpoint(
|
|
auth, interface=endpoint_type, service_type=service_type)
|
|
else:
|
|
keystone = self.get_keystone_client(
|
|
username=username,
|
|
api_key=api_key,
|
|
auth_url=auth_url,
|
|
project_id=project_id,
|
|
project_name=project_name)
|
|
input_auth_token = keystone.auth_token
|
|
|
|
if not input_auth_token:
|
|
raise RuntimeError("Not Authorized")
|
|
|
|
if not sahara_catalog_url:
|
|
catalog = keystone.service_catalog.get_endpoints(service_type)
|
|
if service_type not in catalog:
|
|
service_type = service_type.replace('-', '_')
|
|
|
|
if service_type in catalog:
|
|
for e_type, endpoint in catalog.get(service_type)[0].items():
|
|
if str(e_type).lower() == str(endpoint_type).lower():
|
|
sahara_catalog_url = endpoint
|
|
break
|
|
if not sahara_catalog_url:
|
|
raise RuntimeError("Could not find Sahara endpoint in catalog")
|
|
|
|
client = httpclient.HTTPClient(sahara_catalog_url, input_auth_token)
|
|
|
|
self.clusters = clusters.ClusterManager(client)
|
|
self.cluster_templates = (
|
|
cluster_templates.ClusterTemplateManager(client)
|
|
)
|
|
self.node_group_templates = (
|
|
node_group_templates.NodeGroupTemplateManager(client)
|
|
)
|
|
self.plugins = plugins.PluginManager(client)
|
|
self.images = images.ImageManager(client)
|
|
|
|
self.data_sources = data_sources.DataSourceManager(client)
|
|
self.jobs = jobs.JobsManager(client)
|
|
self.job_executions = job_executions.JobExecutionsManager(client)
|
|
self.job_binaries = job_binaries.JobBinariesManager(client)
|
|
self.job_binary_internals = (
|
|
job_binary_internals.JobBinaryInternalsManager(client)
|
|
)
|
|
|
|
def get_keystone_client(self, username=None, api_key=None, auth_url=None,
|
|
token=None, project_id=None, project_name=None):
|
|
if not auth_url:
|
|
raise RuntimeError("No auth url specified")
|
|
|
|
if not getattr(self, "keystone_client", None):
|
|
imported_client = (keystone_client_v2 if "v2.0" in auth_url
|
|
else keystone_client_v3)
|
|
|
|
self.keystone_client = imported_client.Client(
|
|
username=username,
|
|
password=api_key,
|
|
token=token,
|
|
tenant_id=project_id,
|
|
tenant_name=project_name,
|
|
auth_url=auth_url,
|
|
endpoint=auth_url)
|
|
|
|
self.keystone_client.authenticate()
|
|
|
|
return self.keystone_client
|
|
|
|
@staticmethod
|
|
def get_projects_list(keystone_client):
|
|
if isinstance(keystone_client, keystone_client_v2.Client):
|
|
return keystone_client.tenants
|
|
|
|
return keystone_client.projects
|