From 366167009d010d41e91eb7af4490fca842b37266 Mon Sep 17 00:00:00 2001 From: Balazs Gibizer Date: Wed, 16 Jun 2021 09:19:00 +0200 Subject: [PATCH] Bump os-resource-classes requirements os-resource-classes 1.1.0 was recently released and upper constraints were bumped. This brings 3 new standard resource classes so the tests are adjusted. blueprint: qos-minimum-guaranteed-packet-rate Change-Id: I6d1c84ddc4094635bebe001ea046cd01f1c98bbb --- lower-constraints.txt | 2 +- .../functional/gabbits/resource-classes-legacy-rbac.yaml | 2 +- .../tests/functional/gabbits/resource-classes-policy.yaml | 2 +- .../functional/gabbits/resource-classes-secure-rbac.yaml | 4 ++-- placement/tests/functional/gabbits/resource-classes.yaml | 4 ++-- requirements.txt | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lower-constraints.txt b/lower-constraints.txt index 1f71b24cd..9c480d7bf 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -32,7 +32,7 @@ msgpack-python==0.5.6 netaddr==0.7.18 netifaces==0.10.4 os-client-config==1.29.0 -os-resource-classes==1.0.0 +os-resource-classes==1.1.0 os-service-types==1.2.0 os-traits==2.5.0 oslo.concurrency==3.26.0 diff --git a/placement/tests/functional/gabbits/resource-classes-legacy-rbac.yaml b/placement/tests/functional/gabbits/resource-classes-legacy-rbac.yaml index b29e74314..8ce1da282 100644 --- a/placement/tests/functional/gabbits/resource-classes-legacy-rbac.yaml +++ b/placement/tests/functional/gabbits/resource-classes-legacy-rbac.yaml @@ -30,7 +30,7 @@ tests: GET: /resource_classes request_headers: *project_admin_headers response_json_paths: - $.resource_classes.`len`: 18 # Number of standard resource classes + $.resource_classes.`len`: 21 # Number of standard resource classes - name: project member cannot create resource classes POST: /resource_classes diff --git a/placement/tests/functional/gabbits/resource-classes-policy.yaml b/placement/tests/functional/gabbits/resource-classes-policy.yaml index 511f4a4ab..6a9307f94 100644 --- a/placement/tests/functional/gabbits/resource-classes-policy.yaml +++ b/placement/tests/functional/gabbits/resource-classes-policy.yaml @@ -16,7 +16,7 @@ tests: - name: list resource classes GET: /resource_classes response_json_paths: - $.resource_classes.`len`: 18 # Number of standard resource classes + $.resource_classes.`len`: 21 # Number of standard resource classes - name: create resource class POST: /resource_classes diff --git a/placement/tests/functional/gabbits/resource-classes-secure-rbac.yaml b/placement/tests/functional/gabbits/resource-classes-secure-rbac.yaml index cf3e36fa4..470cb65de 100644 --- a/placement/tests/functional/gabbits/resource-classes-secure-rbac.yaml +++ b/placement/tests/functional/gabbits/resource-classes-secure-rbac.yaml @@ -61,13 +61,13 @@ tests: GET: /resource_classes request_headers: *system_reader_headers response_json_paths: - $.resource_classes.`len`: 18 # Number of standard resource classes + $.resource_classes.`len`: 21 # Number of standard resource classes - name: system admin can list resource classes GET: /resource_classes request_headers: *system_admin_headers response_json_paths: - $.resource_classes.`len`: 18 # Number of standard resource classes + $.resource_classes.`len`: 21 # Number of standard resource classes - name: project admin cannot create resource classes POST: /resource_classes diff --git a/placement/tests/functional/gabbits/resource-classes.yaml b/placement/tests/functional/gabbits/resource-classes.yaml index 0c4445d96..d0e13d613 100644 --- a/placement/tests/functional/gabbits/resource-classes.yaml +++ b/placement/tests/functional/gabbits/resource-classes.yaml @@ -50,7 +50,7 @@ tests: - name: what is at resource classes GET: /resource_classes response_json_paths: - $.resource_classes.`len`: 18 # Number of standard resource classes + $.resource_classes.`len`: 21 # Number of standard resource classes - name: non admin forbidden GET: /resource_classes @@ -136,7 +136,7 @@ tests: - name: list resource classes after addition of custom res class GET: /resource_classes response_json_paths: - $.resource_classes.`len`: 19 # 18 standard plus 1 custom + $.resource_classes.`len`: 22 # 21 standard plus 1 custom - name: update standard resource class bad json PUT: /resource_classes/VCPU diff --git a/requirements.txt b/requirements.txt index 15b144145..552ad17f1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -21,6 +21,6 @@ oslo.policy>=3.6.0 # Apache-2.0 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.0.0 # Apache-2.0 +os-resource-classes>=1.1.0 # Apache-2.0 os-traits>=2.5.0 # Apache-2.0 microversion-parse>=0.2.1 # Apache-2.0