CINDER retype doesn't work with the volumes with no volume-type

[Abhijeet Jain]

"cinder retype" seems to work perfectly while retyping a volume having a initial volume-type i.e. while volume is created with volume-type.
but it gets stuck at 'retyping' state while retyping a volume having a volume-type = None (for the volumes created with no volume-type)

openstack@ubuntu:~$ cinder list
+------------------------------------------------+-----------+--------+------+---------------+-----------+--------------+
| ID | Status | Name | Size | Volume Type | Bootable | Attached to |
+------------------------------------------------+-----------+--------+------+---------------+-----------+--------------+
| f508dacd-845d-4d09-b69a-6412ec93213f | available | None | 1 | None | false | |
+------------------------------------------------+-----------+--------+------+---------------+-----------+--------------+

openstack@ubuntu:~$ cinder type-list
+------------------------------------------------+---------------+
| ID | Name |
+------------------------------------------------+---------------+
| ef8ad765-cea2-4fba-9162-a10d73a6c823 | abcd |
+------------------------------------------------+---------------+

openstack@ubuntu:~$ cinder retype f508dacd-845d-4d09-b69a-6412ec93213f abcd

openstack@ubuntu:~$ cinder list
+------------------------------------------------+-----------+--------+------+---------------+-----------+--------------+
| ID | Status | Name | Size | Volume Type | Bootable | Attached to |
+------------------------------------------------+-----------+--------+------+---------------+-----------+--------------+
| f508dacd-845d-4d09-b69a-6412ec93213f | retyping | None | 1 | None | false | |
+------------------------------------------------+-----------+--------+------+---------------+-----------+--------------+

[Jay Bryant (jsbryant)]

I was able to recreate this behavior. Need to investigate further why this is happening.

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/92812
Committed: https://git.openstack.org/cgit/openstack/cinder/commit/?id=8ce85e4fd40e9def337daadfdc92aca7b064efff
Submitter: Jenkins
Branch: master

commit 8ce85e4fd40e9def337daadfdc92aca7b064efff
Author: git-harry <email address hidden>
Date: Thu May 8 12:38:41 2014 +0100

    Fix retyping volume that has volume type None

    Modified volume_types_diff to work when one volume type is None.

    Fixed _fix_encryption_specs so that the new dictionary is returned.

    Change-Id: Iaba3032317f4d0649c917fb92403c4e9146fe3e9
    Closes-Bug: #1311058

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/icehouse
Review: https://review.openstack.org/94206

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/94206
Committed: https://git.openstack.org/cgit/openstack/cinder/commit/?id=d4392f3d1a5ef4f4d7ad1ab67ed9bf42fd9eaaa5
Submitter: Jenkins
Branch: stable/icehouse

commit d4392f3d1a5ef4f4d7ad1ab67ed9bf42fd9eaaa5
Author: git-harry <email address hidden>
Date: Thu May 8 12:38:41 2014 +0100

    Fix retyping volume that has volume type None

    Modified volume_types_diff to work when one volume type is None.

    Fixed _fix_encryption_specs so that the new dictionary is returned.

    Change-Id: Iaba3032317f4d0649c917fb92403c4e9146fe3e9
    Closes-Bug: #1311058
    (cherry picked from commit 8ce85e4fd40e9def337daadfdc92aca7b064efff)