Changeset c2f92c5

Timestamp:

Aug 13, 2010 1:33:28 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

1d91791f

Parents:

8aaf8f8

Message:

The protoGENI OS version lurched forward. This code removes the hacky stuff
used to support the old version and attempts to insure that a useful OSversion
is always used - it is possible to get the old OS randomly at this time as
well.

The hacks to support an ancient OS version don't work on a modern version and
vice versa, so we moved forward to teh modern version.

fedkit updates are also required.

File:

• fedd/federation/protogeni_access.py (modified) (9 diffs)

fedd/federation/protogeni_access.py

@@ -752 +752 @@
                 stage_file(script, "%s.gw.conf" % elem.name, fed_etc_dir)
 
-            # Hackery dackery dock: the ProtoGENI python is really ancient.
-            # A modern version (though packaged for Mandrake (remember
-            # Mandrake?  good times, good times)) should be in the
-            # federation_software list, but we need to move rename is for
-            # SEER.
-            print >>script, "rm /usr/bin/python"
-            print >>script, "ln /usr/bin/python2.4 /usr/bin/python"
-            # Back to less hacky stuff
+            # Done with staging, remove the identity used to stage
+            print >>script, "#/bin/rm .ssh/id_rsa"
 
             # Start commands
@@ -815 +809 @@
         """
         # Place an identity on the node so that the copying can succeed
-        segment_commands.ssh_cmd(user, host, "scp .ssh/id_rsa %s:.ssh" % node)
+        segment_commands.scp_file( segment_commands.ssh_privkey_file,
+                user, node, ".ssh/id_rsa")
         segment_commands.ssh_cmd(user, node, 
                 "sudo /bin/sh ./%s.startup &" % node)
@@ -979 +974 @@
         return (slice_cred, sliver_cred, manifest)
 
-    def wait_for_slice(self, segment_commands, slice_cred, ctxt):
+    def wait_for_slice(self, segment_commands, slice_cred, ctxt, timeout=None):
         """
         Wait for the given slice to finish its startup.  Return the final
@@ -985 +980 @@
         """
         status = 'notready'
+        if timeout is not None:
+            end = time.time() + timeout
         try:
             while status == 'notready':
@@ -994 +991 @@
                 status = r.get('status', 'notready')
                 if status == 'notready':
+                    if timeout is not None and time.time() > end:
+                        return 'timeout'
                     time.sleep(30)
         except segment_commands.ProtoGENIError, e:
@@ -1063 +1062 @@
 
         # Now we wait for the nodes to start on PG
-        status = self.wait_for_slice(segment_commands, slice_cred, ctxt)
+        status = self.wait_for_slice(segment_commands, slice_cred, ctxt,
+                timeout=300)
         if status == 'failed':
             self.log.error('Sliver failed to start on ProtoGENI')
+            self.delete_slice(segment_commands, slice_cred, ctxt)
+            return False
+        elif status == 'timeout':
+            self.log.error('Sliver failed to start on ProtoGENI (timeout)')
             self.delete_slice(segment_commands, slice_cred, ctxt)
             return False
@@ -1093 +1097 @@
 
     def generate_rspec(self, topo, softdir, connInfo):
+
+        # Force a useful image.  Without picking this the nodes can get 
+        # different images and there is great pain.
+        def image_filter(e):
+            if isinstance(e, topdl.Computer):
+                return '<disk_image name="urn:publicid:IDN+emulab.net+' + \
+                        'image+emulab-ops//FEDORA10-STD" />'
+            else:
+                return ""
+        # Main line of generate
         t = topo.clone()
 
@@ -1130 +1144 @@
         t.incorporate_elements()
 
-        # Customize the ns2 output for local portal commands and images
-        filters = []
-
-        # NB: these are extra commands issued for the node, not the startcmds
-        if self.portal_command:
-            filters.append(topdl.generate_portal_command_filter(
-                self.portal_command))
+        # Customize the rspec output to use the image we like
+        filters = [ image_filter ]
 
         # Convert to rspec and return it
         exp_rspec = topdl.topology_to_rspec(t, filters)
+        print exp_rspec
 
         return exp_rspec
@@ -1172 +1182 @@
                 base = os.path.basename(f)
                 copy_file(f, "%s/%s" % (softdir, base))
-
-        # Ick.  Put this python rpm in a place that it will get moved into
-        # the staging area.  It's a hack to install a modern (in a Roman
-        # sense of modern) python on ProtoGENI
-        python_rpm ="python2.4-2.4-1pydotorg.i586.rpm"
-        if os.access("./%s" % python_rpm, os.R_OK):
-            copy_file("./%s" % python_rpm, "%s/%s" % (softdir, python_rpm))