openstack/python-glanceclient
Code Issues Proposed changes

Merge "do_image_import: fix argument retrieval"

Browse Source
This commit is contained in:
Zuul 2023-05-16 17:25:30 +00:00 committed by Gerrit Code Review
commit 8681124fcc
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
glanceclient/tests/unit/v2/test_shell_v2.py
View File

@ -2240,10 +2240,10 @@ class ShellV2Test(testtools.TestCase):
def test_image_import_glance_download(self): def test_image_import_glance_download(self):
args = self._make_args( args = self._make_args(
{'id': 'IMG-01', 'uri': None, 'remote-region': 'REGION2', {'id': 'IMG-01', 'uri': None, 'remote_region': 'REGION2',
'remote-image-id': 'IMG-02', 'remote_image_id': 'IMG-02',
'import_method': 'glance-download', 'import_method': 'glance-download',
'remote-service-interface': 'public'}) 'remote_service_interface': 'public'})
with mock.patch.object(self.gc.images, 'image_import') as mock_import: with mock.patch.object(self.gc.images, 'image_import') as mock_import:
with mock.patch.object(self.gc.images, 'get') as mocked_get: with mock.patch.object(self.gc.images, 'get') as mocked_get:
with mock.patch.object(self.gc.images, with mock.patch.object(self.gc.images,

6
glanceclient/v2/shell.py
View File

@ -778,9 +778,9 @@ def do_image_import(gc, args):
all_stores = getattr(args, "os_all_stores", None) all_stores = getattr(args, "os_all_stores", None)
allow_failure = getattr(args, "os_allow_failure", True) allow_failure = getattr(args, "os_allow_failure", True)
uri = getattr(args, "uri", None) uri = getattr(args, "uri", None)
remote_region = getattr(args, "remote-region", None) remote_region = getattr(args, "remote_region", None)
remote_image_id = getattr(args, "remote-image-id", None) remote_image_id = getattr(args, "remote_image_id", None)
remote_service_interface = getattr(args, "remote-service-interface", None) remote_service_interface = getattr(args, "remote_service_interface", None)
if not getattr(args, 'from_create', False): if not getattr(args, 'from_create', False):
if (args.store and (stores or all_stores)) or (stores and all_stores): if (args.store and (stores or all_stores)) or (stores and all_stores):