diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-26 01:39:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-26 01:39:53 +0000 |
| commit | d9741a34bad17fc74a8ce467cb5fced337c1b812 (patch) | |
| tree | e204de4756d51d1b580a221ceadad22d51d84553 | |
| parent | b74e1a332ad0d6bc4a838adaf3802da6bc24c5b7 (diff) | |
| parent | c1d78cc4f8f4467b8c9ef59b0db2153fe095da09 (diff) | |
Merge "List InstanceNotFound as a client exception"
| -rw-r--r-- | nova/network/manager.py | 2 | ||||
| -rw-r--r-- | nova/tests/network/test_manager.py | 12 |
2 files changed, 14 insertions, 0 deletions
diff --git a/nova/network/manager.py b/nova/network/manager.py index 678bfdba8..b9c8efe44 100644 --- a/nova/network/manager.py +++ b/nova/network/manager.py @@ -67,6 +67,7 @@ from nova.openstack.common import importutils from nova.openstack.common import jsonutils from nova.openstack.common import lockutils from nova.openstack.common import log as logging +from nova.openstack.common.rpc import common as rpc_common from nova.openstack.common import timeutils from nova.openstack.common import uuidutils from nova import quota @@ -557,6 +558,7 @@ class NetworkManager(manager.Manager): self.db.virtual_interface_delete_by_instance(read_deleted_context, instance_uuid) + @rpc_common.client_exceptions(exception.InstanceNotFound) def get_instance_nw_info(self, context, instance_id, rxtx_factor, host, instance_uuid=None, **kwargs): """Creates network info list for instance. diff --git a/nova/tests/network/test_manager.py b/nova/tests/network/test_manager.py index 2fe53968b..c4ce649f0 100644 --- a/nova/tests/network/test_manager.py +++ b/nova/tests/network/test_manager.py @@ -1222,6 +1222,18 @@ class CommonNetworkTestCase(test.TestCase): def fake_create_fixed_ips(self, context, network_id, fixed_cidr=None): return None + def test_get_instance_nw_info_client_exceptions(self): + manager = network_manager.NetworkManager() + self.mox.StubOutWithMock(manager.db, + 'virtual_interface_get_by_instance') + manager.db.virtual_interface_get_by_instance( + self.context, FAKEUUID).AndRaise(exception.InstanceNotFound( + instance_id=FAKEUUID)) + self.mox.ReplayAll() + self.assertRaises(rpc_common.ClientException, + manager.get_instance_nw_info, + self.context, FAKEUUID, 'fake_rxtx_factor', HOST) + def test_deallocate_for_instance_passes_host_info(self): manager = fake_network.FakeNetworkManager() db = manager.db |