openstack
/
python-tripleoclient
Code Issues Proposed changes

Don't build image upload tasks when dry_run is True 

It seems redundant to build upload tasks when dry-run
flag is True with image push.

Change-Id: Iede9c498478c9249ce915258f2df496a52f3fc91
This commit is contained in:
Rabi Mishra 2020-08-05 12:19:31 +05:30
parent 503bc32b44
commit 094bbc657c
2 changed files with 16 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -149,7 +149,6 @@ class TestContainerImagePush(TestPluginV1):
append_tag=parsed_args.append_tag,
modify_role=None,
modify_vars=None,
dry_run=parsed_args.dry_run,
cleanup=False,
multi_arch=parsed_args.multi_arch)
@ -202,7 +201,6 @@ class TestContainerImagePush(TestPluginV1):
append_tag=parsed_args.append_tag,
modify_role=None,
modify_vars=None,
dry_run=parsed_args.dry_run,
cleanup=False,
multi_arch=parsed_args.multi_arch)
@ -255,7 +253,6 @@ class TestContainerImagePush(TestPluginV1):
append_tag=parsed_args.append_tag,
modify_role=None,
modify_vars=None,
dry_run=parsed_args.dry_run,
cleanup=False,
multi_arch=parsed_args.multi_arch)
@ -367,19 +364,9 @@ class TestContainerImagePush(TestPluginV1):
parsed_args.password)]
mock_uploader.authenticate.assert_has_calls(auth_calls)
mock_task.assert_called_once_with(
image_name='namespace/foo:tag',
pull_source='docker.io',
push_destination='127.0.0.1:8787',
append_tag=parsed_args.append_tag,
modify_role=None,
modify_vars=None,
dry_run=parsed_args.dry_run,
cleanup=True,
multi_arch=parsed_args.multi_arch)
mock_add_upload.assert_called_once_with(mock_uploadtask)
mock_run_tasks.assert_called_once()
mock_task.assert_not_called()
mock_add_upload.assert_not_called()
mock_run_tasks.assert_not_called()
class TestContainerImageDelete(TestPluginV1):

26
tripleoclient/v1/container_image.py
View File

@ -684,20 +684,20 @@ class TripleOContainerImagePush(command.Command):
session = uploader.authenticate(reg_url,
parsed_args.username,
parsed_args.password)
task = image_uploader.UploadTask(
image_name=image_name,
pull_source=image_source,
push_destination=registry_url_arg,
append_tag=parsed_args.append_tag,
modify_role=None,
modify_vars=None,
dry_run=parsed_args.dry_run,
cleanup=parsed_args.cleanup,
multi_arch=parsed_args.multi_arch)
try:
uploader.add_upload_task(task)
uploader.run_tasks()
if not parsed_args.dry_run:
task = image_uploader.UploadTask(
image_name=image_name,
pull_source=image_source,
push_destination=registry_url_arg,
append_tag=parsed_args.append_tag,
modify_role=None,
modify_vars=None,
cleanup=parsed_args.cleanup,
multi_arch=parsed_args.multi_arch)
uploader.add_upload_task(task)
uploader.run_tasks()
except OSError as e:
if e.errno == errno.EACCES:
self.log.error("Unable to upload due to permissions. "