openstack
/
nova
Code Issues Proposed changes

Merge "Add image type capability flags and trait conversions"

This commit is contained in:
Zuul 2019-05-04 20:32:15 +00:00 committed by Gerrit Code Review
parent ffdf7956e1 b81fe4dbe4
commit aafd873e21
4 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lower-constraints.txt
View File

@ -68,7 +68,7 @@ os-brick==2.6.1
os-client-config==1.29.0
os-resource-classes==0.1.0
os-service-types==1.2.0
os-traits==0.8.0
os-traits==0.12.0
os-vif==1.14.0
os-win==3.0.0
os-xenapi==0.3.3

26
nova/virt/driver.py
View File

@ -109,7 +109,19 @@ CAPABILITY_TRAITS_MAP = {
"supports_extend_volume": os_traits.COMPUTE_VOLUME_EXTEND,
"supports_multiattach": os_traits.COMPUTE_VOLUME_MULTI_ATTACH,
# Added in os-traits 0.8.0.
"supports_trusted_certs": os_traits.COMPUTE_TRUSTED_CERTS
"supports_trusted_certs": os_traits.COMPUTE_TRUSTED_CERTS,
# Image type support flags, added in os-traits 0.12.0
"supports_image_type_aki": os_traits.COMPUTE_IMAGE_TYPE_AKI,
"supports_image_type_ami": os_traits.COMPUTE_IMAGE_TYPE_AMI,
"supports_image_type_ari": os_traits.COMPUTE_IMAGE_TYPE_ARI,
"supports_image_type_iso": os_traits.COMPUTE_IMAGE_TYPE_ISO,
"supports_image_type_qcow2": os_traits.COMPUTE_IMAGE_TYPE_QCOW2,
"supports_image_type_raw": os_traits.COMPUTE_IMAGE_TYPE_RAW,
"supports_image_type_vdi": os_traits.COMPUTE_IMAGE_TYPE_VDI,
"supports_image_type_vhd": os_traits.COMPUTE_IMAGE_TYPE_VHD,
"supports_image_type_vhdx": os_traits.COMPUTE_IMAGE_TYPE_VHDX,
"supports_image_type_vmdk": os_traits.COMPUTE_IMAGE_TYPE_VMDK,
}
@ -158,6 +170,18 @@ class ComputeDriver(object):
"supports_extend_volume": False,
"supports_multiattach": False,
"supports_trusted_certs": False,
# Image type support flags
"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": False,
"supports_image_type_vdi": False,
"supports_image_type_vhd": False,
"supports_image_type_vhdx": False,
"supports_image_type_vmdk": False,
}
# Indicates if this driver will rebalance nodes among compute service

12
nova/virt/powervm/driver.py
View File

@ -77,6 +77,18 @@ class PowerVMDriver(driver.ComputeDriver):
'supports_extend_volume': True,
'supports_multiattach': False,
'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)

2
requirements.txt
View File

@ -56,7 +56,7 @@ psutil>=3.2.2 # BSD
oslo.versionedobjects>=1.35.0 # Apache-2.0
os-brick>=2.6.1 # Apache-2.0
os-resource-classes>=0.1.0 # Apache-2.0
os-traits>=0.8.0 # Apache-2.0
os-traits>=0.12.0 # Apache-2.0
os-vif>=1.14.0 # Apache-2.0
os-win>=3.0.0 # Apache-2.0
castellan>=0.16.0 # Apache-2.0