Enable mypy on scheduler/utils.py
A couple of extra hints was needed. A later patch will add type hints for some functions that is being refactored Change-Id: I9886270dea092e28a8123245a2c70c8d8c7127f3 Blueprint: support-interface-attach-with-qos-ports
This commit is contained in:
parent
be9dd3d9db
commit
e6ff3651e6
|
@ -1,6 +1,7 @@
|
||||||
nova/compute/manager.py
|
nova/compute/manager.py
|
||||||
nova/crypto.py
|
nova/crypto.py
|
||||||
nova/privsep/path.py
|
nova/privsep/path.py
|
||||||
|
nova/scheduler/utils.py
|
||||||
nova/virt/driver.py
|
nova/virt/driver.py
|
||||||
nova/virt/hardware.py
|
nova/virt/hardware.py
|
||||||
nova/virt/libvirt/__init__.py
|
nova/virt/libvirt/__init__.py
|
||||||
|
|
|
@ -17,6 +17,7 @@
|
||||||
import collections
|
import collections
|
||||||
import re
|
import re
|
||||||
import sys
|
import sys
|
||||||
|
import typing as ty
|
||||||
from urllib import parse
|
from urllib import parse
|
||||||
|
|
||||||
import os_resource_classes as orc
|
import os_resource_classes as orc
|
||||||
|
@ -254,7 +255,7 @@ class ResourceRequest(object):
|
||||||
if not vpmem_labels:
|
if not vpmem_labels:
|
||||||
# No vpmems required
|
# No vpmems required
|
||||||
return
|
return
|
||||||
amount_by_rc = collections.defaultdict(int)
|
amount_by_rc: ty.DefaultDict[str, int] = collections.defaultdict(int)
|
||||||
for vpmem_label in vpmem_labels:
|
for vpmem_label in vpmem_labels:
|
||||||
resource_class = orc.normalize_name(
|
resource_class = orc.normalize_name(
|
||||||
"PMEM_NAMESPACE_" + vpmem_label)
|
"PMEM_NAMESPACE_" + vpmem_label)
|
||||||
|
@ -302,7 +303,7 @@ class ResourceRequest(object):
|
||||||
dedicated_cpus = hardware.get_dedicated_cpu_constraint(flavor)
|
dedicated_cpus = hardware.get_dedicated_cpu_constraint(flavor)
|
||||||
realtime_cpus = hardware.get_realtime_cpu_constraint(flavor, image)
|
realtime_cpus = hardware.get_realtime_cpu_constraint(flavor, image)
|
||||||
|
|
||||||
pcpus = len(dedicated_cpus or realtime_cpus)
|
pcpus = len(dedicated_cpus or realtime_cpus or [])
|
||||||
vcpus = flavor.vcpus - pcpus
|
vcpus = flavor.vcpus - pcpus
|
||||||
|
|
||||||
# apply for the VCPU resource of a 'mixed' instance
|
# apply for the VCPU resource of a 'mixed' instance
|
||||||
|
@ -428,7 +429,7 @@ class ResourceRequest(object):
|
||||||
|
|
||||||
:return: A dict of the form {resource_class: amount}
|
:return: A dict of the form {resource_class: amount}
|
||||||
"""
|
"""
|
||||||
ret = collections.defaultdict(lambda: 0)
|
ret: ty.DefaultDict[str, int] = collections.defaultdict(lambda: 0)
|
||||||
for rg in self._rg_by_id.values():
|
for rg in self._rg_by_id.values():
|
||||||
for resource_class, amount in rg.resources.items():
|
for resource_class, amount in rg.resources.items():
|
||||||
ret[resource_class] += amount
|
ret[resource_class] += amount
|
||||||
|
@ -469,7 +470,7 @@ class ResourceRequest(object):
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def all_required_traits(self):
|
def all_required_traits(self):
|
||||||
traits = set()
|
traits: ty.Set[str] = set()
|
||||||
for rr in self._rg_by_id.values():
|
for rr in self._rg_by_id.values():
|
||||||
traits = traits.union(rr.required_traits)
|
traits = traits.union(rr.required_traits)
|
||||||
return traits
|
return traits
|
||||||
|
|
Loading…
Reference in New Issue