Catch NotImplementedError on reset_network for xen

This patch adds a decorator around reset_network for
NotImplementedError.

Closes-Bug: #1306404
Change-Id: If337304d2cba2f3a91374d50cd6ea3a6b80285de

2 files changed, 24 insertions, 0 deletions

diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index c41fef34ae..ce45568520 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -4232,6 +4232,7 @@ class ComputeManager(manager.Manager):
         instance.save(expected_task_state=task_states.SPAWNING)
         self._notify_about_instance_usage(context, instance, 'unshelve.end')
 
+    @messaging.expected_exceptions(NotImplementedError)
     @wrap_instance_fault
     def reset_network(self, context, instance):
         """Reset networking on the given instance."""
diff --git a/nova/tests/compute/test_compute_mgr.py b/nova/tests/compute/test_compute_mgr.py
index 23d46a23a9..d2f74e848b 100644
--- a/nova/tests/compute/test_compute_mgr.py
+++ b/nova/tests/compute/test_compute_mgr.py
@@ -20,6 +20,7 @@ from eventlet import event as eventlet_event
 import mock
 import mox
 from oslo.config import cfg
+from oslo import messaging
 
 from nova.compute import power_state
 from nova.compute import task_states
@@ -40,6 +41,7 @@ from nova.tests import fake_block_device
 from nova.tests import fake_instance
 from nova.tests.objects import test_instance_fault
 from nova.tests.objects import test_instance_info_cache
+from nova import utils
 
 
 CONF = cfg.CONF
@@ -1909,6 +1911,27 @@ class ComputeManagerUnitTestCase(test.NoDBTestCase):
 
         do_test()
 
+    def test_reset_network_driver_not_implemented(self):
+        instance = fake_instance.fake_instance_obj(self.context)
+
+        @mock.patch.object(self.compute.driver, 'reset_network',
+                           side_effect=NotImplementedError())
+        @mock.patch.object(compute_utils, 'add_instance_fault_from_exc')
+        def do_test(mock_add_fault, mock_reset):
+            self.assertRaises(messaging.ExpectedException,
+                              self.compute.reset_network,
+                              self.context,
+                              instance)
+
+            self.compute = utils.ExceptionHelper(self.compute)
+
+            self.assertRaises(NotImplementedError,
+                              self.compute.reset_network,
+                              self.context,
+                              instance)
+
+        do_test()
+
 
 class ComputeManagerBuildInstanceTestCase(test.NoDBTestCase):
     def setUp(self):