Merge pull request #189 from GustavoHennig/error_code

Include the error code returned from OneView to the exception HPOneViewTaskError
HewlettPackard · Sep 13, 2016 · 2d5b46d · 2d5b46d
2 parents 30fd820 + f99e24e
commit 2d5b46d
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 6 deletions.
diff --git a/hpOneView/exceptions.py b/hpOneView/exceptions.py
@@ -11,6 +11,7 @@
 from __future__ import division
 from __future__ import absolute_import
 from future import standard_library
+
 standard_library.install_aliases()
 
 __title__ = 'exceptions'
@@ -20,6 +21,7 @@
 __license__ = 'MIT'
 __status__ = 'Development'
 
+
 ###
 # (C) Copyright (2012-2015) Hewlett Packard Enterprise Development LP
 #
@@ -44,7 +46,6 @@
 
 
 class HPOneViewException(Exception):
-
     def __init__(self, msg):
         self.msg = msg
         Exception.__init__(self, msg)
@@ -55,7 +56,9 @@ class HPOneViewInvalidResource(HPOneViewException):
 
 
 class HPOneViewTaskError(HPOneViewException):
-    pass
+    def __init__(self, msg, error_code=None):
+        super(HPOneViewTaskError, self).__init__(msg)
+        self.error_code = error_code
 
 
 class HPOneViewUnknownType(HPOneViewException):

diff --git a/hpOneView/resources/task_monitor.py b/hpOneView/resources/task_monitor.py
@@ -126,17 +126,20 @@ def __wait_task_completion(self, task, timeout):
     def __get_task_response(self, task):
         if task['taskState'] in TASK_ERROR_STATES and task['taskState'] != 'Warning':
             msg = None
+            error_code = None
             if 'taskErrors' in task and len(task['taskErrors']) > 0:
                 err = task['taskErrors'][0]
                 if 'message' in err:
                     msg = err['message']
 
+                error_code = err.get('errorCode')
+
             if msg:
-                raise HPOneViewTaskError(msg)
+                raise HPOneViewTaskError(msg, error_code)
             elif 'taskStatus' in task and task['taskStatus']:
-                raise HPOneViewTaskError(task['taskStatus'])
+                raise HPOneViewTaskError(task['taskStatus'], error_code)
             else:
-                raise HPOneViewTaskError(MSG_UNKNOWN_EXCEPTION)
+                raise HPOneViewTaskError(MSG_UNKNOWN_EXCEPTION, error_code)
 
         deleted_resource = (task['name'] == 'Delete' or task['name'] == 'Remove')
 

diff --git a/tests/unit/resources/test_task_monitor.py b/tests/unit/resources/test_task_monitor.py
@@ -188,8 +188,28 @@ def test_wait_for_task_with_error_message(self, mock_get, mock_is_running):
             self.task_monitor.wait_for_task(task.copy())
         except HPOneViewTaskError as e:
             self.assertEqual("Error Message", e.msg)
+            self.assertEqual(None, e.error_code)
         else:
-            self.fail()
+            self.fail("Expected exception not raised")
+
+    @mock.patch.object(TaskMonitor, 'is_task_running')
+    @mock.patch.object(TaskMonitor, 'get')
+    def test_wait_for_task_with_error_message_and_error_code(self, mock_get, mock_is_running):
+
+        task = {"uri": "uri",
+                "taskState": "Error",
+                "taskErrors": [{"message": "Error Message", "errorCode": "ProfileAlreadyExistsInServer"}]}
+
+        mock_is_running.return_value = False
+        mock_get.return_value = task
+
+        try:
+            self.task_monitor.wait_for_task(task.copy())
+        except HPOneViewTaskError as e:
+            self.assertEqual("Error Message", e.msg)
+            self.assertEqual("ProfileAlreadyExistsInServer", e.error_code)
+        else:
+            self.fail("Expected exception not raised")
 
     def test_wait_for_task_empty(self):
         try: