Merge "clean up image choices and help text"

This commit is contained in:
Jenkins 2016-12-02 13:11:30 +00:00 committed by Gerrit Code Review
commit 2de45c2805
5 changed files with 30 additions and 23 deletions

View File

@ -78,7 +78,8 @@ Create/upload an image
.. option:: --disk-format <disk-format>
Image disk format (default: raw)
Image disk format. The supported options are: ami, ari, aki, vhd, vmdk,
raw, qcow2, vhdx, vdi, and iso. The default format is: raw
.. option:: --size <size>
@ -337,7 +338,8 @@ Set image properties
.. option:: --disk-format <disk-format>
Image disk format (default: raw)
Image disk format. The supported options are: ami, ari, aki, vhd, vmdk,
raw, qcow2, vhdx, vdi, and iso.
.. option:: --size <size>

View File

@ -38,6 +38,8 @@ from openstackclient.i18n import _
DEFAULT_CONTAINER_FORMAT = 'bare'
DEFAULT_DISK_FORMAT = 'raw'
DISK_CHOICES = ["ami", "ari", "aki", "vhd", "vmdk", "raw", "qcow2", "vhdx",
"vdi", "iso"]
LOG = logging.getLogger(__name__)
@ -89,8 +91,9 @@ class CreateImage(command.ShowOne):
"--disk-format",
default=DEFAULT_DISK_FORMAT,
metavar="<disk-format>",
help=_("Image disk format "
"(default: %s)") % DEFAULT_DISK_FORMAT,
choices=DISK_CHOICES,
help=_("Image disk format. The supported options are: %s. "
"The default format is: raw") % ', '.join(DISK_CHOICES)
)
parser.add_argument(
"--size",
@ -502,14 +505,12 @@ class SetImage(command.Command):
container_choices,
choices=container_choices
)
disk_choices = ["ami", "ari", "aki", "vhd", "vmdk", "raw", "qcow2",
"vhdx", "vdi", "iso"]
parser.add_argument(
"--disk-format",
metavar="<disk-format>",
help=_("Disk format of image. Acceptable formats: %s") %
disk_choices,
choices=disk_choices
choices=DISK_CHOICES,
help=_("Image disk format. The supported options are: %s.") %
', '.join(DISK_CHOICES)
)
parser.add_argument(
"--size",

View File

@ -32,6 +32,8 @@ from openstackclient.identity import common
DEFAULT_CONTAINER_FORMAT = 'bare'
DEFAULT_DISK_FORMAT = 'raw'
DISK_CHOICES = ["ami", "ari", "aki", "vhd", "vmdk", "raw", "qcow2", "vhdx",
"vdi", "iso"]
LOG = logging.getLogger(__name__)
@ -140,9 +142,10 @@ class CreateImage(command.ShowOne):
parser.add_argument(
"--disk-format",
default=DEFAULT_DISK_FORMAT,
choices=DISK_CHOICES,
metavar="<disk-format>",
help=_("Image disk format "
"(default: %s)") % DEFAULT_DISK_FORMAT,
help=_("Image disk format. The supported options are: %s. "
"The default format is: raw") % ', '.join(DISK_CHOICES)
)
parser.add_argument(
"--min-disk",
@ -650,8 +653,9 @@ class SetImage(command.Command):
parser.add_argument(
"--disk-format",
metavar="<disk-format>",
help=_("Image disk format "
"(default: %s)") % DEFAULT_DISK_FORMAT,
choices=DISK_CHOICES,
help=_("Image disk format. The supported options are: %s") %
', '.join(DISK_CHOICES)
)
protected_group = parser.add_mutually_exclusive_group()
protected_group.add_argument(

View File

@ -116,7 +116,7 @@ class TestImageCreate(TestImage):
self.images_mock.configure_mock(**mock_exception)
arglist = [
'--container-format', 'ovf',
'--disk-format', 'fs',
'--disk-format', 'ami',
'--min-disk', '10',
'--min-ram', '4',
'--protected',
@ -126,7 +126,7 @@ class TestImageCreate(TestImage):
]
verifylist = [
('container_format', 'ovf'),
('disk_format', 'fs'),
('disk_format', 'ami'),
('min_disk', 10),
('min_ram', 4),
('protected', True),
@ -147,7 +147,7 @@ class TestImageCreate(TestImage):
self.images_mock.create.assert_called_with(
name=self.new_image.name,
container_format='ovf',
disk_format='fs',
disk_format='ami',
min_disk=10,
min_ram=4,
protected=True,

View File

@ -130,7 +130,7 @@ class TestImageCreate(TestImage):
self.images_mock.configure_mock(**mock_exception)
arglist = [
'--container-format', 'ovf',
'--disk-format', 'fs',
'--disk-format', 'ami',
'--min-disk', '10',
'--min-ram', '4',
('--protected'
@ -143,7 +143,7 @@ class TestImageCreate(TestImage):
]
verifylist = [
('container_format', 'ovf'),
('disk_format', 'fs'),
('disk_format', 'ami'),
('min_disk', 10),
('min_ram', 4),
('protected', self.new_image.protected),
@ -165,7 +165,7 @@ class TestImageCreate(TestImage):
self.images_mock.create.assert_called_with(
name=self.new_image.name,
container_format='ovf',
disk_format='fs',
disk_format='ami',
min_disk=10,
min_ram=4,
owner=self.project.id,
@ -193,7 +193,7 @@ class TestImageCreate(TestImage):
arglist = [
'--container-format', 'ovf',
'--disk-format', 'fs',
'--disk-format', 'ami',
'--min-disk', '10',
'--min-ram', '4',
'--owner', 'unexist_owner',
@ -203,7 +203,7 @@ class TestImageCreate(TestImage):
]
verifylist = [
('container_format', 'ovf'),
('disk_format', 'fs'),
('disk_format', 'ami'),
('min_disk', 10),
('min_ram', 4),
('owner', 'unexist_owner'),
@ -227,7 +227,7 @@ class TestImageCreate(TestImage):
arglist = [
'--container-format', 'ovf',
'--disk-format', 'fs',
'--disk-format', 'ami',
'--min-disk', '10',
'--min-ram', '4',
'--protected',
@ -237,7 +237,7 @@ class TestImageCreate(TestImage):
]
verifylist = [
('container_format', 'ovf'),
('disk_format', 'fs'),
('disk_format', 'ami'),
('min_disk', 10),
('min_ram', 4),
('protected', True),