Getting the xenapi_device_id from image_meta is not reading from the correct key

[Aditi Raveesh]

The xenapi_device_id is set on the image metadata . This is used to set the device_id on the vm record before the vm is created.
Currently, when we read the device id from the metadata we are looking at the key image_meta["xenapi_device_id"]. But the device id is set as image_meta["properties"]["xenapi_device_id"].

We need to fix where we read the device id from.

Feature review link:
https://review.openstack.org/#/c/55117/

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/57635
Committed: http://github.com/openstack/nova/commit/c515ef1de5cdd228d45df18a57aa74680d417cf5
Submitter: Jenkins
Branch: master

commit c515ef1de5cdd228d45df18a57aa74680d417cf5
Author: Aditi Raveesh <email address hidden>
Date: Thu Nov 21 15:16:27 2013 +0530

    Fix for reading the xenapi_device_id from image metadata

    The xenapi_device_id is set on the image metadata.
    This is used to set the device_id on the vm record
    before the vm is created. Currently, when we read
    the device id from the metadata we are looking at
    the key image_meta["xenapi_device_id"].
    But the device id is set as
    image_meta["properties"]["xenapi_device_id"].

    Fixes bug 1253564

    Change-Id: Ide174b50db4e440401b5e6389844e7dcfc8a1c76