Changeset 161 for trunk

Timestamp:

Oct 9, 2007, 10:08:20 PM (17 years ago)

Author:

ecprice

Message:

Add support for
(A) modifying VM names, memory, disksize
(B) transferring ownership, hostname

Has issues with multiple disks/nics because of current interface.

(tabbott is the real author here)

Location:

trunk/web/templates

Files:

• getafsgroups.py (added)
• info.tmpl (modified) (1 diff)
• main.py (modified) (5 diffs)

trunk/web/templates/info.tmpl

@@ -63 +63 @@
   <input type="hidden" name="machine_id" value="$machine.machine_id"/>
   <table>
-    <tr><td>Owner:</td><td><input type="text" name="owner", value="$machine.owner"/></td></tr>
+    <tr><td>Owner:</td><td><input type="text" name="owner", value="$machine.owner"/></td>
+        <td>NOTE: The Owner must the name of a locker that you administer</td></tr>
     <tr><td>Contact email:</td><td><input type="text" name="contact" value="$machine.contact"/></td></tr>
+    <tr><td>Machine Name:</td><td><input type="text" name="name" value="$machine.name"/></td></tr>
 #if $machine.nics
-    <tr><td>Hostname:</td><td><input type="text" name="hostname" value="$machine.nics[0].hostname"/>.servers.csail.mit.edu</td></tr>
+    <tr><td>Hostname:</td><td><input type="text" name="hostname" value="$machine.nics[0].hostname"/>.servers.csail.mit.edu</td>
+        <td>NOTE: The hostname must being with "Owner_".</td></tr>
 #end if
 #if not $on

trunk/web/templates/main.py

@@ -14 +14 @@
 import datetime
 import StringIO
+import getafsgroups
 
 sys.stderr = StringIO.StringIO()
@@ -118 +119 @@
     if user.username == 'moo':
         return True
-    return machine.owner == user.username
+    return getafsgroups.checkLockerOwner(user.username,machine.owner)
 
 def error(op, user, fields, err, emsg):
@@ -568 +569 @@
 
 def testOwner(user, owner, machine=None):
-    if owner != user.username:
+    if not getafsgroups.checkLockerOwner(user.username, owner):
         raise InvalidInput('owner', owner,
                            "Invalid")
@@ -579 +580 @@
     return contact
 
+def testDisk(user, disksize, machine=None):
+    return disksize
+
+def testName(user, name, machine=None):
+    return name
+
 def testHostname(user, hostname, machine):
     for nic in machine.nics:
         if hostname == nic.hostname:
             return hostname
+    # check if doesn't already exist
+    if NIC.select_by(hostname=hostname) == []:
+        return hostname
     raise InvalidInput('hostname', hostname,
                        "Different from before")
@@ -590 +600 @@
     """Handler for modifying attributes of a machine."""
     #XXX not written yet
-    machine = testMachineId(user, fields.getfirst('machine_id'))
-    owner = testOwner(user, fields.getfirst('owner'), machine)
-    contact = testContact(user, fields.getfirst('contact'))
-    hostname = testHostname(user, fields.getfirst('hostname'),
+
+    transaction = ctx.current.create_transaction()
+    try:
+        machine = testMachineId(user, fields.getfirst('machine_id'))
+        owner = testOwner(user, fields.getfirst('owner'), machine)
+        contact = testContact(user, fields.getfirst('contact'))
+        hostname = testHostname(owner, fields.getfirst('hostname'),
                             machine)
-    ram = fields.getfirst('memory')
-    if ram is not None:
-        ram = validMemory(user, ram, machine)
-    disk = testDisk(user, fields.getfirst('disk'))
-    if disk is not None:
-        disk = validDisk(user, disk, machine)
-
-    
+        name = testName(user, fields.getfirst('name'))
+        oldname = machine.name
+        olddisk = {}
+
+        memory = fields.getfirst('memory')
+        if memory is not None:
+            memory = validMemory(user, memory, machine)
+        if memory != machine.memory:
+            machine.memory = memory
+
+        disksize = testDisk(user, fields.getfirst('disk'))
+        if disksize is not None:
+            disksize = validDisk(user, disksize, machine)
+        
+        for disk in machine.disks:
+            disk.size = disksize
+            olddisk[disk.guest_device_name] = disk.size
+            ctx.current.save(disk)
+        
+        # XXX all NICs get same hostname on change?  Interface doesn't support more.
+        for nic in machine.nics:
+            nic.hostname = hostname
+            ctx.current.save(nic)
+
+        if owner != machine.owner:
+            machine.owner = owner
+        if name != machine.name:
+            machine.name = name
+            
+        ctx.current.save(machine)
+        transaction.commit()
+    except:
+        transaction.rollback()
+    remctl("web", "moveregister", oldname, name)
+    for disk in machine.disks:
+        # XXX all disks get the same size on change?  Interface doesn't support more.
+        if disk.size != olddisk[disk.guest_device_name]:
+            remctl("web", "lvresize", oldname, disk.guest_device_name, str(disk.size))
+        if oldname != name:
+            remctl("web", "lvrename", oldname, disk.guest_device_name, name)
+    d = dict(user=user,
+             command="modify",
+             machine=machine)
+    return Template(file="command.tmpl", searchList=[d, global_dict])    
+
 
 def help(user, fields):