From 4acab4605fccac1e558eca1aa09ef0e034dc7321 Mon Sep 17 00:00:00 2001 From: Chris Dent Date: Wed, 23 Jan 2019 10:49:27 +0000 Subject: [PATCH] Update standard resource class counts in tests The 0.2.0 release of os-resource-classes has happened, adding the 'PCPU' class. It's already updated in global upper-constraints, so update it in requirements.txt and lower-constraints and change the gabbi tests which count resource classes. Change-Id: I4a189aca59485d65ad8a7c9bfbeca7ac995ed336 --- lower-constraints.txt | 2 +- .../tests/functional/gabbits/resource-classes-policy.yaml | 2 +- placement/tests/functional/gabbits/resource-classes.yaml | 8 ++++---- requirements.txt | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lower-constraints.txt b/lower-constraints.txt index 72aa25309..3d5bf1416 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -41,7 +41,7 @@ mox3==0.20.0 msgpack-python==0.5.6 netaddr==0.7.18 netifaces==0.10.4 -os-resource-classes==0.1.0 +os-resource-classes==0.2.0 os-client-config==1.29.0 os-service-types==1.2.0 os-traits==0.4.0 diff --git a/placement/tests/functional/gabbits/resource-classes-policy.yaml b/placement/tests/functional/gabbits/resource-classes-policy.yaml index 1d90db0d6..6f0956d46 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`: 14 # Number of standard resource classes + $.resource_classes.`len`: 15 # Number of standard resource classes - name: create resource class POST: /resource_classes diff --git a/placement/tests/functional/gabbits/resource-classes.yaml b/placement/tests/functional/gabbits/resource-classes.yaml index 638b03a33..2ee6c9028 100644 --- a/placement/tests/functional/gabbits/resource-classes.yaml +++ b/placement/tests/functional/gabbits/resource-classes.yaml @@ -51,7 +51,7 @@ tests: GET: /resource_classes response_json_paths: response_json_paths: - $.resource_classes.`len`: 14 # Number of standard resource classes + $.resource_classes.`len`: 15 # Number of standard resource classes $.resource_classes[0].name: VCPU - name: non admin forbidden @@ -138,9 +138,9 @@ tests: - name: list resource classes after addition of custom res class GET: /resource_classes response_json_paths: - $.resource_classes.`len`: 15 # 14 standard plus 1 custom - $.resource_classes[14].name: $ENVIRON['CUSTOM_RES_CLASS'] - $.resource_classes[14].links[?rel = "self"].href: /resource_classes/$ENVIRON['CUSTOM_RES_CLASS'] + $.resource_classes.`len`: 16 # 15 standard plus 1 custom + $.resource_classes[15].name: $ENVIRON['CUSTOM_RES_CLASS'] + $.resource_classes[15].links[?rel = "self"].href: /resource_classes/$ENVIRON['CUSTOM_RES_CLASS'] - name: update standard resource class bad json PUT: /resource_classes/VCPU diff --git a/requirements.txt b/requirements.txt index 66fd1d852..e4ba4b9c5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -23,6 +23,6 @@ oslo.i18n>=3.15.3 # Apache-2.0 oslo.middleware>=3.31.0 # Apache-2.0 oslo.upgradecheck>=0.1.1 # Apache-2.0 oslo.versionedobjects>=1.31.2 # Apache-2.0 -os-resource-classes>=0.1.0 # Apache-2.0 +os-resource-classes>=0.2.0 # Apache-2.0 os-traits>=0.4.0 # Apache-2.0 microversion-parse>=0.2.1 # Apache-2.0