Changeset 181aeb4 for fedd

Timestamp:

Jun 23, 2010 11:22:49 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

7888aee

Parents:

1b6cc95

Message:

Initial direct emulab manipulations

Location:

fedd/federation

Files:

• emulab_access.py (modified) (3 diffs)
• emulab_segment.py (added)
• local_emulab_segment.py (modified) (5 diffs)
• proxy_emulab_segment.py (modified) (2 diffs)

fedd/federation/emulab_access.py

@@ -72 +72 @@
         self.ssh_pubkey_file = config.get("access","ssh_pubkey_file")
         self.ssh_port = config.get("access","ssh_port") or "22"
+        self.boss = config.get("access", "boss")
+        self.xmlrpc_cert = config.get("access", "xmlrpc_cert")
+        self.xmlrpc_certpw = config.get("access", "xmlrpc_certpw")
 
         self.dragon_endpoint = config.get("access", "dragon")
@@ -1037 +1040 @@
 
             starter = self.start_segment(keyfile=self.ssh_privkey_file, 
-                    debug=self.create_debug, log=alloc_log)
+                    debug=self.create_debug, log=alloc_log, boss=self.boss,
+                    cert=self.xmlrpc_cert)
             rv = starter(self, ename, proj, user, expfile, tmpdir)
         except service_error, e:
@@ -1094 +1098 @@
                     "Can't find experiment name for %s" % aid)
         stopper = self.stop_segment(keyfile=self.ssh_privkey_file,
-                debug=self.create_debug)
+                debug=self.create_debug, boss=self.boss, cert=self.xmlrpc_cert)
         stopper(self, user, proj, ename)
         return { 'allocID': req['allocID'] }

fedd/federation/local_emulab_segment.py

@@ -13 +13 @@
 
 from local_segment import local_segment
+from federation.emulab_segment import emulab_segment
 
-class start_segment(local_segment):
-    def __init__(self, log=None, keyfile=None, debug=False):
+
+class start_segment(local_segment, emulab_segment):
+    def __init__(self, log=None, keyfile=None, debug=False, boss=None,
+            cert=None):
         local_segment.__init__(self, log=log, keyfile=keyfile, debug=debug)
-        self.null = """
-set ns [new Simulator]
-source tb_compat.tcl
-
-set a [$ns node]
-
-$ns rtproto Session
-$ns run 
-"""
+        emulab_segment.__init__(self, boss=boss, cert=cert)
         self.node = { }
