openstack
/
nova
Code Issues Proposed changes

Add a convenience attribute for reportclient 

We commonly have to refer to 'self.scheduler_client.reportclient' in the
code, and this long name makes for many ugly continued lines. This
shortens that reference, and makes the code cleaner and more readable.

Blueprint: placement-claims

Change-Id: Ia202e3d8c585b821eca88a01294df89b85aff2b3
This commit is contained in:
EdLeafe 2017-05-04 17:07:04 +00:00
parent d219a3dcdc
commit 632d258da2
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nova/compute/resource_tracker.py
View File

@ -95,6 +95,7 @@ class ResourceTracker(object):
self.monitors = monitor_handler.monitors
self.old_resources = collections.defaultdict(objects.ComputeNode)
self.scheduler_client = scheduler_client.SchedulerClient()
self.reportclient = self.scheduler_client.reportclient
self.ram_allocation_ratio = CONF.ram_allocation_ratio
self.cpu_allocation_ratio = CONF.cpu_allocation_ratio
self.disk_allocation_ratio = CONF.disk_allocation_ratio
@ -957,8 +958,7 @@ class ResourceTracker(object):
self.pci_tracker.update_pci_for_instance(context,
instance,
sign=sign)
self.scheduler_client.reportclient.update_instance_allocation(
cn, instance, sign)
self.reportclient.update_instance_allocation(cn, instance, sign)
# new instance, update compute node resource usage:
self._update_usage(self._get_usage_dict(instance), nodename,
sign=sign)
@ -992,8 +992,8 @@ class ResourceTracker(object):
if instance.vm_state not in vm_states.ALLOW_RESOURCE_REMOVAL:
self._update_usage_from_instance(context, instance, nodename)
self.scheduler_client.reportclient.remove_deleted_instances(
cn, self.tracked_instances.values())
self.reportclient.remove_deleted_instances(cn,
self.tracked_instances.values())
cn.free_ram_mb = max(0, cn.free_ram_mb)
cn.free_disk_gb = max(0, cn.free_disk_gb)

1
nova/tests/functional/compute/test_resource_tracker.py
View File

@ -145,6 +145,7 @@ class IronicResourceTrackerTest(test.TestCase):
self.driver_mock = driver
self.rt = resource_tracker.ResourceTracker(COMPUTE_HOST, driver)
self.rt.scheduler_client.reportclient = self.report_client
self.rt.reportclient = self.report_client
self.url = 'http://localhost/placement'
self.create_fixtures()