diff options
| author | Nicolas Simonds <nic@metacloud.com> | 2014-02-04 15:15:29 -0800 |
|---|---|---|
| committer | Nicolas Simonds <nic@metacloud.com> | 2014-03-13 10:54:42 -0700 |
| commit | b2259b352fd1e00a269b8275afa8093223598235 (patch) | |
| tree | b7a50c3f602ddad5357895b2f115c4a811991354 | |
| parent | 8db46878909de3f836e3e35399732a6d083059e8 (diff) | |
| download | horizon-b2259b352fd1e00a269b8275afa8093223598235.tar.gz | |
Don't copy the flavorid when updating flavors
The Nova API makes the implicit assumption that flavorids are unique,
so if one creates two flavors with the same flavorid, subsequent
requests for flavor information can vary between "inaccurate" and
"wildly f*cking inaccurate"
From an end-user perspective, it makes it look like data such as
flavor access settings get lost between edits (because the API pulls
the access list from the wrong flavor)
Let the API assign a new flavorid on changes. The comments around
the handler code imply that is the desired behaviour, anyhow.
Cherry-picked from 4100a1cbc24184b58d5049dfb601b18e29e6107d
Change-Id: I5403202396a7b136b0ae8637d6aae1cf32550747
Closes-Bug: 1276371
| -rw-r--r-- | openstack_dashboard/dashboards/admin/flavors/tests.py | 4 | ||||
| -rw-r--r-- | openstack_dashboard/dashboards/admin/flavors/workflows.py | 1 |
2 files changed, 0 insertions, 5 deletions
diff --git a/openstack_dashboard/dashboards/admin/flavors/tests.py b/openstack_dashboard/dashboards/admin/flavors/tests.py index d57a714b8..573fbed8a 100644 --- a/openstack_dashboard/dashboards/admin/flavors/tests.py +++ b/openstack_dashboard/dashboards/admin/flavors/tests.py @@ -348,7 +348,6 @@ class UpdateFlavorWorkflowTests(BaseFlavorWorkflowTests): new_flavor.disk, swap=new_flavor.swap, ephemeral=eph, - flavorid=flavor.id, is_public=True).AndReturn(new_flavor) # Put mocks in replay mode @@ -418,7 +417,6 @@ class UpdateFlavorWorkflowTests(BaseFlavorWorkflowTests): new_flavor.disk, swap=new_flavor.swap, ephemeral=eph, - flavorid=flavor.id, is_public=True).AndReturn(new_flavor) api.nova.flavor_extra_set(IsA(http.HttpRequest), new_flavor.id, extra_specs) @@ -490,7 +488,6 @@ class UpdateFlavorWorkflowTests(BaseFlavorWorkflowTests): new_flavor.disk, swap=new_flavor.swap, ephemeral=eph, - flavorid=flavor.id, is_public=True)\ .AndRaise(self.exceptions.nova) @@ -566,7 +563,6 @@ class UpdateFlavorWorkflowTests(BaseFlavorWorkflowTests): new_flavor.disk, swap=new_flavor.swap, ephemeral=eph, - flavorid=flavor.id, is_public=new_flavor.is_public) \ .AndReturn(new_flavor) diff --git a/openstack_dashboard/dashboards/admin/flavors/workflows.py b/openstack_dashboard/dashboards/admin/flavors/workflows.py index 8780f20c8..3be44876d 100644 --- a/openstack_dashboard/dashboards/admin/flavors/workflows.py +++ b/openstack_dashboard/dashboards/admin/flavors/workflows.py @@ -292,7 +292,6 @@ class UpdateFlavor(workflows.Workflow): data['disk_gb'], ephemeral=data['eph_gb'], swap=data['swap_mb'], - flavorid=flavor_id, is_public=is_public) if (extras_dict): api.nova.flavor_extra_set(request, flavor.id, extras_dict) |