Commit b96a124a by Bach Dániel

vm: remove Instance.change_password

parent 4075d7a1
......@@ -100,7 +100,7 @@
<dd style="font-size: 10px; text-align: right; padding-top: 8px;">
<div id="vm-details-pw-reset">
{% with op=op.password_reset %}{% if op %}
<a href="{{op.get_url}}" class="operation btn btn-default btn-xs" {% if op.disabled %}disabled{% endif %}>{% trans "Generate new password!" %}</a>
<a href="{{op.get_url}}" class="btn btn-default btn-xs" {% if op.disabled %}disabled{% endif %}>{% trans "Generate new password!" %}</a>
{% endif %}{% endwith %}
......@@ -13,6 +13,7 @@ from .instance import InstanceTemplate
from .instance import Instance
from .instance import post_state_changed
from .instance import pre_state_changed
from .instance import pwgen
from .network import InterfaceTemplate
from .network import Interface
from .node import Node
......@@ -22,5 +23,5 @@ __all__ = [
'NamedBaseResourceConfig', 'VirtualMachineDescModel', 'InstanceTemplate',
'Instance', 'instance_activity', 'post_state_changed', 'pre_state_changed',
'InterfaceTemplate', 'Interface', 'Trait', 'Node', 'NodeActivity', 'Lease',
'node_activity', 'pwgen'
......@@ -43,7 +43,7 @@ from taggit.managers import TaggableManager
from acl.models import AclBase
from common.models import create_readable
from common.operations import OperatedMixin
from ..tasks import vm_tasks, agent_tasks
from ..tasks import vm_tasks
from .activity import (ActivityInProgressError, instance_activity,
from .common import BaseResourceConfigModel, Lease
......@@ -719,17 +719,6 @@ class Instance(AclBase, VirtualMachineDescModel, StatusModel, OperatedMixin, + lease.suspend_interval, + lease.delete_interval)
def change_password(self):
"""Generate new password for the vm
:param self: The virtual machine.
""" = pwgen()
queue = self.get_remote_queue_name("agent")
queue=queue, args=(self.vm_name,
def select_node(self):
"""Returns the node the VM should be deployed or migrated to.
......@@ -33,8 +33,9 @@ from .tasks.local_tasks import (
from .models import (
Instance, InstanceActivity, InstanceTemplate, Interface, Node,
NodeActivity, pwgen
from .tasks import agent_tasks
logger = getLogger(__name__)
......@@ -883,7 +884,11 @@ class PasswordResetOperation(InstanceOperation):
raise self.instance.WrongStateError(self.instance)
def _operation(self):
self.instance.change_password() = pwgen()
queue = self.instance.get_remote_queue_name("agent")
queue=queue, args=(self.instance.vm_name,
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment