nova.virt.block_device.get_swap should have better safeguards

[Nikola Đipanov]

As per markmc's comments on https://review.openstack.org/#/c/39086/24 - the function is used to get the swap out of the list context as the block_device_info data structure (used internally by the virt drivers) needs 'swap' field to be either a single dict or none. However if passed something that is not an obvious list of swap looking things - the function will happily reutrn the passed list.

More safe and correct behaviour would be to return None (or raise).

[Sean Dague (sdague)]

nikola, is this still an issue? or have other cleanups addressed it. Please move to confirmed if still an issue or Invalid if you think it's fixed.

[Nikola Đipanov (ndipanov)]

Hmmm seems like it's not fixed yet - will post something very soon as it's a trivial fix really.

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/122440

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/122440
Committed: https://git.openstack.org/cgit/openstack/nova/commit/?id=0efbcf4e168d030907adbadd6ab7fccf766f4068
Submitter: Jenkins
Branch: master

commit 0efbcf4e168d030907adbadd6ab7fccf766f4068
Author: Ana Krivokapic <email address hidden>
Date: Thu Sep 18 16:37:46 2014 +0200

    Return None from get_swap() if input is not swap

    If a non-swap parameter is passed to get_swap(), return None,
    rather than returning the parameter itself.

    Change-Id: Icfb0eb0e4d721522160d0b7a4fd9b98c1871a10a
    Closes-bug: #1214406