summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--openstack_dashboard/dashboards/admin/flavors/tests.py4
-rw-r--r--openstack_dashboard/dashboards/admin/flavors/workflows.py1
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)