Merge "Compute manager should remove dead resources"

2 files changed, 8 insertions, 4 deletions

diff --git a/nova/virt/baremetal/driver.py b/nova/virt/baremetal/driver.py
index 3c4dd579f..94d3f0a92 100755
--- a/nova/virt/baremetal/driver.py
+++ b/nova/virt/baremetal/driver.py
@@ -410,9 +410,13 @@ class BareMetalDriver(driver.ComputeDriver):
 
     def get_available_resource(self, nodename):
         context = nova_context.get_admin_context()
-        node = db.bm_node_get_by_node_uuid(context, nodename)
-        dic = self._node_resource(node)
-        return dic
+        resource = {}
+        try:
+            node = db.bm_node_get_by_node_uuid(context, nodename)
+            resource = self._node_resource(node)
+        except exception.NodeNotFoundByUUID:
+            pass
+        return resource
 
     def ensure_filtering_rules_for_instance(self, instance_ref, network_info):
         self.firewall_driver.setup_basic_filtering(instance_ref, network_info)
diff --git a/nova/virt/fake.py b/nova/virt/fake.py
index 8afff569c..58f303efc 100755
--- a/nova/virt/fake.py
+++ b/nova/virt/fake.py
@@ -321,7 +321,7 @@ class FakeDriver(driver.ComputeDriver):
            disk and ram.
         """
         if nodename not in _FAKE_NODES:
-            raise exception.NovaException("node %s is not found" % nodename)
+            return {}
 
         dic = {'vcpus': 1,
                'memory_mb': 8192,