-
-    def get_state(self, pid, eid):
-        """
-        Return the state of the experiment as reported by emulab
-        """
-        # command to test experiment state
-        expinfo_exec = "/usr/testbed/bin/expinfo"  
-        # Regular expressions to parse the expinfo response
-        state_re = re.compile("State:\s+(\w+)")
-        no_exp_re = re.compile("^No\s+such\s+experiment")
-        swapping_re = re.compile("^No\s+information\s+available.")
-        state = None    # Experiment state parsed from expinfo
-        # The expinfo ssh command.  Note the identity restriction to use
-        # only the identity provided in the pubkey given.
-        cmd = [ expinfo_exec, pid, eid]
-
-        dev_null = None
-        try:
-            dev_null = open("/dev/null", "a")
-        except EnvironmentError, e:
-            self.log.error("[get_state]: can't open /dev/null: %s" %e)
-
-        if self.debug:
-            state = 'swapped'
-            rv = 0
-        else:
-            self.log.debug("Checking state")
-            status = subprocess.Popen(cmd, stdout=subprocess.PIPE,
-                    stderr=dev_null, close_fds=True)
-            for line in status.stdout:
-                m = state_re.match(line)
-                if m: state = m.group(1)
-                else:
-                    for reg, st in ((no_exp_re, "none"),
-                            (swapping_re, "swapping")):
-                        m = reg.match(line)
-                        if m: state = st
-            rv = status.wait()
-
-        # If the experiment is not present the subcommand returns a
-        # non-zero return value.  If we successfully parsed a "none"
-        # outcome, ignore the return code.
-        if rv != 0 and state != 'none':
-            raise service_error(service_error.internal,
-                    "Cannot get status of segment:%s/%s" % (pid, eid))
-        elif state not in ('active', 'swapped', 'swapping', 'none'):
-            raise service_error(service_error.internal,
-                    "Cannot get status of segment:%s/%s" % (pid, eid))
-        else:
-            self.log.debug("State is %s" % state)
-            return state
-
-    def get_mapping(self, pid, eid):
-        """
-        Get the physical to virtual mapping from the expinfo command and save
-        it in the self.map member.
-        """
-        # command to test experiment state
-        expinfo_exec = "/usr/testbed/bin/expinfo"  
-        # The expinfo command. 
-        cmd = [ expinfo_exec, '-m', pid, eid]
-
-        dev_null = None
-        try:
-            dev_null = open("/dev/null", "a")
-        except EnvironmentError, e:
-            self.log.error("[get_state]: can't open /dev/null: %s" %e)
-
-        if self.debug:
-            rv = 0
-        else:
-            self.log.debug("Getting mapping for %s %s" % (pid, eid))
-            phys_start = re.compile('^Physical\s+Node\s+Mapping')
-            phys_line = re.compile('(\S+)(\s+\S+)*\s+(\S+)')
-            phys_end = re.compile('^$')
-            status = subprocess.Popen(cmd, stdout=subprocess.PIPE,
-                    stderr=dev_null, close_fds=True)
-
-            # Parse the info output.  Format:
-            #
-            # stuff
-            # Physical Node Mapping:
-            # ID              Type         OS              Physical    
-            # --------------- ------------ --------------- ------------
-            # virtual         dummy        dummy           physical
-            #
-            foundit = False
-            skip = 0
-            for line in status.stdout:
-                if phys_start.match(line):
-                    skip = 2
-                    foundit = True
-                elif not foundit:
-                    continue
-                elif skip > 0:
-                    skip -= 1
-                elif phys_end.match(line):
-                    break
-                else:
-                    m = phys_line.match(line.strip())
-                    if m: self.node[m.group(1)] = m.group(3)
-                    else: self.log.warn(
-                            "Matching failed while parsing node mapping: " +\
-                                    "line %s" % line)
-            rv = status.wait()
-
-        # If the experiment is not present the subcommand returns a
-        # non-zero return value.  If we successfully parsed a "none"
-        # outcome, ignore the return code.
-        if rv != 0 :
-            raise service_error(service_error.internal,
-                    "Cannot get node mapping of segment:%s/%s" % (pid, eid))
-        else:
-            return True
-
-    def make_null_experiment(self, pid, eid, tmpdir):
-        """
-        Create a null copy of the experiment so that we capture any logs there
-        if the modify fails.  Emulab software discards the logs from a failed
-        startexp.
-        """
-        try:
-            f = open("%s/null.tcl" % tmpdir, "w")
-            print >>f, self.null
-            f.close()
-        except EnvironmentError, e:
-            raise service_error(service_error.internal,
-                    "Cannot stage null.tcl: %s" % e.strerror)
-
-        timedout = False
-        try:
-            if not self.cmd_with_timeout(
-                    ("/usr/testbed/bin/startexp -i -f -w -p %s " + 
-                    "-e %s %s/null.tcl") % (pid, eid, tmpdir), "startexp",
-                    timeout=60 * 10):
-                return False
-        except self.cmd_timeout:
-            timedout = True
-
-        if timedout:
-            state = self.get_state(pid, eid)
-            return state == "swapped"
-        else:
-            return True
 
     def set_up_experiment_filespace(self, pid, eid, tmpdir):
@@ -207 +58 @@
         return True
 
