openstack
/
python-tripleoclient
Code Issues Proposed changes

Fix default image registry address lookup 

By using a function as the default for the registry url variables, the
function is actually executed on every invocation of openstack client
which is less than ideal.  This change moves the default registry lookup
to only occur if the option is not passed in by the user. This limits
the lookup of the local registry to only occur when the correct
openstack tripleo container iamge commands are run.

Change-Id: Iace7be9dbdcf681c5f2f25f5810aa11e9da1853c
Closes-Bug: #1863679
(cherry picked from commit 7d3f274a3c)
This commit is contained in:
Alex Schultz 2020-02-17 15:44:07 -07:00
parent eefe92ee64
commit 3818c0e37a
2 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tripleoclient/tests/v1/test_container_image.py
View File

@ -144,7 +144,7 @@ class TestContainerImagePush(TestPluginV1):
mock_task.assert_called_once_with(
image_name='namespace/foo',
pull_source='docker.io',
push_destination=parsed_args.registry_url,
push_destination='uc.ctlplane.somedomain',
append_tag=parsed_args.append_tag,
modify_role=None,
modify_vars=None,
@ -197,7 +197,7 @@ class TestContainerImagePush(TestPluginV1):
mock_task.assert_called_once_with(
image_name='containers-storage:docker.io/namespace/foo',
pull_source=None,
push_destination=parsed_args.registry_url,
push_destination='uc.ctlplane.somedomain',
append_tag=parsed_args.append_tag,
modify_role=None,
modify_vars=None,
@ -250,7 +250,7 @@ class TestContainerImagePush(TestPluginV1):
mock_task.assert_called_once_with(
image_name='containers-storage:docker.io/namespace/foo',
pull_source=None,
push_destination=parsed_args.registry_url,
push_destination='uc.ctlplane.somedomain',
append_tag=parsed_args.append_tag,
modify_role=None,
modify_vars=None,
@ -369,7 +369,7 @@ class TestContainerImagePush(TestPluginV1):
mock_task.assert_called_once_with(
image_name='namespace/foo:tag',
pull_source='docker.io',
push_destination=parsed_args.registry_url,
push_destination='127.0.0.1:8787',
append_tag=parsed_args.append_tag,
modify_role=None,
modify_vars=None,

28
tripleoclient/v1/container_image.py
View File

@ -541,7 +541,7 @@ class TripleOContainerImagePush(command.Command):
"--registry-url",
dest="registry_url",
metavar='<registry url>',
default=image_uploader.get_undercloud_registry(),
default=None,
help=_("URL of the destination registry in the form "
"<fqdn>:<port>.")
)
@ -652,9 +652,13 @@ class TripleOContainerImagePush(command.Command):
parsed_args.source_username,
parsed_args.source_password)
registry_url = parsed_args.registry_url
if not registry_url.startswith('docker://'):
registry_url = 'docker://%s' % registry_url
registry_url_arg = parsed_args.registry_url
if registry_url_arg is None:
registry_url_arg = image_uploader.get_undercloud_registry()
if not registry_url_arg.startswith('docker://'):
registry_url = 'docker://%s' % registry_url_arg
else:
registry_url = registry_url_arg
reg_url = parse.urlparse(registry_url)
uploader.authenticate(reg_url,
@ -664,7 +668,7 @@ class TripleOContainerImagePush(command.Command):
task = image_uploader.UploadTask(
image_name=image_name,
pull_source=image_source,
push_destination=parsed_args.registry_url,
push_destination=registry_url_arg,
append_tag=parsed_args.append_tag,
modify_role=None,
modify_vars=None,
@ -692,7 +696,7 @@ class TripleOContainerImageDelete(command.Command):
"--registry-url",
dest="registry_url",
metavar='<registry url>',
default=image_uploader.get_undercloud_registry(),
default=None,
help=_("URL of registry images are to be listed from in the "
"form <fqdn>:<port>.")
)
@ -735,7 +739,10 @@ class TripleOContainerImageDelete(command.Command):
lock = processlock.ProcessLock()
manager = image_uploader.ImageUploadManager(lock=lock)
uploader = manager.uploader('python')
url = uploader._image_to_url(parsed_args.registry_url)
registry_url_arg = parsed_args.registry_url
if registry_url_arg is None:
registry_url_arg = image_uploader.get_undercloud_registry()
url = uploader._image_to_url(registry_url_arg)
session = uploader.authenticate(url, parsed_args.username,
parsed_args.password)
@ -759,7 +766,7 @@ class TripleOContainerImageList(command.Lister):
"--registry-url",
dest="registry_url",
metavar='<registry url>',
default=image_uploader.get_undercloud_registry(),
default=None,
help=_("URL of registry images are to be listed from in the "
"form <fqdn>:<port>.")
)
@ -783,7 +790,10 @@ class TripleOContainerImageList(command.Lister):
lock = processlock.ProcessLock()
manager = image_uploader.ImageUploadManager(lock=lock)
uploader = manager.uploader('python')
url = uploader._image_to_url(parsed_args.registry_url)
registry_url_arg = parsed_args.registry_url
if registry_url_arg is None:
registry_url_arg = image_uploader.get_undercloud_registry()
url = uploader._image_to_url(registry_url_arg)
session = uploader.authenticate(url, parsed_args.username,
parsed_args.password)
results = uploader.list(url.geturl(), session=session)