Changeset 03b9b14

Timestamp:

Dec 5, 2008 2:38:46 PM (16 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-1.30, version-2.00, version-3.01, version-3.02

Children:

7ca25b3

Parents:

02786fc

Message:

2 changes:

Pass an interface parameter to fed-tun.pl to use different interfaces on the
differnet testbeds. This needs to be replaced with a node_attribute-based
solution.

Open /dev/null for writing when redirecting to it.

Location:

fedd/federation

Files:

• allocate_project.py (modified) (2 diffs)
• experiment_control.py (modified) (9 diffs)

fedd/federation/allocate_project.py

@@ -193 +193 @@
         a service exception.
         """
+        try:
+            dnull = open("/dev/null", "w")
+        except IOError:
+            self.log.warn("[run_cmd]: failed to open /dev/null for redirect")
+            dnull = None
+
         self.log.debug("[%s]: %s" % (log_prefix, ' '.join(cmd)))
         if not self.debug:
             try:
-                return subprocess.call(cmd)
+                return subprocess.call(cmd, stdout=dnull, stderr=dnull)
             except OSError, e:
                 raise service_error(service_error.internal,
@@ -626 +632 @@
         nodes = [ ]
 
-        print req
-
         try:
             if req['ReleaseProjectRequestBody']['project'].has_key('name'):

fedd/federation/experiment_control.py

@@ -438 +438 @@
 
         try:
-            dnull = open("/dev/null", "r")
+            dnull = open("/dev/null", "w")
         except IOError:
             self.log.debug("[ssh_file]: failed to open /dev/null for redirect")
@@ -445 +445 @@
         self.log.debug("[scp_file]: %s" % " ".join(scp_cmd))
         if not self.debug:
-            if dnull: rv = call(scp_cmd, stdout=dnull, stderr=dnull)
-            else: rv = call(scp_cmd)
+            rv = call(scp_cmd, stdout=dnull, stderr=dnull)
 
         return rv == 0
@@ -680 +679 @@
         """
         user = tbparams[tb]['user']
-        host = tbparams[tb]['host']
+        host = "%s%s" % (tbparams[tb]['host'], tbparams[tb]['domain'])
         pid = tbparams[tb]['project']
 
@@ -881 +880 @@
         """
 
+        # XXX This is needless complexity.  It must vanish.
         translate_attr = {
             'slavenodestartcmd': 'expstart',
@@ -889 +889 @@
             'connectortype': 'gwtype',
             'tunnelcfg': 'tun',
+            'tunnelinterface': 'tunnelinterface',
             'smbshare': 'smbshare',
         }
@@ -1219 +1220 @@
             seer_control = "%s%s" % \
                     (tbparams[gw].get('control', "control"), sdomain)
+            tunnel_iface = tbparams[gw].get("tunnelinterface", None)
 
             if self.fedkit:
@@ -1252 +1254 @@
             print >>gwconfig, "Active: %s" % active
             print >>gwconfig, "TunnelCfg: %s" % tunnel_cfg
+            if tunnel_iface:
+                print >>gwconfig, "Interface: %s" % tunnel_iface
             print >>gwconfig, "BossName: %s" % boss
             print >>gwconfig, "FsName: %s" % fs
@@ -1727 +1731 @@
                 for tb in succeeded:
                     self.stop_segment(tb, eid, tbparams)
+                # release the allocations
+                for tb in tbparams.keys():
+                    self.release_access(tb, tbparams[tb]['aid'])
                 # Remove the placeholder
                 self.state_lock.acquire()
@@ -1992 +1999 @@
 
                     domain = fed['emulab']['domain']
-                    host  = "%s%s" % (fed['emulab']['ops'], domain)
+                    host  = fed['emulab']['ops']
                     aid = fed['allocID']
                 except KeyError, e: