openstack/nova
Code Issues Proposed changes

Merge "Fix typos in nova/scheduler and nova/virt"

Browse Source
This commit is contained in:
Jenkins 2016-02-02 17:09:39 +00:00 committed by Gerrit Code Review
commit 8b9cb49227
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/scheduler/filters/compute_capabilities_filter.py
View File

@ -66,7 +66,7 @@ class ComputeCapabilitiesFilter(filters.BaseHostFilter):
def _satisfies_extra_specs(self, host_state, instance_type): def _satisfies_extra_specs(self, host_state, instance_type):
"""Check that the host_state provided by the compute service """Check that the host_state provided by the compute service
satisfy the extra specs associated with the instance type. satisfies the extra specs associated with the instance type.
""" """
if 'extra_specs' not in instance_type: if 'extra_specs' not in instance_type:
return True return True

2
nova/scheduler/host_manager.py
View File

@ -243,7 +243,7 @@ class HostState(object):
self.ram_allocation_ratio = compute.ram_allocation_ratio self.ram_allocation_ratio = compute.ram_allocation_ratio
def consume_from_request(self, spec_obj): def consume_from_request(self, spec_obj):
"""Incrementally update host state from an RequestSpec object.""" """Incrementally update host state from a RequestSpec object."""
@utils.synchronized(self._lock_name) @utils.synchronized(self._lock_name)
@set_update_time_on_success @set_update_time_on_success

2
nova/virt/libvirt/host.py
View File

@ -700,7 +700,7 @@ class Host(object):
:param only_running: True to only return running instances :param only_running: True to only return running instances
:param only_guests: True to filter out any host domain (eg Dom-0) :param only_guests: True to filter out any host domain (eg Dom-0)
See method "list_instance_domains" for more informations. See method "list_instance_domains" for more information.
:returns: list of Guest objects :returns: list of Guest objects
""" """

4
nova/virt/xenapi/host.py
View File

@ -168,7 +168,7 @@ class HostState(object):
"""Exctract information from the device string about the slot, the """Exctract information from the device string about the slot, the
vendor and the product ID. The string is as follow: vendor and the product ID. The string is as follow:
"Slot:\tBDF\nClass:\txxxx\nVendor:\txxxx\nDevice:\txxxx\n..." "Slot:\tBDF\nClass:\txxxx\nVendor:\txxxx\nDevice:\txxxx\n..."
Return a dictionary with informations about the device. Return a dictionary with information about the device.
""" """
slot_regex = _compile_hex(r"Slot:\t" slot_regex = _compile_hex(r"Slot:\t"
r"((?:hex{4}:)?" # Domain: (optional) r"((?:hex{4}:)?" # Domain: (optional)
@ -207,7 +207,7 @@ class HostState(object):
pci_list = lspci_out.split("\n\n") pci_list = lspci_out.split("\n\n")
# For each device of the list, check if it uses the pciback # For each device of the list, check if it uses the pciback
# kernel driver and if it does, get informations and add it # kernel driver and if it does, get information and add it
# to the list of passthrough_devices. Ignore it if the driver # to the list of passthrough_devices. Ignore it if the driver
# is not pciback. # is not pciback.
passthrough_devices = [] passthrough_devices = []