Changeset 05191a6 for fedd/fedd/experiment_control.py

Timestamp:

Dec 1, 2008 3:07:40 PM (15 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:

f816079

Parents:

f069052

Message:

All services use authorizer. Global authorization file, shared routine to read simple authorization files. Fixes some more partial state errors in experiment_control.

File:

• fedd/fedd/experiment_control.py (modified) (2 diffs)

fedd/fedd/experiment_control.py

@@ -1537 +1537 @@
             self.state_lock.release()
 
-        try:
-            self.generate_ssh_keys(gw_secretkey, self.ssh_type)
-        except ValueError:
-            raise service_error(service_error.server_config, 
-                    "Bad key type (%s)" % self.ssh_type)
-
-        user = req.get('user', None)
-        if user == None:
-            raise service_error(service_error.req, "No user")
-
-        master = req.get('master', None)
-        if not master:
-            raise service_error(service_error.req, "No master testbed label")
-        export_project = req.get('exportProject', None)
-        if not export_project:
-            raise service_error(service_error.req, "No export project")
-        
-        if self.splitter_url:
-            self.log.debug("Calling remote splitter at %s" % self.splitter_url)
-            split_data = self.remote_splitter(self.splitter_url, file_content,
-                    master)
-        else:
-            tclcmd = [self.tclsh, self.tcl_splitter, '-s', '-x', 
-                str(self.muxmax), '-m', master]
-
-            if self.fedkit:
-                tclcmd.append('-k')
-
-            tclcmd.extend([pid, gid, eid, tclfile])
-
-            self.log.debug("running local splitter %s", " ".join(tclcmd))
-            tclparser = Popen(tclcmd, stdout=PIPE)
-            split_data = tclparser.stdout
-
-        allocated = { }     # Testbeds we can access
-        started = { }       # Testbeds where a sub-experiment started 
-                            # successfully
-
-        # Objects to parse the splitter output (defined above)
-        parse_current_testbed = self.current_testbed(eid, tmpdir, self.fedkit)
-        parse_allbeds = self.allbeds(self.get_access)
-        parse_gateways = self.gateways(eid, master, tmpdir,
-                gw_pubkey_base, gw_secretkey_base, self.copy_file, self.fedkit)
-        parse_vtopo = self.shunt_to_string("^#\s+Begin\s+Vtopo",
-                    "^#\s+End\s+Vtopo")
-        parse_hostnames = self.shunt_to_file("^#\s+Begin\s+hostnames",
-                    "^#\s+End\s+hostnames", tmpdir + "/hosts")
-        parse_tarfiles = self.shunt_to_list("^#\s+Begin\s+tarfiles",
-                "^#\s+End\s+tarfiles")
-        parse_rpms = self.shunt_to_list("^#\s+Begin\s+rpms",
-                "^#\s+End\s+rpms")
-
         try: 
+            # This catches exceptions to clear the placeholder if necessary
+            try:
+                self.generate_ssh_keys(gw_secretkey, self.ssh_type)
+            except ValueError:
+                raise service_error(service_error.server_config, 
+                        "Bad key type (%s)" % self.ssh_type)
+
+            user = req.get('user', None)
+            if user == None:
+                raise service_error(service_error.req, "No user")
+
+            master = req.get('master', None)
+            if not master:
+                raise service_error(service_error.req,
+                        "No master testbed label")
+            export_project = req.get('exportProject', None)
+            if not export_project:
+                raise service_error(service_error.req, "No export project")
+            
+            if self.splitter_url:
+                self.log.debug("Calling remote splitter at %s" % \
+                        self.splitter_url)
+                split_data = self.remote_splitter(self.splitter_url,
+                        file_content, master)
+            else:
+                tclcmd = [self.tclsh, self.tcl_splitter, '-s', '-x', 
+                    str(self.muxmax), '-m', master]
+
+                if self.fedkit:
+                    tclcmd.append('-k')
+
+                tclcmd.extend([pid, gid, eid, tclfile])
+
+                self.log.debug("running local splitter %s", " ".join(tclcmd))
+                tclparser = Popen(tclcmd, stdout=PIPE)
+                split_data = tclparser.stdout
+
+            allocated = { }         # Testbeds we can access
+            started = { }           # Testbeds where a sub-experiment started 
+                                # successfully
+
+            # Objects to parse the splitter output (defined above)
+            parse_current_testbed = self.current_testbed(eid, tmpdir,
+                    self.fedkit)
+            parse_allbeds = self.allbeds(self.get_access)
+            parse_gateways = self.gateways(eid, master, tmpdir,
+                    gw_pubkey_base, gw_secretkey_base, self.copy_file,
+                    self.fedkit)
+            parse_vtopo = self.shunt_to_string("^#\s+Begin\s+Vtopo",
+                        "^#\s+End\s+Vtopo")
+            parse_hostnames = self.shunt_to_file("^#\s+Begin\s+hostnames",
+                        "^#\s+End\s+hostnames", tmpdir + "/hosts")
+            parse_tarfiles = self.shunt_to_list("^#\s+Begin\s+tarfiles",
+                    "^#\s+End\s+tarfiles")
+            parse_rpms = self.shunt_to_list("^#\s+Begin\s+rpms",
+                    "^#\s+End\s+rpms")
+
             # Working on the split data
             for line in split_data:
@@ -1611 +1616 @@
                     raise service_error(service_error.internal, 
                             "Bad tcl parse? %s" % line)
+            # Virtual topology and visualization
+            vtopo = self.gentopo(parse_vtopo.str)
+            if not vtopo:
+                raise service_error(service_error.internal, 
+                        "Failed to generate virtual topology")
+
+            vis = self.genviz(vtopo)
+            if not vis:
+                raise service_error(service_error.internal, 
+                        "Failed to generate visualization")
+            
+            # save federant information
+            for k in allocated.keys():
+                tbparams[k]['federant'] = {\
+                        'name': [ { 'localname' : eid} ],\
+                        'emulab': tbparams[k]['emulab'],\
+                        'allocID' : tbparams[k]['allocID'],\
+                        'master' : k == master,\
+                    }
+
+
+            # Copy tarfiles and rpms needed at remote sites into a staging area
+            try:
+                if self.fedkit:
+                    parse_tarfiles.list.append(self.fedkit)
+                for t in parse_tarfiles.list:
+                    if not os.path.exists("%s/tarfiles" % tmpdir):
+                        os.mkdir("%s/tarfiles" % tmpdir)
+                    self.copy_file(t, "%s/tarfiles/%s" % \
+                            (tmpdir, os.path.basename(t)))
+                for r in parse_rpms.list:
+                    if not os.path.exists("%s/rpms" % tmpdir):
+                        os.mkdir("%s/rpms" % tmpdir)
+                    self.copy_file(r, "%s/rpms/%s" % \
+                            (tmpdir, os.path.basename(r)))
+            except IOError, e:
+                raise service_error(service_error.internal, 
+                        "Cannot stage tarfile/rpm: %s" % e.strerror)
+
         except service_error, e:
             # If something goes wrong in the parse (usually an access error)
-            # clear the placeholder state
+            # clear the placeholder state.  From here on out the code delays
+            # exceptions.
             self.state_lock.acquire()
             del self.state[eid]
             self.state_lock.release()
             raise e
-        
-        # Virtual topology and visualization
-        vtopo = self.gentopo(parse_vtopo.str)
-        if not vtopo:
-            raise service_error(service_error.internal, 
-                    "Failed to generate virtual topology")
-
-        vis = self.genviz(vtopo)
-        if not vis:
-            raise service_error(service_error.internal, 
-                    "Failed to generate visualization")
-
-        # save federant information
-        for k in allocated.keys():
-            tbparams[k]['federant'] = {\
-                    'name': [ { 'localname' : eid} ],\
-                    'emulab': tbparams[k]['emulab'],\
-                    'allocID' : tbparams[k]['allocID'],\
-                    'master' : k == master,\
-                }
-
-
-        # Copy tarfiles and rpms needed at remote sites into a staging area
-        try:
-            if self.fedkit:
-                parse_tarfiles.list.append(self.fedkit)
-            for t in parse_tarfiles.list:
-                if not os.path.exists("%s/tarfiles" % tmpdir):
-                    os.mkdir("%s/tarfiles" % tmpdir)
-                self.copy_file(t, "%s/tarfiles/%s" % \
-                        (tmpdir, os.path.basename(t)))
-            for r in parse_rpms.list:
-                if not os.path.exists("%s/rpms" % tmpdir):
-                    os.mkdir("%s/rpms" % tmpdir)
-                self.copy_file(r, "%s/rpms/%s" % \
-                        (tmpdir, os.path.basename(r)))
-        except IOError, e:
-            raise service_error(service_error.internal, 
-                    "Cannot stage tarfile/rpm: %s" % e.strerror)
 
         thread_pool_info = self.thread_pool()