Changeset f3898f7 for fedd/federation

Timestamp:

Oct 5, 2011 5:11:01 PM (13 years ago)

Author:

Ted Faber <faber@…>

Branches:

compt_changes, info-ops, master

Children:

b6a6206

Parents:

53b5c18

git-author:

Ted Faber <faber@…> (10/05/11 17:10:01)

git-committer:

Ted Faber <faber@…> (10/05/11 17:11:01)

Message:

Simple support for experiments in groups. Closes #32

Location:

fedd/federation

Files:

• emulab_access.py (modified) (8 diffs)
• emulab_segment.py (modified) (2 diffs)
• local_emulab_segment.py (modified) (3 diffs)
• proxy_emulab_segment.py (modified) (6 diffs)

fedd/federation/emulab_access.py

@@ -937 +937 @@
         vchars_re = '[^' + string.ascii_letters + string.digits  + '-]'
 
+        self.state_lock.acquire()
+        if aid in self.allocation:
+            proj = self.allocation[aid].get('project', None)
+            if not proj: 
+                proj = self.allocation[aid].get('sproject', None)
+        self.state_lock.release()
+
+        if not proj:
+            raise service_error(service_error.internal, 
+                    "Can't find project for %s" %aid)
+
         for a in attrs:
             if a['attribute'] in configs:
@@ -954 +965 @@
                 ename = a['value']
 
-        # Names longer than the emulab max are discarder
-        if ename and len(ename) <= self.max_name_len:
+        # Names longer than the emulab max are discarded
+        # Projects with a group require nonce experiment names as well
+        if ename and len(ename) <= self.max_name_len and '/' not in proj:
             # Clean up the experiment name so that emulab will accept it.
             ename = re.sub(vchars_re, '-', ename)
@@ -976 +988 @@
         self.state_lock.acquire()
         if aid in self.allocation:
-            proj = self.allocation[aid].get('project', None)
-            if not proj: 
-                proj = self.allocation[aid].get('sproject', None)
             user = self.allocation[aid].get('user', None)
             self.allocation[aid]['experiment'] = ename
@@ -995 +1004 @@
             self.write_state()
         self.state_lock.release()
-
-        if not proj:
-            raise service_error(service_error.internal, 
-                    "Can't find project for %s" %aid)
 
         if not user:
@@ -1095 +1100 @@
                             certfile, tmpdir)
 
+            if '/' in proj: proj, gid = proj.split('/')
+            else: gid = None
+
+
             # Set up userconf and seer if needed
             self.configure_userconf(services, tmpdir)
@@ -1112 +1121 @@
                     debug=self.create_debug, log=alloc_log, boss=self.boss,
                     cert=self.xmlrpc_cert)
-            rv = starter(self, ename, proj, user, expfile, tmpdir)
+            rv = starter(self, ename, proj, user, expfile, tmpdir, gid=gid)
         except service_error, e:
             err = e
@@ -1164 +1173 @@
             raise service_error(service_error.internal, 
                     "Can't find project for %s" % aid)
+        else:
+            if '/' in proj: proj, gid = proj.split('/')
+            else: gid = None
 
         if not user:
@@ -1173 +1185 @@
         stopper = self.stop_segment(keyfile=self.ssh_privkey_file,
                 debug=self.create_debug, boss=self.boss, cert=self.xmlrpc_cert)
-        stopper(self, user, proj, ename)
+        stopper(self, user, proj, ename, gid)
         return { 'allocID': req['allocID'], 'proof': proof.to_dict() }

fedd/federation/emulab_segment.py

@@ -93 +93 @@
         return state
 
-    def make_null_experiment(self, pid, eid, tmpdir):
+    def make_null_experiment(self, pid, eid, tmpdir, gid=None):
         """
         Create a null copy of the experiment so that we capture any logs there
@@ -115 +115 @@
                     'wait': True
                     }
+            if gid is not None:
+                params['group'] = gid
             if self.log:
                 self.log.info("[make_null_experiment]: Creating experiment")

fedd/federation/local_emulab_segment.py

@@ -58 +58 @@
         return True
 
-    def __call__(self, parent, eid, pid, user, tclfile, tmpdir, timeout=0):
+    def __call__(self, parent, eid, pid, user, tclfile, tmpdir, timeout=0, 
+            gid=None):
         """
         Start a sub-experiment on a federant.
@@ -70 +71 @@
 
         if state == 'none':
-            if not self.make_null_experiment(pid, eid, tmpdir):
+            if not self.make_null_experiment(pid, eid, tmpdir, gid):
                 return False
 
@@ -102 +103 @@
         emulab_segment.__init__(self, boss=boss, cert=cert)
 
-    def __call__(self, parent, user, pid, eid):
+    def __call__(self, parent, user, pid, eid, gid=None):
         """
         Stop a sub experiment by calling swapexp on the federant
         """
+
         self.log.info("[stop_segment]: Stopping %s" % eid)
         rv = False

fedd/federation/proxy_emulab_segment.py

@@ -158 +158 @@
 
 
-    def make_null_experiment(self, user, host, pid, eid, tmpdir):
+    def make_null_experiment(self, user, host, pid, eid, tmpdir, gid=None):
         """
         Create a null copy of the experiment so that we capture any logs there
@@ -164 +164 @@
         startexp
         """
+
+        if gid is not None: gparam = '-g %s' % gid
+        else: gparam = ''
+
         try:
             f = open("%s/null.tcl" % tmpdir, "w")
@@ -179 +183 @@
             if not self.ssh_cmd(user, host,
                     ("/usr/testbed/bin/startexp -i -f -w -p %s " + 
-                    "-e %s null.tcl") % (pid, eid), "startexp",
+                    "-e %s %s null.tcl") % (pid, eid, gparam), "startexp",
                     timeout=60 * 10):
                 return False
@@ -276 +280 @@
 
 
-    def __call__(self, parent, eid, pid, user, tclfile, tmpdir, timeout=0):
+    def __call__(self, parent, eid, pid, user, tclfile, tmpdir, timeout=0,
+            gid=None):
         """
         Start a sub-experiment on a federant.
@@ -294 +299 @@
             # Put a dummy in place to capture logs, and establish an experiment
             # directory.
-            if not self.make_null_experiment(user, host, pid, eid, tmpdir):
+            if not self.make_null_experiment(user, host, pid, eid, tmpdir, gid):
                 return False
 
@@ -325 +330 @@
         proxy_segment.__init__(self, log=log, keyfile=keyfile, debug=debug)
 
-    def __call__(self, parent, user, pid, eid):
+    def __call__(self, parent, user, pid, eid, gid=None):
         """
         Stop a sub experiment by calling swapexp on the federant