From e89fcae346eee1e3e5b5beb65e641fbc666fd59c Mon Sep 17 00:00:00 2001
From: Brian Rosmaita <rosmaita.fossdev@gmail.com>
Date: Sun, 8 Apr 2018 14:47:05 -0400
Subject: [PATCH] Update local copy of image schema for 2.6

Update the local copy of the image schema to reflect Image API 2.6.

Change-Id: Ib0e56027927880d0fa198ffd8ea4b57e39f9d0fe
Closes-bug: #1762044
Depends-on: https://review.openstack.org/#/c/559501/
---
 glanceclient/tests/unit/v2/fixtures.py | 5 ++++-
 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 7f0e99c1..5a603c0c 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 922e026c..1ff20bc7 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"