call stuff project_id instead of project

This commit is contained in:
Vishvananda Ishaya
2010-10-14 00:43:19 -07:00
parent e5fce377fb
commit defd608bd1

View File

@@ -293,10 +293,10 @@ class ProjectCommands(object):
def __init__(self): def __init__(self):
self.manager = manager.AuthManager() self.manager = manager.AuthManager()
def add(self, project, user): def add(self, project_id, user_id):
"""Adds user to project """Adds user to project
arguments: project user""" arguments: project_id user_id"""
self.manager.add_to_project(user, project) self.manager.add_to_project(user_id, project_id)
def create(self, name, project_manager, description=None): def create(self, name, project_manager, description=None):
"""Creates a new project """Creates a new project
@@ -334,18 +334,18 @@ class ProjectCommands(object):
for key, value in project_quota.iteritems(): for key, value in project_quota.iteritems():
print '%s: %s' % (key, value) print '%s: %s' % (key, value)
def remove(self, project, user): def remove(self, project_id, user_id):
"""Removes user from project """Removes user from project
arguments: project user""" arguments: project_id user_id"""
self.manager.remove_from_project(user, project) self.manager.remove_from_project(user_id, project_id)
def scrub(self, project): def scrub(self, project_id):
"""Deletes data associated with project """Deletes data associated with project
arguments: project""" arguments: project_id"""
ctxt = context.get_admin_context() ctxt = context.get_admin_context()
network_ref = db.project_get_network(ctxt, project) network_ref = db.project_get_network(ctxt, project_id)
db.network_disassociate(ctxt, network_ref['id']) db.network_disassociate(ctxt, network_ref['id'])
groups = db.security_group_get_by_project(ctxt, project) groups = db.security_group_get_by_project(ctxt, project_id)
for group in groups: for group in groups:
db.security_group_destroy(ctxt, group['id']) db.security_group_destroy(ctxt, group['id'])