Merge "Support : Images"

This commit is contained in:
Zuul 2019-10-10 07:42:59 +00:00 committed by Gerrit Code Review
commit 6ea1819963
2 changed files with 17 additions and 3 deletions

View File

@ -78,7 +78,7 @@ class TestPowerVMDriverInit(test.NoDBTestCase):
self.assertFalse(test_driver.capabilities['supports_multiattach'])
self.assertTrue(test_driver.capabilities['supports_evacuate'])
self.assertNotIn('has_imagecache', test_driver.capabilities)
self.assertEqual(8, len(test_driver.capabilities))
self.assertEqual(19, len(test_driver.capabilities))
@mock.patch('pypowervm.tasks.storage.find_vg',
new=mock.Mock(return_value=(mock.Mock(), mock.Mock())))
@ -92,7 +92,7 @@ class TestPowerVMDriverInit(test.NoDBTestCase):
test_driver._setup_disk_adapter()
# Localdisk driver has the image cache capability
self.assertTrue(test_driver.capabilities['has_imagecache'])
self.assertEqual(9, len(test_driver.capabilities))
self.assertEqual(20, len(test_driver.capabilities))
@mock.patch('nova_powervm.virt.powervm.disk.ssp.SSPDiskAdapter.'
'_fetch_cluster', new=mock.Mock())
@ -109,7 +109,7 @@ class TestPowerVMDriverInit(test.NoDBTestCase):
test_driver._setup_disk_adapter()
# SSP driver doesn't have image cache capability
self.assertFalse(test_driver.capabilities['has_imagecache'])
self.assertEqual(9, len(test_driver.capabilities))
self.assertEqual(20, len(test_driver.capabilities))
@mock.patch('nova_powervm.virt.powervm.event.PowerVMNovaEventHandler',
autospec=True)

View File

@ -102,6 +102,20 @@ class PowerVMDriver(driver.ComputeDriver):
"supports_extend_volume": True,
"supports_multiattach": False,
"supports_evacuate": True,
"supports_trusted_certs": False,
# Supported image types
"supports_image_type_aki": False,
"supports_image_type_ami": False,
"supports_image_type_ari": False,
"supports_image_type_iso": False,
"supports_image_type_qcow2": False,
"supports_image_type_raw": True,
"supports_image_type_vdi": False,
"supports_image_type_vhd": False,
"supports_image_type_vhdx": False,
"supports_image_type_vmdk": False,
}
super(PowerVMDriver, self).__init__(virtapi)