Merge remote-tracking branch 'upstream/master'

dims · Aug 24, 2015 · ffe0353 · ffe0353
2 parents 03d2349 + d9fccbd
commit ffe0353
Show file tree

Hide file tree

Showing 26 changed files with 19 additions and 10 deletions.
diff --git a/ironic/api/controllers/v1/node.py b/ironic/api/controllers/v1/node.py
@@ -478,7 +478,7 @@ def _set_chassis_uuid(self, value):
             except exception.ChassisNotFound as e:
                 # Change error code because 404 (NotFound) is inappropriate
                 # response for a POST request to create a Port
-                e.code = http_client.BAD_REQUEST  # BadRequest
+                e.code = http_client.BAD_REQUEST
                 raise e
         elif value == wtypes.Unset:
             self._chassis_uuid = wtypes.Unset

diff --git a/ironic/api/hooks.py b/ironic/api/hooks.py
@@ -135,6 +135,8 @@ def after(self, state):
             return
 
         # Do nothing if there is no error.
+        # Status codes in the range 200 (OK) to 399 (400 = BAD_REQUEST) are not
+        # an error.
         if (http_client.OK <= state.response.status_int <
                 http_client.BAD_REQUEST):
             return

diff --git a/ironic/common/exception.py b/ironic/common/exception.py
@@ -443,7 +443,7 @@ class NodeNotLocked(Invalid):
 class NoFreeConductorWorker(TemporaryFailure):
     message = _('Requested action cannot be performed due to lack of free '
                 'conductor workers.')
-    code = http_client.SERVICE_UNAVAILABLE  # Service Unavailable (temporary).
+    code = http_client.SERVICE_UNAVAILABLE
 
 
 class VendorPassthruException(IronicException):

diff --git a/ironic/conductor/manager.py b/ironic/conductor/manager.py
@@ -2049,7 +2049,7 @@ def handle_failure(e, task, logmsg, errmsg):
         # NOTE(deva): there is no need to clear conductor_affinity
         task.process_event('fail')
         args = {'node': task.node.uuid, 'err': e}
-        LOG.warning(logmsg, args)
+        LOG.error(logmsg, args)
         node.last_error = errmsg % e
 
     try:
