openstack/python-glanceclient
Code Issues Proposed changes

Add ploop in disk_format

Browse Source 
"ploop" image format is supported in upstream Glance
https://review.openstack.org/341633

And similar patch has been added in python-openstackclient:
https://review.openstack.org/411405

Co-Authored-By: yuyafei <yu.yafei@zte.com.cn>
Change-Id: I1471224df97cf5fecfe7f02e549855af81c45848
Related-Bug: 1650342
This commit is contained in:
Evgeny Antyshev 2017-01-18 12:13:40 +00:00
parent 54e6faadf2
commit 6ab6a740ff
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
glanceclient/tests/unit/v2/fixtures.py
View File

@ -168,7 +168,8 @@ schema_fixture = {
"raw", "raw",
"qcow2", "qcow2",
"vdi", "vdi",
"iso" "iso",
"ploop"
], ],
"type": [ "type": [
"null", "null",

2
glanceclient/tests/unit/v2/test_shell_v2.py
View File

@ -46,7 +46,7 @@ def schema_args(schema_getter, omit=None):
'description': 'Format of the container'}, 'description': 'Format of the container'},
'disk_format': { 'disk_format': {
'enum': [None, 'ami', 'ari', 'aki', 'vhd', 'vhdx', 'vmdk', 'enum': [None, 'ami', 'ari', 'aki', 'vhd', 'vhdx', 'vmdk',
'raw', 'qcow2', 'vdi', 'iso'], 'raw', 'qcow2', 'vdi', 'iso', 'ploop'],
'type': 'string', 'type': 'string',
'description': 'Format of the disk'}, 'description': 'Format of the disk'},
'location': {'type': 'string'}, 'location': {'type': 'string'},

2
glanceclient/v1/shell.py
View File

@ -31,7 +31,7 @@ import glanceclient.v1.images
CONTAINER_FORMATS = 'Acceptable formats: ami, ari, aki, bare, and ovf.' CONTAINER_FORMATS = 'Acceptable formats: ami, ari, aki, bare, and ovf.'
DISK_FORMATS = ('Acceptable formats: ami, ari, aki, vhd, vmdk, raw, ' DISK_FORMATS = ('Acceptable formats: ami, ari, aki, vhd, vmdk, raw, '
'qcow2, vdi, and iso.') 'qcow2, vdi, iso, and ploop.')
DATA_FIELDS = ('location', 'copy_from', 'file') DATA_FIELDS = ('location', 'copy_from', 'file')
_bool_strict = functools.partial(strutils.bool_from_string, strict=True) _bool_strict = functools.partial(strutils.bool_from_string, strict=True)

2
glanceclient/v2/image_schema.py
View File

@ -106,7 +106,7 @@ _BASE_SCHEMA = {
}, },
"disk_format": { "disk_format": {
"enum": [None, "ami", "ari", "aki", "vhd", "vhdx", "vmdk", "raw", "enum": [None, "ami", "ari", "aki", "vhd", "vhdx", "vmdk", "raw",
"qcow2", "vdi", "iso"], "qcow2", "vdi", "iso", "ploop"],
"type": ["null", "string"], "type": ["null", "string"],
"description": "Format of the disk" "description": "Format of the disk"
}, },