amal/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Refactor get_all_vmids -> get_all_active_vmids

Browse source 
We now get this info from opennebula
This commit is contained in:
PCoder 2019-05-11 02:23:51 +02:00
commit 7f6d4c1c53
2 changed files with 11 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

6
hosting/views.py
View file

@ -464,7 +464,7 @@ class SSHKeyDeleteView(LoginRequiredMixin, DeleteView):
keys = UserHostingKey.objects.filter(user=self.request.user)
keys_to_save = [k.public_key for k in keys if k != public_key]
manager.save_key_in_opennebula_user('\n'.join(keys_to_save))
vm_ids = manager.get_all_vmids()
vm_ids = manager.get_vms()
if len(vm_ids) > 0 and len(keys_to_save) > 0:
for vm_id in vm_ids:
manager.save_key_in_vm_template(vm_id, '\n'.join(keys_to_save))
@ -517,7 +517,7 @@ class SSHKeyChoiceView(LoginRequiredMixin, View):
password=owner.password
)
keys = get_all_public_keys(request.user)
vm_ids = manager.get_all_vmids()
vm_ids = manager.get_all_active_vmids()
manager.save_key_in_opennebula_user('\n'.join(keys))
if len(vm_ids) > 0 and len(keys) > 0:
for vm_id in vm_ids:
@ -574,7 +574,7 @@ class SSHKeyCreateView(LoginRequiredMixin, FormView):
keys = UserHostingKey.objects.filter(user=self.request.user)
keys_to_save = [k.public_key for k in keys]
manager.save_key_in_opennebula_user('\n'.join(keys_to_save))
vm_ids = manager.get_all_vmids()
vm_ids = manager.get_all_active_vmids()
if len(vm_ids) > 0 and len(keys) > 0:
for vm_id in vm_ids:
manager.save_key_in_vm_template(vm_id, '\n'.join(keys_to_save))