Merge "Add docker to image_schema on glance v2 cli"

2016-01-14 15:24:07 +00:00
parent d3d31a9445 f7b50c48ef
commit 2db882c41c
3 changed files with 6 additions and 3 deletions
--- a/glanceclient/tests/unit/v2/fixtures.py
+++ b/glanceclient/tests/unit/v2/fixtures.py
@@ -112,7 +112,8 @@ schema_fixture = {
                "aki",
                "bare",
                "ovf",
-                "ova"
+                "ova",
+                "docker"
            ],
            "type": [
                "null",
--- a/glanceclient/tests/unit/v2/test_shell_v2.py
+++ b/glanceclient/tests/unit/v2/test_shell_v2.py
@@ -40,7 +40,8 @@ def schema_args(schema_getter, omit=None):
    my_schema_getter = lambda: {
        'properties': {
            'container_format': {
-                'enum': [None, 'ami', 'ari', 'aki', 'bare', 'ovf', 'ova'],
+                'enum': [None, 'ami', 'ari', 'aki', 'bare', 'ovf', 'ova',
+                         'docker'],
                'type': 'string',
                'description': 'Format of the container'},
            'disk_format': {
--- a/glanceclient/v2/image_schema.py
+++ b/glanceclient/v2/image_schema.py
@@ -44,7 +44,8 @@ _BASE_SCHEMA = {
                "aki",
                "bare",
                "ovf",
-                "ova"
+                "ova",
+                "docker"
            ],
            "type": "string",
            "description": "Format of the container"