Murano removes all options/parameters from the images

[Timur Nurlygayanov]

Steps To Reproduce:
1. Login to Horizon dashboard and navigate to Project > Compute > Images. Upload new image and set new parameters for this image. For example: glance image-update 6c32670a-034d-4cf7-aa85-fe10008c1a14 --property vmware_adaptertype="ide" --property vmware_disktype="sparse" --property adapter_type="lsilogic".
2. Check image parameters and verify that this image has the following attributes:
{code}
| Property 'hypervisor_type' | vmware |
| Property 'vmware_adaptertype' | lsilogic |
| Property 'vmware_disktype' | sparse |
{code}
3. Navigate to Murano > Manage > Images.
4. Click on 'Mark Image', set title, type 'Generic Linux'. Click 'Mark' button.
5. Check image attributes.

*Observed Result:*
Murano removes all properties and adds new property 'murano_image_info'. We need to save previous attributes for images, when we adds new attribute for Murano.

____________________________

[root@node-5 ~]# glance image-show 1d456643-9622-4873-abb2-4760468dc07c
/usr/lib/python2.6/site-packages/eventlet/hubs/__init__.py:8: UserWarning: Module backports was already imported from /usr/lib64/python2.6/site-packages/backports/__init__.pyc, but /usr/lib/python2.6/site-packages is being added to sys.path
  import pkg_resources
+-------------------------------+--------------------------------------+
| Property | Value |
+-------------------------------+--------------------------------------+
| Property 'hypervisor_type' | vmware |
| Property 'vmware_adaptertype' | lsilogic |
| Property 'vmware_disktype' | sparse |
| checksum | d693452d9da7f9c7b37c75afa5e76d22 |
| container_format | bare |
| created_at | 2014-10-25T17:22:45 |
| deleted | False |
| disk_format | vmdk |
| id | 1d456643-9622-4873-abb2-4760468dc07c |
| is_public | True |
| min_disk | 0 |
| min_ram | 0 |
| name | Fedora18murano |
| owner | 0eab47232a9440269f9dd0e6c231cf3e |
| protected | False |
| size | 1610612736 |
| status | active |
| updated_at | 2014-10-25T17:39:34 |
+-------------------------------+--------------------------------------+

____________________________

[root@node-5 ~]# glance image-show 1d456643-9622-4873-abb2-4760468dc07c
/usr/lib/python2.6/site-packages/eventlet/hubs/__init__.py:8: UserWarning: Module backports was already imported from /usr/lib64/python2.6/site-packages/backports/__init__.pyc, but /usr/lib/python2.6/site-packages is being added to sys.path
  import pkg_resources
+------------------------------+--------------------------------------+
| Property | Value |
+------------------------------+--------------------------------------+
| Property 'murano_image_info' | {"type": "linux", "title": "Fedora"} |
| checksum | d693452d9da7f9c7b37c75afa5e76d22 |
| container_format | bare |
| created_at | 2014-10-25T17:22:45 |
| deleted | False |
| disk_format | vmdk |
| id | 1d456643-9622-4873-abb2-4760468dc07c |
| is_public | True |
| min_disk | 0 |
| min_ram | 0 |
| name | Fedora18murano |
| owner | 0eab47232a9440269f9dd0e6c231cf3e |
| protected | False |
| size | 1610612736 |
| status | active |
| updated_at | 2014-10-25T17:41:56 |
+------------------------------+--------------------------------------+

____________________________

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/132828
Committed: https://git.openstack.org/cgit/stackforge/murano-dashboard/commit/?id=9f757225c199278ef559409d46e75138e2ea12a0
Submitter: Jenkins
Branch: master

commit 9f757225c199278ef559409d46e75138e2ea12a0
Author: Ekaterina Chernova <email address hidden>
Date: Wed Nov 5 15:53:02 2014 +0400

    Keep all image metadata during image mark up

    Before, all image metadata was lost
    after marking image with Murano data.

    Change-Id: If68c91015f4512a53f5f5b7b49355a4f62f44309
    Closes-Bug: 1385717

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/juno
Review: https://review.openstack.org/148282

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/148282
Committed: https://git.openstack.org/cgit/stackforge/murano-dashboard/commit/?id=23fb53d405f262f7e2140b35a583ee9de8908ddb
Submitter: Jenkins
Branch: stable/juno

commit 23fb53d405f262f7e2140b35a583ee9de8908ddb
Author: Ekaterina Chernova <email address hidden>
Date: Wed Nov 5 15:53:02 2014 +0400

    Keep all image metadata during image mark up

    Before, all image metadata was lost
    after marking image with Murano data.

    Change-Id: If68c91015f4512a53f5f5b7b49355a4f62f44309
    Closes-Bug: #1385717
    (cherry picked from commit 9f757225c199278ef559409d46e75138e2ea12a0)