vm: remove Instance.change_password

circle/dashboard/templates/dashboard/vm-detail.html

@@ -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 %}
           </div>
         </dd>

circle/vm/models/__init__.py

@@ -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',
+    'node_activity', 'pwgen'
 ]

circle/vm/models/instance.py

@@ -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,
                        InstanceActivity)
 from .common import BaseResourceConfigModel, Lease
@@ -719,17 +719,6 @@ class Instance(AclBase, VirtualMachineDescModel, StatusModel, OperatedMixin,
             timezone.now() + lease.suspend_interval,
             timezone.now() + lease.delete_interval)
 
-    def change_password(self):
-        """Generate new password for the vm
-
-        :param self: The virtual machine.
-        """
-        self.pw = pwgen()
-        queue = self.get_remote_queue_name("agent")
-        agent_tasks.change_password.apply_async(
-            queue=queue, args=(self.vm_name, self.pw))
-        self.save()
-
     def select_node(self):
         """Returns the node the VM should be deployed or migrated to.
         """

circle/vm/operations.py

@@ -33,8 +33,9 @@ from .tasks.local_tasks import (
 )
 from .models import (
     Instance, InstanceActivity, InstanceTemplate, Interface, Node,
-    NodeActivity,
+    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()
+        self.instance.pw = pwgen()
+        queue = self.instance.get_remote_queue_name("agent")
+        agent_tasks.change_password.apply_async(
+            queue=queue, args=(self.instance.vm_name, self.instance.pw))
+        self.instance.save()
 
 
 register_operation(PasswordResetOperation)