diff options
| author | Zuul <zuul@review.opendev.org> | 2023-05-16 17:25:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-05-16 17:25:30 +0000 |
| commit | 8681124fcc5643f9c7d2fb4943e954fc49e49441 (patch) | |
| tree | 6603a6d321d85fca527f32a2c33fcefa01af9ee9 | |
| parent | 3fdc74b8f235165fbf10ac4b2d90e1d535d37954 (diff) | |
| parent | e2190c4feb7b237c55a5d7df49e0db340a9d342f (diff) | |
| download | python-glanceclient-master.tar.gz | |
| -rw-r--r-- | glanceclient/tests/unit/v2/test_shell_v2.py | 6 | ||||
| -rw-r--r-- | glanceclient/v2/shell.py | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/glanceclient/tests/unit/v2/test_shell_v2.py b/glanceclient/tests/unit/v2/test_shell_v2.py index 8acceae..b2a6415 100644 --- a/glanceclient/tests/unit/v2/test_shell_v2.py +++ b/glanceclient/tests/unit/v2/test_shell_v2.py @@ -2240,10 +2240,10 @@ class ShellV2Test(testtools.TestCase): def test_image_import_glance_download(self): args = self._make_args( - {'id': 'IMG-01', 'uri': None, 'remote-region': 'REGION2', - 'remote-image-id': 'IMG-02', + {'id': 'IMG-01', 'uri': None, 'remote_region': 'REGION2', + 'remote_image_id': 'IMG-02', '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, 'get') as mocked_get: with mock.patch.object(self.gc.images, diff --git a/glanceclient/v2/shell.py b/glanceclient/v2/shell.py index 93a9377..3b5b248 100644 --- a/glanceclient/v2/shell.py +++ b/glanceclient/v2/shell.py @@ -778,9 +778,9 @@ def do_image_import(gc, args): all_stores = getattr(args, "os_all_stores", None) allow_failure = getattr(args, "os_allow_failure", True) uri = getattr(args, "uri", None) - remote_region = getattr(args, "remote-region", None) - remote_image_id = getattr(args, "remote-image-id", None) - remote_service_interface = getattr(args, "remote-service-interface", None) + remote_region = getattr(args, "remote_region", None) + remote_image_id = getattr(args, "remote_image_id", None) + remote_service_interface = getattr(args, "remote_service_interface", None) if not getattr(args, 'from_create', False): if (args.store and (stores or all_stores)) or (stores and all_stores): |