From: Eric Price <ecprice@mit.edu>
Date: Wed, 10 Oct 2007 02:29:20 +0000 (-0400)
Subject: minor bugfix, and check not reusing names.
X-Git-Tag: sipb-xen-www/1~70
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/commitdiff_plain/d678a204ee408e18f71061a6437ac88db561b5c6?hp=7268d3236dc1ea69c8ff786e43ea77939c6d1a97

minor bugfix, and check not reusing names.

svn path=/trunk/web/; revision=163
---

diff --git a/templates/main.py b/templates/main.py
index 36ea239..bf40069 100755
--- a/templates/main.py
+++ b/templates/main.py
@@ -583,7 +583,10 @@ def testDisk(user, disksize, machine=None):
     return disksize
 
 def testName(user, name, machine=None):
-    return name
+    if Machine.select_by(name=name) == []:
+        return name
+    raise InvalidInput('name', name,
+                       "Already taken")
 
 def testHostname(user, hostname, machine):
     for nic in machine.nics:
@@ -640,6 +643,7 @@ def modify(user, fields):
         transaction.commit()
     except:
         transaction.rollback()
+        raise
     remctl("web", "moveregister", oldname, name)
     for disk in machine.disks:
         # XXX all disks get the same size on change?  Interface doesn't support more.