mravi/uncloud-mravi
1
0
Fork 0
forked from uncloud/uncloud
Code Issues Pull requests Projects Releases Wiki Activity

Fixed issues in opennebula/views.py + syncvm now behaves correctly and print users which are not in ldap as per their email address

Browse source
This commit is contained in:
ahmadbilalkhalid 2020-02-25 11:50:49 +05:00
commit a72bc142a6
3 changed files with 43 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

54
uncloud/opennebula/management/commands/syncvm.py
View file

@ -1,15 +1,22 @@
import os
import json
import uncloud.secrets as secrets
from xmlrpc.client import ServerProxy as RPCClient
from django.core.management.base import BaseCommand
from django.contrib.auth import get_user_model
from xmlrpc.client import ServerProxy as RPCClient
from xmltodict import parse
from ungleich_common.ldap.ldap_manager import LdapManager
from opennebula.models import VM as VMModel
import uncloud.secrets
def find_user_based_on_email(users, email):
for user in users:
if email in user.mail.values:
return user
class Command(BaseCommand):
@ -19,30 +26,39 @@ class Command(BaseCommand):
pass
def handle(self, *args, **options):
with RPCClient(uncloud.secrets.OPENNEBULA_URL) as rpc_client:
ldap_server_uri = secrets.LDAP_SERVER_URI.split(',')[0]
ldap_manager = LdapManager(
server=ldap_server_uri,
admin_dn=secrets.LDAP_ADMIN_DN,
admin_password=secrets.LDAP_ADMIN_PASSWORD,
)
users = ldap_manager.get('') # Get all users
with RPCClient(secrets.OPENNEBULA_URL) as rpc_client:
success, response, *_ = rpc_client.one.vmpool.infoextended(
uncloud.secrets.OPENNEBULA_USER_PASS, -2, -1, -1, -1
secrets.OPENNEBULA_USER_PASS, -2, -1, -1, -1
)
if success:
vms = json.loads(json.dumps(parse(response)))['VM_POOL']['VM']
unknown_user_with_email = set()
for i, vm in enumerate(vms):
for vm in vms:
vm_id = vm['ID']
vm_owner_email = vm['UNAME']
try:
user = get_user_model().objects.get(email=vm_owner_email)
except get_user_model().DoesNotExist:
user = find_user_based_on_email(users, vm_owner_email)
if not user:
unknown_user_with_email.add(vm_owner_email)
continue
# user = get_user_model().objects.create_user(username=vm_owner)
else:
try:
user_in_db = get_user_model().objects.get(email=vm_owner_email)
except get_user_model().DoesNotExist:
user_in_db = get_user_model().objects.create_user(username=user.uid, email=vm_owner_email)
VMModel.objects.update_or_create(
defaults= { 'data': vm,
'owner': user },
vmid=vm_id
)
print('User with email but no username:', unknown_user_with_email)
VMModel.objects.update_or_create(
defaults={'data': vm, 'owner': user_in_db}, vmid=vm_id
)
print('User with email but not found in ldap:', unknown_user_with_email)
else:
print(response)
print(uncloud.secrets.OPENNEBULA_USER_PASS)
print(secrets.OPENNEBULA_USER_PASS)