From 89cc7332f5a0eab488bec752bb6f0442c1c4a0ec Mon Sep 17 00:00:00 2001 From: Sean Mooney Date: Wed, 26 Jan 2022 14:40:33 +0000 Subject: [PATCH] update placement for os-traits 2.7.0 release This change re enables checking the standard trait count and updates placement to require os-traits 2.7.0 Depends-on: https://review.opendev.org/c/openstack/requirements/+/826447 Change-Id: I3685c3caac3be4754d1f9e8479d8a047eaf8f3e8 --- lower-constraints.txt | 2 +- placement/tests/functional/gabbits/traits.yaml | 10 ++++------ requirements.txt | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/lower-constraints.txt b/lower-constraints.txt index 3610ffed6..ea9f8bc0f 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -36,7 +36,7 @@ netifaces==0.10.4 os-client-config==1.29.0 os-resource-classes==1.1.0 os-service-types==1.2.0 -os-traits==2.6.0 +os-traits==2.7.0 oslo.concurrency==3.26.0 oslo.config==6.7.0 oslo.context==2.22.0 diff --git a/placement/tests/functional/gabbits/traits.yaml b/placement/tests/functional/gabbits/traits.yaml index 07b99c1d1..4dd669df0 100644 --- a/placement/tests/functional/gabbits/traits.yaml +++ b/placement/tests/functional/gabbits/traits.yaml @@ -9,12 +9,10 @@ defaults: openstack-api-version: placement 1.6 tests: -# FIXME(sean-k-mooney): commnet out to allow os-traits 2.7.0 -# to be added to upper-constraints -#- name: what is at traits -# GET: /traits -# response_json_paths: -# $.traits.`len`: 294 # Number of standard traits +- name: what is at traits + GET: /traits + response_json_paths: + $.traits.`len`: 335 # Number of standard traits - name: create a trait without custom namespace PUT: /traits/TRAIT_X diff --git a/requirements.txt b/requirements.txt index 1986a681a..6e6b9ce9c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -22,5 +22,5 @@ oslo.middleware>=3.31.0 # Apache-2.0 oslo.upgradecheck>=1.3.0 # Apache-2.0 # NOTE(efried): Sync lower-constraints.txt for os-traits & os-resource-classes. os-resource-classes>=1.1.0 # Apache-2.0 -os-traits>=2.6.0 # Apache-2.0 +os-traits>=2.7.0 # Apache-2.0 microversion-parse>=0.2.1 # Apache-2.0