old_contents: 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, Site
   
  def lookup_site(fields):
      site = None
      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:
              site = sites[0]
      return site 
  
  def add_user(auth, fields):
      driver = OpenStackDriver(client = auth_check(auth))
      site = lookup_site(fields) 
      if site: fields['site'] = site     
      user = User(**fields)
      nova_fields = {'name': user.email[:self.email.find('@')],
                     'email': user.email, 
                     'password': user.name,
                     'enabled': user.enabled}    
      user = driver.create_user(**nova_fields)
      #driver.add_user_role(user.id, user.site.tenant_id, 'user')
      user.user_id=user.id
      user.save()
      return user
  
  def update_user(auth, id, **fields):
      driver = OpenStackDriver(client = auth_check(auth))
      users = User.objects.filter(id=id)
      if not users:
          return
  
      user = users[0]
      nova_fields = {}
      if 'email' in fields:
          nova_fields['name'] = fields['email'][:self.email.find('@')]
          nova_fields['email'] = fields['email']
      if 'password' in fields:
          nova_fields['password'] = fields['password']
      if 'enabled' in fields:
          nova_fields['enabled'] = fields['enabled']
      driver.update_user(user.user_id, **nova_fields)
      site = lookup_site(fields)
      if site: fields['site'] = site
      user.update(**fields)
      return user 
  
  def delete_user(auth, filter={}):
      driver = OpenStackDriver(client = auth_check(auth))   
      users = Users.objects.filter(**filter)
      for user in users:
          driver.delete_user(id=user.user_id) 
          user.delete()
      return 1
  
  def get_users(auth, filter={}):
      client = auth_check(auth)
      users = User.objects.filter(**filter)
      return users             
          
  
      
  
new_contents: 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, Site
   
  def lookup_site(fields):
      site = None
      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:
              site = sites[0]
      return site 
  
  def add_user(auth, fields):
      driver = OpenStackDriver(client = auth_check(auth))
      site = lookup_site(fields) 
      if site: fields['site'] = site     
      user = User(**fields)
      nova_fields = {'name': user.email[:site.email.find('@')],
                     'email': user.email, 
                     'password': user.password,
                     'enabled': user.enabled}    
      user = driver.create_user(**nova_fields)
      #driver.add_user_role(user.id, user.site.tenant_id, 'user')
      user.user_id=user.id
      user.save()
      return user
  
  def update_user(auth, id, **fields):
      driver = OpenStackDriver(client = auth_check(auth))
      users = User.objects.filter(id=id)
      if not users:
          return
  
      user = users[0]
      nova_fields = {}
      if 'email' in fields:
          nova_fields['name'] = fields['email'][:self.email.find('@')]
          nova_fields['email'] = fields['email']
      if 'password' in fields:
          nova_fields['password'] = fields['password']
      if 'enabled' in fields:
          nova_fields['enabled'] = fields['enabled']
      driver.update_user(user.user_id, **nova_fields)
      site = lookup_site(fields)
      if site: fields['site'] = site
      user.update(**fields)
      return user 
  
  def delete_user(auth, filter={}):
      driver = OpenStackDriver(client = auth_check(auth))   
      users = Users.objects.filter(**filter)
      for user in users:
          driver.delete_user(id=user.user_id) 
          user.delete()
      return 1
  
  def get_users(auth, filter={}):
      client = auth_check(auth)
      users = User.objects.filter(**filter)
      return users             
          
  
      
  
subject: fix bug