← Back to team overview

cloud-init-dev team mailing list archive

Re: [Merge] ~smoser/cloud-init:fix/ds-identify-smartos-is-container into cloud-init:master

 


Diff comments:

> diff --git a/tests/unittests/test_ds_identify.py b/tests/unittests/test_ds_identify.py
> index 4d8a436..e8025e7 100644
> --- a/tests/unittests/test_ds_identify.py
> +++ b/tests/unittests/test_ds_identify.py
> @@ -69,8 +69,12 @@ P_DSID_CFG = "etc/cloud/ds-identify.cfg"
>  
>  IBM_CONFIG_UUID = "9796-932E"
>  
> +MOCK_VIRT_IS_CONTAINER_OTHER = {'name': 'detect_virt',
> +                                'RET': 'container-other', 'ret': 0}
>  MOCK_VIRT_IS_KVM = {'name': 'detect_virt', 'RET': 'kvm', 'ret': 0}
>  MOCK_VIRT_IS_VMWARE = {'name': 'detect_virt', 'RET': 'vmware', 'ret': 0}
> +# currenty' SmartOS hypervisor "bhyve" is unknown by systemd-detect-virt.
> +MOCK_VIRT_IS_VM_OTHER = {'name': 'detect_virt', 'RET': 'vm-other', 'ret': 0}

Question this seems like just a documentation item in our tests because ds-identify doesn't pay attention to it when detecting SmartOS. Instead, per the unit tests ds-identify detects SmartOs bhyve  by product name "SmartDC HVM".

Should we have code changes to ds-id to only look at dmi_product name, and ignore the dmi_product_name?
Or should ds-id also match SmartOs on DI_VIRT == 'vm-other'?

>  MOCK_VIRT_IS_XEN = {'name': 'detect_virt', 'RET': 'xen', 'ret': 0}
>  MOCK_UNAME_IS_PPC64 = {'name': 'uname', 'out': UNAME_PPC64EL, 'ret': 0}
>  


-- 
https://code.launchpad.net/~smoser/cloud-init/+git/cloud-init/+merge/343738
Your team cloud-init commiters is requested to review the proposed merge of ~smoser/cloud-init:fix/ds-identify-smartos-is-container into cloud-init:master.


References