openstack/sushy-tools
Code Issues Proposed changes

vmedia: keep the original URL in Image

Browse Source 
Image must be the URL that the user provided, not our local path.
Use ImageName for the local path instead.

Change-Id: I5c9eae02c00843b265fcaf0d041130256d65500f
This commit is contained in:
Dmitry Tantsur 2022-04-06 12:33:11 +02:00
parent 8896740bbe
commit c34ffbd402
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sushy_tools/emulator/resources/vmedia.py
View File

@ -300,10 +300,11 @@ class StaticDriver(base.DriverBase):
custom_cert_file.close()
self._logger.debug(
'Fetched image %(file)s for %(identity)s' % {
'identity': identity, 'file': local_file})
'Fetched image %(url)s for %(identity)s' % {
'identity': identity, 'url': image_url})
device_info['Image'] = local_file
device_info['Image'] = image_url
device_info['ImageName'] = local_file
device_info['Inserted'] = inserted
device_info['WriteProtected'] = write_protected
device_info['UserName'] = username or ''

21
sushy_tools/tests/unit/emulator/resources/test_vmedia.py
View File

@ -112,7 +112,8 @@ class StaticDriverTestCase(base.BaseTestCase):
mock_rename.assert_called_once_with(
'alphabet.soup', '/alphabet/soup/fish.iso')
self.assertEqual('fish.iso', device_info['Image'])
self.assertEqual('http://fish.it/red.iso', device_info['Image'])
self.assertEqual('fish.iso', device_info['ImageName'])
self.assertTrue(device_info['Inserted'])
self.assertFalse(device_info['WriteProtected'])
self.assertEqual('', device_info['UserName'])
@ -152,7 +153,8 @@ class StaticDriverTestCase(base.BaseTestCase):
mock_rename.assert_called_once_with(
'alphabet.soup', '/alphabet/soup/fish.iso')
self.assertEqual('fish.iso', device_info['Image'])
self.assertEqual('http://fish.it/red.iso', device_info['Image'])
self.assertEqual('fish.iso', device_info['ImageName'])
self.assertTrue(device_info['Inserted'])
self.assertFalse(device_info['WriteProtected'])
self.assertEqual('Admin', device_info['UserName'])
@ -190,7 +192,8 @@ class StaticDriverTestCase(base.BaseTestCase):
mock_rename.assert_called_once_with(
'alphabet.soup', '/alphabet/soup/red.iso')
self.assertEqual('red.iso', device_info['Image'])
self.assertEqual('http://fish.it/red.iso', device_info['Image'])
self.assertEqual('red.iso', device_info['ImageName'])
self.assertTrue(device_info['Inserted'])
self.assertFalse(device_info['WriteProtected'])
@ -226,7 +229,8 @@ class StaticDriverTestCase(base.BaseTestCase):
mock_rename.assert_called_once_with(
'alphabet.soup', '/alphabet/soup/boot-abc')
self.assertEqual('boot-abc', device_info['Image'])
self.assertEqual(full_url, device_info['Image'])
self.assertEqual('boot-abc', device_info['ImageName'])
self.assertTrue(device_info['Inserted'])
self.assertFalse(device_info['WriteProtected'])
@ -269,7 +273,8 @@ class StaticDriverTestCase(base.BaseTestCase):
mock_rename.assert_called_once_with(
'alphabet.soup', '/alphabet/soup/fish.iso')
self.assertEqual('fish.iso', device_info['Image'])
self.assertEqual('https://fish.it/red.iso', device_info['Image'])
self.assertEqual('fish.iso', device_info['ImageName'])
self.assertTrue(device_info['Inserted'])
self.assertFalse(device_info['WriteProtected'])
self.assertEqual(local_file, device_info['_local_file'])
@ -308,7 +313,8 @@ class StaticDriverTestCase(base.BaseTestCase):
mock_rename.assert_called_once_with(
'alphabet.soup', '/alphabet/soup/fish.iso')
self.assertEqual('fish.iso', device_info['Image'])
self.assertEqual('https://fish.it/red.iso', device_info['Image'])
self.assertEqual('fish.iso', device_info['ImageName'])
self.assertTrue(device_info['Inserted'])
self.assertFalse(device_info['WriteProtected'])
self.assertEqual(local_file, device_info['_local_file'])
@ -350,7 +356,8 @@ class StaticDriverTestCase(base.BaseTestCase):
mock_rename.assert_called_once_with(
'alphabet.soup', '/alphabet/soup/fish.iso')
self.assertEqual('fish.iso', device_info['Image'])
self.assertEqual('https://fish.it/red.iso', device_info['Image'])
self.assertEqual('fish.iso', device_info['ImageName'])
self.assertTrue(device_info['Inserted'])
self.assertFalse(device_info['WriteProtected'])
self.assertEqual(local_file, device_info['_local_file'])