-    def swap_in(self, pid, eid):
-        """
-        Swap experiment in.  This includes code to cope with the experiment
-        swaping command timing out, but the experiment being swapped in
-        successfully.
-        """
-        self.log.info("[start_segment]: Swapping %s" % eid)
-        timedout = False
-        try:
-            if not self.cmd_with_timeout(
-                    "/usr/testbed/bin/swapexp -w %s %s in" % (pid, eid),
-                    "swapexp", timeout=25*60):
-                return False
-        except self.cmd_timeout:
-            timedout = True
-       
-        # If the command was terminated, but completed successfully,
-        # report success.
-        if timedout:
-            self.log.debug("[start_segment]: swapin timed out " +\
-                    "checking state")
-            state = self.get_state(pid, eid)
-            self.log.debug("[start_segment]: state is %s" % state)
-            return state == 'active'
-        else:
-            return True
-
     def __call__(self, parent, eid, pid, user, tclfile, tmpdir, timeout=0):
         """
@@ -251 +75 @@
         if not self.set_up_experiment_filespace(pid, eid, tmpdir):
             return False
+
+        # Put the file into a string to pass to emulab.
+        try:
+            tcl = "".join([ l for l in open(tclfile,"r")])
+        except EnvironmentError, e:
+            self.log.error("Can't read %s: %s" % (tclfile, e))
+            return False
         
         # Stage the new configuration (active experiments will stay swapped
         # in now)
-        self.log.info("[start_segment]: Modifying %s" % eid)
-        try:
-            if not self.cmd_with_timeout(
-                    "/usr/testbed/bin/modexp -r -s -w %s %s %s" % \
-                            (pid, eid, tclfile),
-                    "modexp", timeout= 60 * 10):
-                return False
-        except self.cmd_timeout:
-            self.log.error("Modify command failed to complete in time")
-            # There's really no way to see if this succeeded or failed, so
-            # if it hangs, assume the worst.
+        if not self.modify_exp(pid, eid, tcl):
+            self.log.error("modify failed")
             return False
         # Active experiments are still swapped, this swaps the others in.
         if state != 'active':
-            if not self.swap_in(pid, eid):
+            if not self.swap_exp(pid, eid, 'in'):
                 return False
         # Everything has gone OK.
@@ -274 +96 @@
         return True
 
-class stop_segment(local_segment):
-    def __init__(self, log=None, keyfile=None, debug=False):
+class stop_segment(local_segment, emulab_segment):
+    def __init__(self, log=None, keyfile=None, debug=False, boss=None, 
+            cert=None):
         local_segment.__init__(self, log=log, keyfile=keyfile, debug=debug)
+        emulab_segment.__init__(self, boss=boss, cert=cert)
 
     def __call__(self, parent, user, pid, eid):
@@ -287 +111 @@
             # Clean out tar files: we've gone over quota in the past
             self.cmd_with_timeout("rm -rf /proj/%s/software/%s" % (pid, eid))
-            rv = self.cmd_with_timeout(
-                    "/usr/testbed/bin/swapexp -w %s %s out" % (pid, eid), 
-                    timeout = 60*10)
+            rv = self.swap_exp(pid, eid, 'out')
         except self.cmd_timeout:
             rv = False

fedd/federation/proxy_emulab_segment.py

@@ -21 +21 @@
     """
 
-    def __init__(self, log=None, keyfile=None, debug=False):
+    def __init__(self, log=None, keyfile=None, debug=False, boss=None, 
+            cert=None):
         proxy_segment.__init__(self, log=log, keyfile=keyfile, debug=debug)
         self.null = """
@@ -321 +322 @@
 
 class stop_segment(proxy_segment):
-    def __init__(self, log=None, keyfile=None, debug=False):
+    def __init__(self, log=None, keyfile=None, debug=False, boss=None, cert=None):
         proxy_segment.__init__(self, log=log, keyfile=keyfile, debug=debug)