summaryrefslogtreecommitdiffstats
path: root/nova/adminclient.py
diff options
context:
space:
mode:
authorDevin Carlen <devin.carlen@gmail.com>2010-07-28 23:41:43 +0000
committerDevin Carlen <devin.carlen@gmail.com>2010-07-28 23:41:43 +0000
commitbb375bbeffb1249c653d3589acb521a25f8824c7 (patch)
tree2b038a4d1bd68d4bf44fb49431e3d2ecb6974cb7 /nova/adminclient.py
parent82345d6338fa9418551f40547694e73b660a6e37 (diff)
downloadnova-bb375bbeffb1249c653d3589acb521a25f8824c7.tar.gz
nova-bb375bbeffb1249c653d3589acb521a25f8824c7.tar.xz
nova-bb375bbeffb1249c653d3589acb521a25f8824c7.zip
pep8
Diffstat (limited to 'nova/adminclient.py')
-rw-r--r--nova/adminclient.py37
1 files changed, 15 insertions, 22 deletions
diff --git a/nova/adminclient.py b/nova/adminclient.py
index 3a2ce2f01..fceeac274 100644
--- a/nova/adminclient.py
+++ b/nova/adminclient.py
@@ -23,6 +23,7 @@ import base64
import boto
from boto.ec2.regioninfo import RegionInfo
+
class UserInfo(object):
"""
Information about a Nova user, as parsed through SAX
@@ -170,8 +171,7 @@ class NovaAdminClient(object):
region=RegionInfo(None, self.region, self.clc_ip),
port=8773,
path='/services/Cloud',
- **kwargs
- )
+ **kwargs)
def get_users(self):
""" grabs the list of all users """
@@ -215,13 +215,10 @@ class NovaAdminClient(object):
"""
Add or remove a role for a user and project.
"""
- params = {
- 'User': user,
- 'Role': role,
- 'Project': project,
- 'Operation': operation
-
- }
+ params = {'User': user,
+ 'Role': role,
+ 'Project': project,
+ 'Operation': operation}
return self.apiconn.get_status('ModifyUserRole', params)
def get_projects(self, user=None):
@@ -241,8 +238,8 @@ class NovaAdminClient(object):
Returns a single project with the specified name.
"""
project = self.apiconn.get_object('DescribeProject',
- {'Name': name},
- ProjectInfo)
+ {'Name': name},
+ ProjectInfo)
if project.projectname != None:
return project
@@ -252,12 +249,10 @@ class NovaAdminClient(object):
"""
Creates a new project.
"""
- params = {
- 'Name': projectname,
- 'ManagerUser': manager_user,
- 'Description': description,
- 'MemberUsers': member_users
- }
+ params = {'Name': projectname,
+ 'ManagerUser': manager_user,
+ 'Description': description,
+ 'MemberUsers': member_users}
return self.apiconn.get_object('RegisterProject', params, ProjectInfo)
def delete_project(self, projectname):
@@ -292,11 +287,9 @@ class NovaAdminClient(object):
"""
Adds or removes a user from a project.
"""
- params = {
- 'User': user,
- 'Project': project,
- 'Operation': operation
- }
+ params = {'User': user,
+ 'Project': project,
+ 'Operation': operation}
return self.apiconn.get_status('ModifyProjectMember', params)
def get_zip(self, username):