openstack
/
python-tripleoclient
Code Issues Proposed changes

Merge "Use common defaults for image prepare CLI"

This commit is contained in:
Zuul 2017-11-24 14:20:46 +00:00 committed by Gerrit Code Review
parent 909a9f7530 9dcafd8f8f
commit a3d3987cf5
2 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tripleoclient/tests/v1/overcloud_image/test_container_image.py
View File

@ -119,15 +119,24 @@ class TestContainerImagePrepare(TestPluginV1):
verifylist = []
cift = mock.MagicMock()
cift.return_value = {}
citi = mock.MagicMock()
citi.return_value = {
'name_prefix': 'centos-binary-',
'name_suffix': '',
'namespace': 'docker.io/tripleoupstream',
'neutron_driver': None,
'tag': 'latest'
}
mock_builder.return_value.container_images_from_template = cift
mock_builder.return_value.container_images_template_inputs = citi
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
self.cmd.take_action(parsed_args)
mock_builder.assert_called_once_with([parsed_args.template_file])
cift.assert_called_once_with(
mock_builder.assert_called_with([parsed_args.template_file])
cift.assert_called_with(
filter=mock.ANY,
name_prefix='centos-binary-',
name_suffix='',
@ -204,7 +213,7 @@ class TestContainerImagePrepare(TestPluginV1):
self.cmd.take_action(parsed_args)
mock_builder.assert_called_once_with([tmpl_file])
mock_builder.assert_called_with([tmpl_file])
pmef.assert_called_once_with(['environment/docker.yaml'],
env_path_is_object=mock.ANY,
object_request=mock.ANY)
@ -296,7 +305,7 @@ class TestContainerImagePrepare(TestPluginV1):
self.cmd.take_action(parsed_args)
mock_builder.assert_called_once_with([tmpl_file])
mock_builder.assert_called_with([tmpl_file])
pmef.assert_called_once_with(pmef_call_args,
env_path_is_object=mock.ANY,
object_request=mock.ANY)

20
tripleoclient/v1/container_image.py
View File

@ -171,6 +171,10 @@ class PrepareImageFiles(command.Command):
'overcloud_containers.yaml.j2')
roles_file = os.path.join(constants.TRIPLEO_HEAT_TEMPLATES,
constants.OVERCLOUD_ROLES_FILE)
builder = kolla_builder.KollaImageBuilder([template_file])
defaults = builder.container_images_template_inputs()
parser.add_argument(
"--template-file",
dest="template_file",
@ -198,34 +202,34 @@ class PrepareImageFiles(command.Command):
parser.add_argument(
"--tag",
dest="tag",
default="latest",
default=defaults['tag'],
metavar='<tag>',
help=_("Override the default tag substitution.\n"
"Default: latest"),
"Default: %s") % defaults['tag'],
)
parser.add_argument(
"--namespace",
dest="namespace",
default="docker.io/tripleoupstream",
default=defaults['namespace'],
metavar='<namespace>',
help=_("Override the default namespace substitution.\n"
"Default: docker.io/tripleoupstream"),
"Default: %s") % defaults['namespace'],
)
parser.add_argument(
"--prefix",
dest="prefix",
default="centos-binary-",
default=defaults['name_prefix'],
metavar='<prefix>',
help=_("Override the default name prefix substitution.\n"
"Default: centos-binary-"),
"Default: %s") % defaults['name_prefix'],
)
parser.add_argument(
"--suffix",
dest="suffix",
default="",
default=defaults['name_suffix'],
metavar='<suffix>',
help=_("Override the default name suffix substitution.\n"
"Default is empty."),
"Default: %s") % defaults['name_suffix'],
)
parser.add_argument(
'--set',