openstack
/
python-heatclient
Code Issues Proposed changes

switch to keystoneauth 

move heatclient to keystoneauth as keystoneclient's auth session,
plugins and adapter code has been deprecated [1].

[1] http://docs.openstack.org/releasenotes/python-keystoneclient/mitaka.html#deprecation-notes

Change-Id: Iedd7ceb97d39ab3ecccf8786aad8b5f45d15175e
This commit is contained in:
Steve Martinelli 2016-03-09 10:14:11 -05:00 committed by Steve Martinelli
parent db07e2139e
commit 2d32a08a23
5 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
heatclient/common/http.py
View File

@ -19,6 +19,7 @@ import logging
import os
import socket
from keystoneauth1 import adapter
from oslo_serialization import jsonutils
from oslo_utils import encodeutils
from oslo_utils import importutils
@ -30,7 +31,6 @@ from heatclient.common import utils
from heatclient import exc
from heatclient.openstack.common._i18n import _
from heatclient.openstack.common._i18n import _LW
from keystoneclient import adapter
LOG = logging.getLogger(__name__)
USER_AGENT = 'python-heatclient'

13
heatclient/shell.py
View File

@ -20,17 +20,16 @@ import argparse
import logging
import sys
from keystoneauth1 import discover
from keystoneauth1 import exceptions as ks_exc
from keystoneauth1.identity import v2 as v2_auth
from keystoneauth1.identity import v3 as v3_auth
from keystoneauth1 import session as kssession
from oslo_utils import encodeutils
from oslo_utils import importutils
import six
import six.moves.urllib.parse as urlparse
from keystoneclient.auth.identity import v2 as v2_auth
from keystoneclient.auth.identity import v3 as v3_auth
from keystoneclient import discover
from keystoneclient import exceptions as ks_exc
from keystoneclient import session as kssession
import heatclient
from heatclient import client as heat_client
from heatclient.common import utils
@ -409,7 +408,7 @@ class HeatShell(object):
v2_auth_url = None
v3_auth_url = None
try:
ks_discover = discover.Discover(session=session, auth_url=auth_url)
ks_discover = discover.Discover(session=session, url=auth_url)
v2_auth_url = ks_discover.url_for('2.0')
v3_auth_url = ks_discover.url_for('3.0')
except ks_exc.ClientException:

5
heatclient/tests/unit/test_common_http.py
View File

@ -16,7 +16,8 @@ import mock
import os
import socket
from keystoneauth1 import adapter
from mox3 import mox
from oslo_serialization import jsonutils
import requests
import six
@ -26,8 +27,6 @@ from heatclient.common import http
from heatclient.common import utils
from heatclient import exc
from heatclient.tests.unit import fakes
from keystoneclient import adapter
from mox3 import mox
class HttpClientTest(testtools.TestCase):

3
heatclient/tests/unit/test_shell.py
View File

@ -26,12 +26,11 @@ import testtools
import uuid
import yaml
from keystoneauth1 import fixture as keystone_fixture
from oslo_serialization import jsonutils
from oslo_utils import encodeutils
from requests_mock.contrib import fixture as rm_fixture
from keystoneclient import fixture as keystone_fixture
from mox3 import mox
from heatclient.common import http

2
requirements.txt
View File

@ -10,7 +10,7 @@ PrettyTable<0.8,>=0.7 # BSD
oslo.i18n>=2.1.0 # Apache-2.0
oslo.serialization>=1.10.0 # Apache-2.0
oslo.utils>=3.5.0 # Apache-2.0
python-keystoneclient!=1.8.0,!=2.1.0,>=1.7.0 # Apache-2.0
keystoneauth1>=2.1.0 # Apache-2.0
python-swiftclient>=2.2.0 # Apache-2.0
PyYAML>=3.1.0 # MIT
requests!=2.9.0,>=2.8.1 # Apache-2.0