Changeset 197

Timestamp:

Oct 16, 2007, 1:07:04 AM (17 years ago)

Author:

tabbott

Message:

use the new remctl interface

File:

• trunk/web/templates/main.py (modified) (5 diffs)

trunk/web/templates/main.py

@@ -218 +218 @@
     """
     if cdtype is not None:
-        remctl('web', 'vmboot', machine.name,
+        remctl('control', machine.name, 'create', 
                cdtype)
     else:
-        remctl('web', 'vmboot', machine.name)
+        remctl('control', machine.name, 'create')
 
 def registerMachine(machine):
@@ -275 +275 @@
     Gets and parses xm list --long
     """
-    value_string, err_string = remctl('list-long', machine.name, err=True)
+    value_string, err_string = remctl('control', machine.name, 'list-long', err=True)
     if 'Unknown command' in err_string:
         raise CodeError("ERROR in remctl list-long %s is not registered" % (machine.name,))
@@ -539 +539 @@
 def deleteVM(machine):
     """Delete a VM."""
-    remctl('destroy', machine.name, err=True)
+    remctl('control', machine.name, 'destroy', err=True)
     transaction = ctx.current.create_transaction()
     delete_disk_pairs = [(machine.name, d.guest_device_name) for d in machine.disks]
@@ -571 +571 @@
     if action == 'Reboot':
         if cdrom is not None:
-            remctl('reboot', machine.name, cdrom)
+            remctl('control', machine.name, 'reboot', cdrom)
         else:
-            remctl('reboot', machine.name)
+            remctl('control', machine.name, 'reboot')
     elif action == 'Power on':
         if maxMemory(user) < machine.memory:
@@ -580 +580 @@
         bootMachine(machine, cdrom)
     elif action == 'Power off':
-        remctl('destroy', machine.name)
+        remctl('control', machine.name, 'destroy')
     elif action == 'Shutdown':
-        remctl('shutdown', machine.name)
+        remctl('control', machine.name, 'shutdown')
     elif action == 'Delete VM':
         deleteVM(machine)