openstack/rally-openstack
Code Issues Proposed changes

Merge "Move JSON_SCHEMA to rally.consts"

Browse Source
This commit is contained in:
Jenkins 2015-01-09 12:48:11 +00:00 committed by Gerrit Code Review
commit 007decba95
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rally/consts.py
View File

@ -39,6 +39,9 @@ TEMPEST_TEST_SETS = ("full",
"volume") "volume")
JSON_SCHEMA = "http://json-schema.org/draft-04/schema"
class _TaskStatus(utils.ImmutableMixin, utils.EnumMixin): class _TaskStatus(utils.ImmutableMixin, utils.EnumMixin):
INIT = "init" INIT = "init"
VERIFYING = "verifying" VERIFYING = "verifying"

5
tests/unit/fakes.py
View File

@ -29,6 +29,7 @@ import six
from rally.benchmark.context import base as base_ctx from rally.benchmark.context import base as base_ctx
from rally.benchmark.scenarios import base from rally.benchmark.scenarios import base
from rally.common import utils as rally_utils from rally.common import utils as rally_utils
from rally import consts
from rally import objects from rally import objects
@ -1268,7 +1269,7 @@ class FakeRunner(object):
CONFIG_SCHEMA = { CONFIG_SCHEMA = {
"type": "object", "type": "object",
"$schema": rally_utils.JSON_SCHEMA, "$schema": consts.JSON_SCHEMA,
"properties": { "properties": {
"type": { "type": {
"type": "string", "type": "string",
@ -1319,7 +1320,7 @@ class FakeContext(base_ctx.Context):
CONFIG_SCHEMA = { CONFIG_SCHEMA = {
"type": "object", "type": "object",
"$schema": rally_utils.JSON_SCHEMA, "$schema": consts.JSON_SCHEMA,
"properties": { "properties": {
"test": { "test": {
"type": "integer" "type": "integer"