Changeset 4875e93 for fedd

Timestamp:

Aug 24, 2010 2:01:19 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

88dbe63

Parents:

d49c11c

Message:

Use arguments more congruent with GENIAPI AM and remove the sliver credentials.
Also a couple small bugs: not initializing slice_urn when a terminateion of a
terminated allocation is requested and not writing the new credential to disk
after the renew call.

File:

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

fedd/federation/protogeni_access.py

@@ -944 +944 @@
                 raise service_error(service_error.federant, 
                         "No URN returned for slice %s" % hrn)
+
+            if 'creator_urn' in data:
+                creator_urn = data['creator_urn']
+            else:
+                raise service_error(service_error.federant, 
+                        "No creator URN returned for slice %s" % hrn)
             # Populate the ssh keys (let PG format them)
             param = {
@@ -954 +960 @@
                     'credentials': [ slice_cred ],
                     'rspec': rspec, 
-                    'keys': keys, 
+                    'users': [ {
+                        'urn': creator_urn,
+                        'keys': keys, 
+                        },
+                    ],
                     'slice_urn': slice_urn,
                     }
@@ -963 +973 @@
                     "ProtoGENI: %s %s" % (e.code, e))
 
-        return (slice_urn, slice_cred, sliver_cred, manifest)
-
-    def wait_for_slice(self, segment_commands, sliver_cred, slice_urn, ctxt, 
+        return (slice_urn, slice_cred, manifest)
+
+    def wait_for_slice(self, segment_commands, slice_cred, slice_urn, ctxt, 
             timeout=None):
         """
@@ -978 +988 @@
             while status not in completed_states:
                 param = { 
-                        'credentials': [ sliver_cred ],
+                        'credentials': [ slice_cred ],
                         'slice_urn': slice_urn,
                         }
@@ -1034 +1044 @@
         slicename = self.get_free_slicename(segment_commands, user, gcred, ctxt)
         self.log.info("Creating %s" % slicename)
-        slice_urn, slice_cred, sliver_cred, manifest = self.allocate_slice(
+        slice_urn, slice_cred, manifest = self.allocate_slice(
                 segment_commands, slicename, rspec, gcred, ctxt)
 
@@ -1059 +1069 @@
 
         # Now we wait for the nodes to start on PG
-        status = self.wait_for_slice(segment_commands, sliver_cred, slice_urn, 
+        status = self.wait_for_slice(segment_commands, slice_cred, slice_urn, 
                 ctxt, timeout=300)
         if status == 'failed':
@@ -1075 +1085 @@
             self.allocation[aid]['slice_name'] = slicename
             self.allocation[aid]['slice_credential'] = slice_cred
-            self.allocation[aid]['sliver_credential'] = sliver_cred
             self.allocation[aid]['manifest'] = manifest
             self.allocation[aid]['certfile'] = certfile
@@ -1393 +1402 @@
             cf, user, ssh_key, cpw = (None, None, None, None)
             slice_cred = None
+            slice_urn = None
             ename = None
         self.state_lock.release()
@@ -1500 +1510 @@
                     if self.allocation.has_key(aid):
                         self.allocation[aid]['slice_credential'] = new_scred
+                        self.write_state()
                     self.state_lock.release()
                 else: