openstack
/
horizon
Code Issues Proposed changes

Merge pull request #148 from cloudbuilders/fix-tenant-update 

Fix tenant update
This commit is contained in:
Devin Carlen 2011-10-01 15:11:44 -07:00
parent a2dc7c8057 1da58e6a00
commit a801ae67dc
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
django-openstack/django_openstack/api.py
View File

@ -599,8 +599,8 @@ def token_list_tenants(request, token):
return [Tenant(t) for t in auth_api().tenants.for_token(token)]
def tenant_create(request, name, description, enabled):
return Tenant(account_api(request).tenants.create(name,
def tenant_create(request, tenant_name, description, enabled):
return Tenant(account_api(request).tenants.create(tenant_name,
description,
enabled))
@ -628,8 +628,9 @@ def users_list_for_token_and_tenant(request, token, tenant):
return [User(u) for u in admin_account.users.get_for_tenant(tenant)]
def tenant_update(request, tenant_id, description, enabled):
def tenant_update(request, tenant_id, tenant_name, description, enabled):
return Tenant(account_api(request).tenants.update(tenant_id,
tenant_name,
description,
enabled))

9
django-openstack/django_openstack/tests/api_tests.py
View File

@ -48,6 +48,7 @@ TEST_PORT = 8000
TEST_RETURN = 'retValue'
TEST_TENANT_DESCRIPTION = 'tenantDescription'
TEST_TENANT_ID = '1234'
TEST_TENANT_NAME = 'foo'
TEST_TOKEN = 'aToken'
TEST_TOKEN_ID = 'userId'
TEST_URL = 'http://%s:%s/something/v1.0' % (TEST_HOSTNAME, TEST_PORT)
@ -417,13 +418,13 @@ class AccountApiTests(test.TestCase):
account_api = self.stub_account_api()
account_api.tenants = self.mox.CreateMockAnything()
account_api.tenants.update(TEST_TENANT_ID, DESCRIPTION,
ENABLED).AndReturn(TEST_RETURN)
account_api.tenants.update(TEST_TENANT_ID, TEST_TENANT_NAME,
DESCRIPTION, ENABLED).AndReturn(TEST_RETURN)
self.mox.ReplayAll()
ret_val = api.tenant_update(self.request, TEST_TENANT_ID,
DESCRIPTION, ENABLED)
ret_val = api.tenant_update(self.request, TEST_TENANT_ID,
TEST_TENANT_NAME, DESCRIPTION, ENABLED)
self.assertIsInstance(ret_val, api.Tenant)
self.assertEqual(ret_val._apiresource, TEST_RETURN)