From b5eaaf73c44fbb55a966ab9591438dbc506d18fa Mon Sep 17 00:00:00 2001 From: Joe Gordon Date: Thu, 15 Aug 2013 19:01:08 -0400 Subject: [PATCH] Make resource_tracker record host_ip Now that the host_ip, for affinity_filters, is coming from the DB and the host_ip is virt driver independent so make the resource_tracker add it. part of bp no-compute-fanout-to-scheduler Change-Id: I498578191b0af97cb91ca0d81b7ad1eeaf8fd995 --- nova/compute/resource_tracker.py | 3 +++ nova/tests/compute/test_resource_tracker.py | 3 +++ 2 files changed, 6 insertions(+) diff --git a/nova/compute/resource_tracker.py b/nova/compute/resource_tracker.py index 38d262eb7d1a..09968cbb0322 100644 --- a/nova/compute/resource_tracker.py +++ b/nova/compute/resource_tracker.py @@ -52,6 +52,8 @@ CONF.register_opts(resource_tracker_opts) LOG = logging.getLogger(__name__) COMPUTE_RESOURCE_SEMAPHORE = "compute_resources" +CONF.import_opt('my_ip', 'nova.netconf') + class ResourceTracker(object): """Compute helper class for keeping track of resource usage as instances @@ -271,6 +273,7 @@ class ResourceTracker(object): "'get_available_resource' Compute tracking is disabled.")) self.compute_node = None return + resources['host_ip'] = CONF.my_ip self._verify_resources(resources) diff --git a/nova/tests/compute/test_resource_tracker.py b/nova/tests/compute/test_resource_tracker.py index e5f2362ad3ee..6ed194d63b61 100644 --- a/nova/tests/compute/test_resource_tracker.py +++ b/nova/tests/compute/test_resource_tracker.py @@ -519,6 +519,9 @@ class InstanceClaimTestCase(BaseTrackerTestCase): self.tracker.update_available_resource(self.context) + # confirm tracker is adding in host_ip + self.assertTrue(self.compute.get('host_ip') is not None) + # confirm that resource usage is derived from instance usages, # not virt layer: self.assertEqual(claim_mem + FAKE_VIRT_MEMORY_OVERHEAD,