From d20c863ebc11cecaaefe043e615b2fb4f5f26063 Mon Sep 17 00:00:00 2001
From: Dean Troyer <dtroyer@gmail.com>
Date: Wed, 8 Jun 2016 14:17:14 -0500
Subject: osc-lib: exceptions

Use osc-lib directly for exceptions.

Leave openstackclient.common.exceptions for deprecation period.

Change-Id: Iea3e862302372e1b31ccd27f69db59b4953ca828
---
 openstackclient/network/common.py                 | 3 ++-
 openstackclient/network/v2/address_scope.py       | 3 ++-
 openstackclient/network/v2/port.py                | 3 ++-
 openstackclient/network/v2/security_group_rule.py | 5 +++--
 openstackclient/network/v2/subnet.py              | 4 +++-
 5 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'openstackclient/network')

diff --git a/openstackclient/network/common.py b/openstackclient/network/common.py
index 4028ac0d..10c61ab1 100644
--- a/openstackclient/network/common.py
+++ b/openstackclient/network/common.py
@@ -12,10 +12,11 @@
 #
 
 import abc
+
+from osc_lib import exceptions
 import six
 
 from openstackclient.common import command
-from openstackclient.common import exceptions
 from openstackclient.i18n import _
 
 
diff --git a/openstackclient/network/v2/address_scope.py b/openstackclient/network/v2/address_scope.py
index 40a0b8f6..9b670ea4 100644
--- a/openstackclient/network/v2/address_scope.py
+++ b/openstackclient/network/v2/address_scope.py
@@ -13,8 +13,9 @@
 
 """Address scope action implementations"""
 
+from osc_lib import exceptions
+
 from openstackclient.common import command
-from openstackclient.common import exceptions
 from openstackclient.common import utils
 from openstackclient.i18n import _
 from openstackclient.identity import common as identity_common
diff --git a/openstackclient/network/v2/port.py b/openstackclient/network/v2/port.py
index bc9321d1..ae6d2dff 100644
--- a/openstackclient/network/v2/port.py
+++ b/openstackclient/network/v2/port.py
@@ -16,8 +16,9 @@
 import argparse
 import logging
 
+from osc_lib import exceptions
+
 from openstackclient.common import command
-from openstackclient.common import exceptions
 from openstackclient.common import parseractions
 from openstackclient.common import utils
 from openstackclient.i18n import _
diff --git a/openstackclient/network/v2/security_group_rule.py b/openstackclient/network/v2/security_group_rule.py
index 5abe9b9d..a7f4fa7e 100644
--- a/openstackclient/network/v2/security_group_rule.py
+++ b/openstackclient/network/v2/security_group_rule.py
@@ -14,14 +14,15 @@
 """Security Group Rule action implementations"""
 
 import argparse
-import six
 
 try:
     from novaclient.v2 import security_group_rules as compute_secgroup_rules
 except ImportError:
     from novaclient.v1_1 import security_group_rules as compute_secgroup_rules
 
-from openstackclient.common import exceptions
+from osc_lib import exceptions
+import six
+
 from openstackclient.common import parseractions
 from openstackclient.common import utils
 from openstackclient.i18n import _
diff --git a/openstackclient/network/v2/subnet.py b/openstackclient/network/v2/subnet.py
index 8e378c7e..95c7e1ae 100644
--- a/openstackclient/network/v2/subnet.py
+++ b/openstackclient/network/v2/subnet.py
@@ -12,10 +12,12 @@
 #
 
 """Subnet action implementations"""
+
 import copy
 
+from osc_lib import exceptions
+
 from openstackclient.common import command
-from openstackclient.common import exceptions
 from openstackclient.common import parseractions
 from openstackclient.common import utils
 from openstackclient.i18n import _
-- 
cgit v1.2.1