Merge "Update images types"

This commit is contained in:
Jenkins 2015-05-08 15:33:27 +00:00 committed by Gerrit Code Review
commit 861511425d

View File

@ -18,25 +18,25 @@ limitations under the License.
class ImageContainerFormat(object): class ImageContainerFormat(object):
"""@summary: Types denoting an Image's container format""" """@summary: Types denoting an Image's container format"""
BARE = "bare" BARE = 'bare'
OVF = "ovf" OVF = 'ovf'
AKI = "aki" AKI = 'aki'
ARI = "ari" ARI = 'ari'
AMI = "ami" AMI = 'ami'
class ImageDiskFormat(object): class ImageDiskFormat(object):
"""@summary: Types denoting an Image's disk format""" """@summary: Types denoting an Image's disk format"""
RAW = "raw" RAW = 'raw'
VHD = "vhd" VHD = 'vhd'
VMDK = "vmdk" VMDK = 'vmdk'
VDI = "vdi" VDI = 'vdi'
ISO = "iso" ISO = 'iso'
QCOW2 = "qcow2" QCOW2 = 'qcow2'
AKI = "aki" AKI = 'aki'
AMI = "ami" AMI = 'ami'
ARI = "ari" ARI = 'ari'
class ImageMemberStatus(object): class ImageMemberStatus(object):
@ -58,20 +58,22 @@ class ImageOSType(object):
class ImageStatus(object): class ImageStatus(object):
"""@summary: Types denoting an Image's status""" """@summary: Types denoting an Image's status"""
QUEUED = "queued" QUEUED = 'queued'
SAVING = "saving" SAVING = 'saving'
ACTIVE = "active" ACTIVE = 'active'
KILLED = "killed" KILLED = 'killed'
PENDING_DELETE = "pending_delete" PENDING_DELETE = 'pending_delete'
DELETED = "deleted" DELETED = 'deleted'
ERROR = "error" ERROR = 'error'
DEACTIVATED = 'deactivated'
class ImageType(object): class ImageType(object):
"""@summary: Types denoting an Image's type""" """@summary: Types denoting an Image's type"""
IMPORT = 'import' BASE = 'base'
EXPORT = 'export' EXPORT = 'export'
IMPORT = 'import'
SNAPSHOT = 'snapshot' SNAPSHOT = 'snapshot'