Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fixes delete of a flavor in syspanel. Fixes bug 924110. novaclient AP…
…I is changed - purge param is removed.

Patch 2: removed duplicate line
Patch 3: removed repeated test call of the same method

Change-Id: I47a0f9c872a7e6236d9c8824c15ef776b352446d
  • Loading branch information
ttrifonov committed Feb 3, 2012
1 parent 7eb1096 commit 32b8ab6
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 8 deletions.
4 changes: 2 additions & 2 deletions horizon/horizon/api/nova.py
Expand Up @@ -217,8 +217,8 @@ def flavor_create(request, name, memory, vcpu, disk, flavor_id):
name, int(memory), int(vcpu), int(disk), flavor_id))


def flavor_delete(request, flavor_id, purge=False):
novaclient(request).flavors.delete(flavor_id, purge)
def flavor_delete(request, flavor_id):
novaclient(request).flavors.delete(flavor_id)


def flavor_get(request, flavor_id):
Expand Down
2 changes: 1 addition & 1 deletion horizon/horizon/dashboards/syspanel/flavors/tables.py
Expand Up @@ -14,7 +14,7 @@ class DeleteFlavor(tables.DeleteAction):
data_type_plural = "Flavors"

def delete(self, request, obj_id):
api.flavor_delete(request, obj_id, False)
api.flavor_delete(request, obj_id)


class CreateFlavor(tables.LinkAction):
Expand Down
6 changes: 1 addition & 5 deletions horizon/horizon/tests/api_tests/nova.py
Expand Up @@ -132,17 +132,13 @@ def test_flavor_delete(self):
novaclient = self.stub_novaclient()

novaclient.flavors = self.mox.CreateMockAnything()
novaclient.flavors.delete(FLAVOR_ID, False).AndReturn(TEST_RETURN)
novaclient.flavors.delete(FLAVOR_ID, True).AndReturn(TEST_RETURN)
novaclient.flavors.delete(FLAVOR_ID).AndReturn(TEST_RETURN)

self.mox.ReplayAll()

ret_val = api.flavor_delete(self.request, FLAVOR_ID)
self.assertIsNone(ret_val)

ret_val = api.flavor_delete(self.request, FLAVOR_ID, purge=True)
self.assertIsNone(ret_val)

def test_flavor_get(self):
FLAVOR_ID = 6

Expand Down

0 comments on commit 32b8ab6

Please sign in to comment.