Merge "Migrate to keystoneauth"

This commit is contained in:
Jenkins 2016-09-14 04:32:41 +00:00 committed by Gerrit Code Review
commit 704aa874ba
7 changed files with 7 additions and 7 deletions

View File

@ -11,7 +11,7 @@
# License for the specific language governing permissions and limitations
# under the License.
import keystoneclient.exceptions as kc_exception
import keystoneauth1.exceptions as kc_exception
from oslo_log import log as logging
from heat.common import exception

View File

@ -66,7 +66,7 @@ class Ec2TokenTest(common.HeatTestCase):
cfg.CONF.set_default('auth_uri', None, group='ec2authtoken')
cfg.CONF.set_default('auth_uri', 'http://192.0.2.9',
group='clients_keystone')
with mock.patch('keystoneclient.discover.Discover') as discover:
with mock.patch('keystoneauth1.discover.Discover') as discover:
class MockDiscover(object):
def url_for(self, endpoint):
return 'http://192.0.2.9/v3/'

View File

@ -19,8 +19,8 @@ from glanceclient import exc as glance_exc
from glanceclient.openstack.common.apiclient import exceptions as g_a_exc
from heatclient import client as heatclient
from heatclient import exc as heat_exc
from keystoneauth1 import exceptions as keystone_exc
from keystoneauth1.identity import generic
from keystoneclient import exceptions as keystone_exc
from manilaclient import exceptions as manila_exc
import mock
from neutronclient.common import exceptions as neutron_exc

View File

@ -11,7 +11,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from keystoneclient import exceptions as keystone_exceptions
from keystoneauth1 import exceptions as keystone_exceptions
import mock
import six

View File

@ -14,9 +14,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from keystoneauth1 import exceptions as keystone_exc
from keystoneauth1.identity import generic as ks_auth
from keystoneauth1 import session as ks_session
from keystoneclient import exceptions as keystone_exc
import mox
from oslo_config import cfg
import six

View File

@ -13,7 +13,7 @@
import datetime
from keystoneclient import exceptions as kc_exceptions
from keystoneauth1 import exceptions as kc_exceptions
import mock
import six
from six.moves.urllib import parse as urlparse

View File

@ -11,7 +11,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from keystoneclient import exceptions as kc_exceptions
from keystoneauth1 import exceptions as kc_exceptions
import six
from heat.common import exception