From: Tony Mack Date: Tue, 9 Apr 2013 15:28:40 +0000 (-0400) Subject: lookup site X-Git-Tag: 1.0~172 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=29bffb22c4d3bd46e12f517b2c9e2db3fa2a9a94;p=plstackapi.git lookup site --- diff --git a/plstackapi/planetstack/api/users.py b/plstackapi/planetstack/api/users.py index 13b83d8..403f079 100644 --- a/plstackapi/planetstack/api/users.py +++ b/plstackapi/planetstack/api/users.py @@ -1,17 +1,24 @@ from plstackapi.openstack.client import OpenStackClient from plstackapi.openstack.driver import OpenStackDriver from plstackapi.planetstack.api.auth import auth_check -from plstackapi.planetstack.models import User +from plstackapi.planetstack.models import User, Site def add_user(auth, fields): driver = OpenStackDriver(client = auth_check(auth)) user = User(**fields) + if 'site' in fields: + if isinstance(fields['site'], int): + sites = Site.objects.filter(id=fields['site']) + else: + sites = Site.objects.filter(login_base=fields['site']) + if sites: + user.site = sites[0] nova_fields = {'name': user.email[:self.email.find('@')], 'email': user.email, 'password': user.name, 'enabled': user.enabled} - tenant = driver.create_user(**nova_fields) + user = driver.create_user(**nova_fields) user.user_id=user.id user.save() return user