openstack/tempest
Code Issues Proposed changes

Merge "Fix schema definition admin_flavor_create"

Browse Source
This commit is contained in:
Jenkins
2014-10-06 19:00:45 +00:00
committed by Gerrit Code Review
parent 76f33d89db e16bef0a0b
commit 408c7f259a
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tempest/api_schema/request/compute/flavors.py
+13 -8
View File
@@ -40,14 +40,19 @@ common_admin_flavor_create = {
"json-schema": {
"type": "object",
"properties": {
"name": {"type": "string"},
"ram": {"type": "integer", "minimum": 1},
"vcpus": {"type": "integer", "minimum": 1},
"disk": {"type": "integer"},
"id": {"type": "integer"},
"swap": {"type": "integer"},
"rxtx_factor": {"type": "integer"},
"OS-FLV-EXT-DATA:ephemeral": {"type": "integer"}
"flavor": {
"type": "object",
"properties": {
"name": {"type": "string",
"exclude_tests": ["gen_str_min_length"]},
"ram": {"type": "integer", "minimum": 1},
"vcpus": {"type": "integer", "minimum": 1},
"disk": {"type": "integer"},
"id": {"type": "integer",
"exclude_tests": ["gen_none", "gen_string"]
},
}
}
}
}
}
tempest/common/generator/base_generator.py
+3
View File
@@ -144,6 +144,9 @@ class BasicGeneratorSet(object):
continue
name = generator.__name__
if ("exclude_tests" in schema and
name in schema["exclude_tests"]):
continue
if path is not None:
name = "%s_%s" % ("_".join(path), name)
scenarios.append({