Use CommandFailed exception from tempest_lib

Remove exceptions.py from functional/common.
Import exception with the same code from the tempest_lib to tests.

Change-Id: Ifaa658209c18dd608836079f57ed18fcf10fb84e

5 files changed, 4 insertions, 30 deletions

diff --git a/functional/common/exceptions.py b/functional/common/exceptions.py
deleted file mode 100644
index 47c6071e..00000000
--- a/functional/common/exceptions.py
+++ /dev/null
@@ -1,26 +0,0 @@
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-
-class CommandFailed(Exception):
-    def __init__(self, returncode, cmd, output, stderr):
-        super(CommandFailed, self).__init__()
-        self.returncode = returncode
-        self.cmd = cmd
-        self.stdout = output
-        self.stderr = stderr
-
-    def __str__(self):
-        return ("Command '%s' returned non-zero exit status %d.\n"
-                "stdout:\n%s\n"
-                "stderr:\n%s" % (self.cmd, self.returncode,
-                                 self.stdout, self.stderr))
diff --git a/functional/common/test.py b/functional/common/test.py
index 810c4e43..c1bf3f36 100644
--- a/functional/common/test.py
+++ b/functional/common/test.py
@@ -18,7 +18,7 @@ import testtools
 
 import six
 
-from functional.common import exceptions
+from tempest_lib import exceptions
 
 COMMON_DIR = os.path.dirname(os.path.abspath(__file__))
 FUNCTIONAL_DIR = os.path.normpath(os.path.join(COMMON_DIR, '..'))
diff --git a/functional/tests/compute/v2/test_server.py b/functional/tests/compute/v2/test_server.py
index 1d10bbdb..fe6691ec 100644
--- a/functional/tests/compute/v2/test_server.py
+++ b/functional/tests/compute/v2/test_server.py
@@ -15,8 +15,8 @@ import uuid
 
 import testtools
 
-from functional.common import exceptions
 from functional.common import test
+from tempest_lib import exceptions
 
 
 class ServerTests(test.TestCase):
diff --git a/functional/tests/identity/v2/test_user.py b/functional/tests/identity/v2/test_user.py
index 41895e7e..a0c1a46b 100644
--- a/functional/tests/identity/v2/test_user.py
+++ b/functional/tests/identity/v2/test_user.py
@@ -11,8 +11,8 @@
 #    under the License.
 
 from tempest_lib.common.utils import data_utils
+from tempest_lib import exceptions
 
-from functional.common import exceptions
 from functional.tests.identity.v2 import test_identity
 
 
diff --git a/functional/tests/identity/v3/test_domain.py b/functional/tests/identity/v3/test_domain.py
index a60028b4..221efd6a 100644
--- a/functional/tests/identity/v3/test_domain.py
+++ b/functional/tests/identity/v3/test_domain.py
@@ -11,8 +11,8 @@
 #    under the License.
 
 from tempest_lib.common.utils import data_utils
+from tempest_lib import exceptions
 
-from functional.common import exceptions
 from functional.tests.identity.v3 import test_identity