Changeset 1613 for trunk/packages

Timestamp:

Nov 11, 2008, 3:50:13 AM (16 years ago)

Author:

broder

Message:

Move the remctl code into invirt.remctl

Location:

trunk/packages

Files:

• invirt-base/debian/changelog (modified) (1 diff)
• invirt-base/python/invirt/remctl.py (added)
• invirt-web/code/controls.py (modified) (3 diffs)
• invirt-web/code/main.py (modified) (1 diff)

trunk/packages/invirt-base/debian/changelog

@@ -2 +2 @@
 
   * Move useful Python exceptions into invirt.common
-
- -- Evan Broder <broder@mit.edu>  Tue, 11 Nov 2008 00:32:19 -0500
+  * Move the remctl code out of the website and into invirt-base
+
+ -- Evan Broder <broder@mit.edu>  Tue, 11 Nov 2008 01:14:42 -0500
 
 invirt-base (0.0.8) unstable; urgency=low

trunk/packages/invirt-web/code/controls.py

@@ -1 @@
-"""
-Functions to perform remctls.
-"""
-
 import validation
 from invirt.common import CodeError, InvalidInput
 import random
-import subprocess
 import sys
 import time
@@ -15 +10 @@
 from invirt.config import structs as config
 from invirt.database import Machine, Disk, Type, NIC, CDROM, session, meta
+from invirt.remctl import remctl
 
 # ... and stolen from xend/uuid.py
@@ -27 +23 @@
                      "%02x" * 6]) % tuple(u)
 # end stolen code
-
-def kinit():
-    """Kinit with a given username and keytab"""
-    p = subprocess.Popen(['kinit', "-k", "-t", '/etc/invirt/keytab',
-                          'daemon/'+config.web.hostname],
-                         stderr=subprocess.PIPE)
-    e = p.wait()
-    if e:
-        raise CodeError("Error %s in kinit: %s" % (e, p.stderr.read()))
-
-def checkKinit():
-    """If we lack tickets, kinit."""
-    p = subprocess.Popen(['klist', '-s'])
-    if p.wait():
-        kinit()
-
-def remctl(*args, **kws):
-    """Perform a remctl and return the output.
-
-    kinits if necessary, and outputs errors to stderr.
-    """
-    checkKinit()
-    p = subprocess.Popen(['remctl', config.remote.hostname]
-                         + list(args),
-                         stdout=subprocess.PIPE,
-                         stderr=subprocess.PIPE)
-    v = p.wait()
-    if kws.get('err'):
-        return p.stdout.read(), p.stderr.read()
-    if v:
-        print >> sys.stderr, 'Error', v, 'on remctl', args, ':'
-        print >> sys.stderr, p.stderr.read()
-        raise CodeError('ERROR on remctl')
-    return p.stdout.read()
 
 def lvcreate(machine, disk):

trunk/packages/invirt-web/code/main.py

@@ -44 +44 @@
 from invirt.config import structs as config
 from invirt.common import InvalidInput, CodeError
+from invirt.remctl import remctl
 
 def pathSplit(path):