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/v3/domain.py  | 4 ++--
 openstackclient/identity/v3/group.py   | 4 ++--
 openstackclient/identity/v3/project.py | 4 ++--
 openstackclient/identity/v3/role.py    | 4 ++--
 openstackclient/identity/v3/user.py    | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'openstackclient/identity/v3')

diff --git a/openstackclient/identity/v3/domain.py b/openstackclient/identity/v3/domain.py
index aec530a8..8278a300 100644
--- a/openstackclient/identity/v3/domain.py
+++ b/openstackclient/identity/v3/domain.py
@@ -22,7 +22,7 @@ import sys
 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
@@ -77,7 +77,7 @@ class CreateDomain(show.ShowOne):
                 description=parsed_args.description,
                 enabled=enabled,
             )
-        except ksc_exc.Conflict as e:
+        except ks_exc.Conflict as e:
             if parsed_args.or_show:
                 domain = utils.find_resource(identity_client.domains,
                                              parsed_args.name)
diff --git a/openstackclient/identity/v3/group.py b/openstackclient/identity/v3/group.py
index 82975065..d503a6b8 100644
--- a/openstackclient/identity/v3/group.py
+++ b/openstackclient/identity/v3/group.py
@@ -22,7 +22,7 @@ import sys
 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
@@ -156,7 +156,7 @@ class CreateGroup(show.ShowOne):
                 name=parsed_args.name,
                 domain=domain,
                 description=parsed_args.description)
-        except ksc_exc.Conflict as e:
+        except ks_exc.Conflict as e:
             if parsed_args.or_show:
                 group = utils.find_resource(identity_client.groups,
                                             parsed_args.name,
diff --git a/openstackclient/identity/v3/project.py b/openstackclient/identity/v3/project.py
index 96d7f97b..f87105dd 100644
--- a/openstackclient/identity/v3/project.py
+++ b/openstackclient/identity/v3/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
@@ -113,7 +113,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.projects,
                                               parsed_args.name,
diff --git a/openstackclient/identity/v3/role.py b/openstackclient/identity/v3/role.py
index 0e8c51ca..66f18964 100644
--- a/openstackclient/identity/v3/role.py
+++ b/openstackclient/identity/v3/role.py
@@ -22,7 +22,7 @@ import sys
 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
@@ -172,7 +172,7 @@ class CreateRole(show.ShowOne):
 
         try:
             role = identity_client.roles.create(name=parsed_args.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,
                                            parsed_args.name)
diff --git a/openstackclient/identity/v3/user.py b/openstackclient/identity/v3/user.py
index 0e894544..eaef8f05 100644
--- a/openstackclient/identity/v3/user.py
+++ b/openstackclient/identity/v3/user.py
@@ -22,7 +22,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
@@ -122,7 +122,7 @@ class CreateUser(show.ShowOne):
                 description=parsed_args.description,
                 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,
                                            parsed_args.name,
-- 
cgit v1.2.1