getting flavor by id prefers deleted flavors

[Dirk Mueller]

After changing my m1.tiny flavor from disk_gb==1 to disk_gb==0 I noticed something strange:

$ nova flavor-list
+----+-----------+-----------+------+-----------+------+-------+-------------+-----------+
| ID | Name | Memory_MB | Disk | Ephemeral | Swap | VCPUs | RXTX_Factor | Is_Public |
+----+-----------+-----------+------+-----------+------+-------+-------------+-----------+
| 1 | m1.tiny | 512 | 0 | 0 | | 1 | 1.0 | True |

Here the correct flavor is being shown. however when looking at it with details:

$ nova flavor-show 1

+----------------------------+---------+
| Property | Value |
+----------------------------+---------+
| name | m1.tiny |
| ram | 512 |
| OS-FLV-DISABLED:disabled | False |
| vcpus | 1 |
| extra_specs | {} |
| swap | |
| os-flavor-access:is_public | True |
| rxtx_factor | 1.0 |
| OS-FLV-EXT-DATA:ephemeral | 0 |
| disk | 1 |
| id | 1 |
+----------------------------+---------+

disk_gb (here shown as "disk" is shown as 1. This is because the database query simply returns .first() match, which in my case is returning the deleted instance_type.

[lizheming (lizheming-li)]

it is duplication：
https://bugs.launchpad.net/nova/+bug/1153926