@@ -2060,7 +2060,7 @@ def handle_failure(e, task, logmsg, errmsg):
             with excutils.save_and_reraise_exception():
                 handle_failure(
                     e, task,
-                    _LW('Error while uploading the configdrive for '
+                    _LE('Error while uploading the configdrive for '
                         '%(node)s to Swift'),
                     _('Failed to upload the configdrive to Swift. '
                       'Error: %s'))
@@ -2071,7 +2071,7 @@ def handle_failure(e, task, logmsg, errmsg):
             with excutils.save_and_reraise_exception():
                 handle_failure(
                     e, task,
-                    _LW('Error while preparing to deploy to node %(node)s: '
+                    _LE('Error while preparing to deploy to node %(node)s: '
                         '%(err)s'),
                     _("Failed to prepare to deploy. Error: %s"))
 
@@ -2081,7 +2081,7 @@ def handle_failure(e, task, logmsg, errmsg):
             with excutils.save_and_reraise_exception():
                 handle_failure(
                     e, task,
-                    _LW('Error in deploy of node %(node)s: %(err)s'),
+                    _LE('Error in deploy of node %(node)s: %(err)s'),
                     _("Failed to deploy. Error: %s"))
 
         # Update conductor_affinity to reference this conductor's ID

diff --git a/ironic/drivers/modules/irmc/management.py b/ironic/drivers/modules/irmc/management.py
@@ -57,7 +57,10 @@ def _get_sensors_data(task):
         report = irmc_common.get_irmc_report(task.node)
         sensor = scci.get_sensor_data(report)
 
-    except Exception as e:
+    except (exception.InvalidParameterValue,
+            exception.MissingParameterValue,
+            scci.SCCIInvalidInputError,
+            scci.SCCIClientError) as e:
         LOG.error(_LE("SCCI get sensor data failed for node %(node_id)s "
                   "with the following error: %(error)s"),
                   {'node_id': task.node.uuid, 'error': e})

diff --git a/ironic/tests/cmd/__init__.py b/ironic/tests/cmd/__init__.py
diff --git a/ironic/tests/test_dbsync.py → ironic/tests/cmd/test_dbsync.py b/ironic/tests/test_dbsync.py → ironic/tests/cmd/test_dbsync.py
diff --git a/ironic/tests/common/__init__.py b/ironic/tests/common/__init__.py
diff --git a/ironic/tests/test_disk_partitioner.py → ironic/tests/common/test_disk_partitioner.py b/ironic/tests/test_disk_partitioner.py → ironic/tests/common/test_disk_partitioner.py
diff --git a/ironic/tests/test_driver_factory.py → ironic/tests/common/test_driver_factory.py b/ironic/tests/test_driver_factory.py → ironic/tests/common/test_driver_factory.py
diff --git a/ironic/tests/test_exception.py → ironic/tests/common/test_exception.py b/ironic/tests/test_exception.py → ironic/tests/common/test_exception.py
diff --git a/ironic/tests/test_fsm.py → ironic/tests/common/test_fsm.py b/ironic/tests/test_fsm.py → ironic/tests/common/test_fsm.py
diff --git a/ironic/tests/test_glance_service.py → ironic/tests/common/test_glance_service.py b/ironic/tests/test_glance_service.py → ironic/tests/common/test_glance_service.py
diff --git a/ironic/tests/test_hash_ring.py → ironic/tests/common/test_hash_ring.py b/ironic/tests/test_hash_ring.py → ironic/tests/common/test_hash_ring.py
diff --git a/ironic/tests/test_image_service.py → ironic/tests/common/test_image_service.py b/ironic/tests/test_image_service.py → ironic/tests/common/test_image_service.py
diff --git a/ironic/tests/test_images.py → ironic/tests/common/test_images.py b/ironic/tests/test_images.py → ironic/tests/common/test_images.py
diff --git a/ironic/tests/test_keystone.py → ironic/tests/common/test_keystone.py b/ironic/tests/test_keystone.py → ironic/tests/common/test_keystone.py
diff --git a/ironic/tests/test_network.py → ironic/tests/common/test_network.py b/ironic/tests/test_network.py → ironic/tests/common/test_network.py
diff --git a/ironic/tests/test_policy.py → ironic/tests/common/test_policy.py b/ironic/tests/test_policy.py → ironic/tests/common/test_policy.py
diff --git a/ironic/tests/test_pxe_utils.py → ironic/tests/common/test_pxe_utils.py b/ironic/tests/test_pxe_utils.py → ironic/tests/common/test_pxe_utils.py
diff --git a/ironic/tests/test_raid.py → ironic/tests/common/test_raid.py b/ironic/tests/test_raid.py → ironic/tests/common/test_raid.py
diff --git a/ironic/tests/test_states.py → ironic/tests/common/test_states.py b/ironic/tests/test_states.py → ironic/tests/common/test_states.py
diff --git a/ironic/tests/test_swift.py → ironic/tests/common/test_swift.py b/ironic/tests/test_swift.py → ironic/tests/common/test_swift.py
diff --git a/ironic/tests/test_utils.py → ironic/tests/common/test_utils.py b/ironic/tests/test_utils.py → ironic/tests/common/test_utils.py
diff --git a/ironic/tests/drivers/irmc/test_management.py b/ironic/tests/drivers/irmc/test_management.py
@@ -281,18 +281,21 @@ def test_management_interface_get_sensors_data_ipmitool_ok(
 
     @mock.patch.object(irmc_common, 'get_irmc_report', spec_set=True,
                        autospec=True)
-    def test_management_interface_get_sensors_data_exception1(
+    def test_management_interface_get_sensors_data_exception(
             self,
             get_irmc_report_mock):
         """'FailedToGetSensorData Exception."""
 
-        get_irmc_report_mock.side_effect = iter([Exception("Report Error")])
+        get_irmc_report_mock.side_effect = exception.InvalidParameterValue(
+            "Fake Error")
+        irmc_management.scci.SCCIInvalidInputError = Exception
+        irmc_management.scci.SCCIClientError = Exception
 
         with task_manager.acquire(self.context, self.node.uuid) as task:
             task.node.driver_info['irmc_sensor_method'] = 'scci'
             e = self.assertRaises(exception.FailedToGetSensorData,
                                   self.driver.management.get_sensors_data,
                                   task)
         self.assertEqual("Failed to get sensor data for node 1be26c0b-" +
-                         "03f2-4d2e-ae87-c02d7f33c123. Error: Report Error",
+                         "03f2-4d2e-ae87-c02d7f33c123. Error: Fake Error",
                          str(e))
diff --git a/ironic/tests/drivers/third_party_driver_mock_specs.py b/ironic/tests/drivers/third_party_driver_mock_specs.py
@@ -94,6 +94,7 @@
     'MOUNT_FD',
     'UNMOUNT_FD',
     'SCCIClientError',
+    'SCCIInvalidInputError',
     'get_share_type',
     'get_client',
     'get_report',