From bf090c69c2e055285fc4fe45af0a5f66d6dc7759 Mon Sep 17 00:00:00 2001
From: Dean Troyer <dtroyer@gmail.com>
Date: Wed, 21 Oct 2015 12:01:56 -0500
Subject: Switch to ksa Session

* Change session imports to keystoneauth1
* Change keystoneclient.exception imports to keystoneauth1
* Change exceptions raised from internal API from keystoneclient to openstack.common

Change-Id: I046d89f561d6fe04baae53726f9749d2e7fe2056
---
 openstackclient/identity/v2_0/project.py | 6 +++---
 openstackclient/identity/v2_0/role.py    | 4 ++--
 openstackclient/identity/v2_0/user.py    | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'openstackclient/identity/v2_0')

diff --git a/openstackclient/identity/v2_0/project.py b/openstackclient/identity/v2_0/project.py
index 97a95f28..065f0adf 100644
--- a/openstackclient/identity/v2_0/project.py
+++ b/openstackclient/identity/v2_0/project.py
@@ -21,7 +21,7 @@ import six
 from cliff import command
 from cliff import lister
 from cliff import show
-from keystoneclient import exceptions as ksc_exc
+from keystoneauth1 import exceptions as ks_exc
 
 from openstackclient.common import parseractions
 from openstackclient.common import utils
@@ -88,7 +88,7 @@ class CreateProject(show.ShowOne):
                 enabled=enabled,
                 **kwargs
             )
-        except ksc_exc.Conflict as e:
+        except ks_exc.Conflict as e:
             if parsed_args.or_show:
                 project = utils.find_resource(
                     identity_client.tenants,
@@ -264,7 +264,7 @@ class ShowProject(show.ShowOne):
                 parsed_args.project,
             )
             info.update(project._info)
-        except ksc_exc.Forbidden as e:
+        except ks_exc.Forbidden as e:
             auth_ref = self.app.client_manager.auth_ref
             if (
                 parsed_args.project == auth_ref.project_id or
diff --git a/openstackclient/identity/v2_0/role.py b/openstackclient/identity/v2_0/role.py
index e98f8cb3..cab6b4a5 100644
--- a/openstackclient/identity/v2_0/role.py
+++ b/openstackclient/identity/v2_0/role.py
@@ -21,7 +21,7 @@ import six
 from cliff import command
 from cliff import lister
 from cliff import show
-from keystoneclient import exceptions as ksc_exc
+from keystoneauth1 import exceptions as ks_exc
 
 from openstackclient.common import exceptions
 from openstackclient.common import utils
@@ -98,7 +98,7 @@ class CreateRole(show.ShowOne):
         identity_client = self.app.client_manager.identity
         try:
             role = identity_client.roles.create(parsed_args.role_name)
-        except ksc_exc.Conflict as e:
+        except ks_exc.Conflict as e:
             if parsed_args.or_show:
                 role = utils.find_resource(
                     identity_client.roles,
diff --git a/openstackclient/identity/v2_0/user.py b/openstackclient/identity/v2_0/user.py
index 76902e69..e2b285bd 100644
--- a/openstackclient/identity/v2_0/user.py
+++ b/openstackclient/identity/v2_0/user.py
@@ -21,7 +21,7 @@ import six
 from cliff import command
 from cliff import lister
 from cliff import show
-from keystoneclient import exceptions as ksc_exc
+from keystoneauth1 import exceptions as ks_exc
 
 from openstackclient.common import utils
 from openstackclient.i18n import _  # noqa
@@ -104,7 +104,7 @@ class CreateUser(show.ShowOne):
                 tenant_id=project_id,
                 enabled=enabled,
             )
-        except ksc_exc.Conflict as e:
+        except ks_exc.Conflict as e:
             if parsed_args.or_show:
                 user = utils.find_resource(
                     identity_client.users,
@@ -373,7 +373,7 @@ class ShowUser(show.ShowOne):
                 parsed_args.user,
             )
             info.update(user._info)
-        except ksc_exc.Forbidden as e:
+        except ks_exc.Forbidden as e:
             auth_ref = self.app.client_manager.auth_ref
             if (
                 parsed_args.user == auth_ref.user_id or
-- 
cgit v1.2.1