diff options
| author | Zuul <zuul@review.openstack.org> | 2018-04-11 04:34:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-04-11 04:34:37 +0000 |
| commit | 939e532a3adfd2268106985364503ecb69658922 (patch) | |
| tree | 28edae3a58cc2cfe10f704c8624aacc2c51d03ca /glanceclient | |
| parent | 863fb3b20e59a17c1a5f0c5fe74d0afb79b30c27 (diff) | |
| parent | e89fcae346eee1e3e5b5beb65e641fbc666fd59c (diff) | |
| download | python-glanceclient-939e532a3adfd2268106985364503ecb69658922.tar.gz | |
Merge "Update local copy of image schema for 2.6"
Diffstat (limited to 'glanceclient')
| -rw-r--r-- | glanceclient/tests/unit/v2/fixtures.py | 5 | ||||
| -rw-r--r-- | glanceclient/v2/image_schema.py | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/glanceclient/tests/unit/v2/fixtures.py b/glanceclient/tests/unit/v2/fixtures.py index 7f0e99c..5a603c0 100644 --- a/glanceclient/tests/unit/v2/fixtures.py +++ b/glanceclient/tests/unit/v2/fixtures.py @@ -303,12 +303,15 @@ schema_fixture = { "readOnly": True, "description": "Status of the image", "enum": [ + "deactivated", "queued", "saving", "active", "killed", "deleted", - "pending_delete" + "pending_delete", + "uploading", + "importing" ], "type": "string" }, diff --git a/glanceclient/v2/image_schema.py b/glanceclient/v2/image_schema.py index 922e026..1ff20bc 100644 --- a/glanceclient/v2/image_schema.py +++ b/glanceclient/v2/image_schema.py @@ -129,7 +129,8 @@ _BASE_SCHEMA = { }, "status": { "readOnly": True, - "enum": ["queued", "saving", "active", "killed", "deleted", + "enum": ["queued", "saving", "active", "killed", + "deleted", "uploading", "importing", "pending_delete", "deactivated"], "type": "string", "description": "Status of the image" |