From 1df82539201daab2ec95f6526cf54f4839652247 Mon Sep 17 00:00:00 2001 From: VedaAnnayappa Date: Tue, 23 Jul 2019 14:42:22 -0400 Subject: [PATCH] Support : Images Added image type capability flag support to be in sync with the openstack-nova Change-Id: I0d617c67e2918749225ecb8184df88dfd2a68ed2 --- nova_powervm/tests/virt/powervm/test_driver.py | 6 +++--- nova_powervm/virt/powervm/driver.py | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/nova_powervm/tests/virt/powervm/test_driver.py b/nova_powervm/tests/virt/powervm/test_driver.py index e87f993c..262df0e8 100644 --- a/nova_powervm/tests/virt/powervm/test_driver.py +++ b/nova_powervm/tests/virt/powervm/test_driver.py @@ -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) diff --git a/nova_powervm/virt/powervm/driver.py b/nova_powervm/virt/powervm/driver.py index 55e62a16..9d2a31f6 100644 --- a/nova_powervm/virt/powervm/driver.py +++ b/nova_powervm/virt/powervm/driver.py @@ -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)