Changeset 2627eb3 for fedd

Timestamp:

Dec 12, 2010 9:51:41 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master

Children:

e83f2f2

Parents:

9973d57

Message:

Fail if software not available before allocations are made.

File:

• fedd/federation/experiment_control.py (modified) (5 diffs)

fedd/federation/experiment_control.py

@@ -1375 +1375 @@
             topo[tb].make_indices()
 
+    def confirm_software(self, top):
+        """
+        Make sure that the software to be loaded in the topo is all available
+        before we begin making access requests, etc.  This is a subset of
+        wrangle_software.
+        """
+        pkgs = set([ d for i, d in self.fedkit + self.gatewaykit ])
+        pkgs.update([x.location for e in top.elements for x in e.software])
+
+        for pkg in pkgs:
+            loc = pkg
+
+            scheme, host, path = urlparse(loc)[0:3]
+            dest = os.path.basename(path)
+            if not scheme:
+                if not loc.startswith('/'):
+                    loc = "/%s" % loc
+                loc = "file://%s" %loc
+            # NB: if scheme was found, loc == pkg
+            try:
+                u = urlopen(loc)
+                u.close()
+            except Exception, e:
+                raise service_error(service_error.req, 
+                        "Cannot open %s: %s" % (loc, e))
+        return True
+
     def wrangle_software(self, expid, top, topo, tbparams):
         """
@@ -1387 +1414 @@
         softdir ="%s/%s" % ( self.repodir, linkpath)
         softmap = { }
-        # These are in a list of tuples format (each kit).  This comprehension
-        # unwraps them into a single list of tuples that initilaizes the set of
-        # tuples.
-        pkgs = set([ t for l in [self.fedkit, self.gatewaykit] \
-                for p, t in l ])
-        pkgs.update([x.location for e in top.elements \
-                for x in e.software])
+
+        # self.fedkit and self.gateway kit are lists of tuples of
+        # (install_location, download_location) this extracts the download
+        # locations.
+        pkgs = set([ d for i, d in self.fedkit + self.gatewaykit ])
+        pkgs.update([x.location for e in top.elements for x in e.software])
         try:
             os.makedirs(softdir)
@@ -1410 +1436 @@
                     loc = "/%s" % loc
                 loc = "file://%s" %loc
+            # NB: if scheme was found, loc == pkg
             try:
                 u = urlopen(loc)
@@ -1946 +1973 @@
 
             top = self.get_topology(req, tmpdir)
+            self.confirm_software(top)
             # Assign the IPs
             hosts, ip_allocator = self.allocate_ips_to_topo(top)
@@ -1964 +1992 @@
             connInfo = { }          # Connection information
 
+            self.split_topology(top, topo, testbeds)
+
             self.get_access_to_testbeds(testbeds, fid, allocated, 
                     tbparams, masters, tbmap, expid, expcert_file)
-
-            self.split_topology(top, topo, testbeds)
 
             attrs = self.generate_keys_and_hosts(tmpdir, expid, hosts, tbparams)