openstack/nova
Code Issues Proposed changes

Merge "Replace distutils"

Browse Source
This commit is contained in:
Zuul 2024-11-30 02:44:50 +00:00 committed by Gerrit Code Review
commit fe245e071b
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nova/scheduler/filters/image_props_filter.py
View File

@ -14,8 +14,6 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from distutils import versionpredicate
from oslo_log import log as logging from oslo_log import log as logging
from oslo_utils import versionutils from oslo_utils import versionutils
@ -84,8 +82,8 @@ class ImagePropertiesFilter(filters.BaseHostFilter):
version_required = image_props.get('img_hv_requested_version') version_required = image_props.get('img_hv_requested_version')
if not (hypervisor_version and version_required): if not (hypervisor_version and version_required):
return True return True
img_prop_predicate = versionpredicate.VersionPredicate( img_prop_predicate = versionutils.VersionPredicate(
'image_prop (%s)' % version_required) version_required)
hyper_ver_str = versionutils.convert_version_to_str(hyper_version) hyper_ver_str = versionutils.convert_version_to_str(hyper_version)
return img_prop_predicate.satisfied_by(hyper_ver_str) return img_prop_predicate.satisfied_by(hyper_ver_str)

2
requirements.txt
View File

@ -38,7 +38,7 @@ oslo.limit>=1.5.0 # Apache-2.0
oslo.reports>=1.18.0 # Apache-2.0 oslo.reports>=1.18.0 # Apache-2.0
oslo.serialization>=4.2.0 # Apache-2.0 oslo.serialization>=4.2.0 # Apache-2.0
oslo.upgradecheck>=1.3.0 oslo.upgradecheck>=1.3.0
oslo.utils>=7.3.0 # Apache-2.0 oslo.utils>=7.4.0 # Apache-2.0
oslo.db>=10.0.0 # Apache-2.0 oslo.db>=10.0.0 # Apache-2.0
oslo.rootwrap>=5.15.0 # Apache-2.0 oslo.rootwrap>=5.15.0 # Apache-2.0
oslo.messaging>=14.1.0 # Apache-2.0 oslo.messaging>=14.1.0 # Apache-2.0