Changeset 3bddd24 for fedd/federation/experiment_control.py

Timestamp:

Dec 8, 2009 5:45:03 PM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

99eb8cf

Parents:

7d2814a

Message:

moving toward credentials, and away from emulab specifics

File:

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

fedd/federation/experiment_control.py

@@ -762 +762 @@
                 req = {\
                         'destinationTestbed' : { 'uri' : uri },
-                        'project': { 
-                            'name': {'localname': p},
-                            'user': [ {'userID': { 'localname': u } } ],
-                            },
-                        'user':  user,
+                        'credential': [ "project: %s" % p, "user: %s"  % u],
                         'allocID' : { 'localname': 'test' },
-                        'createAccess' : [ { 'sshPubkey' : self.ssh_pubkey } ],
-                        'serviceAccess' : service_keys
                     }
             else:
@@ -775 +769 @@
                 req = {\
                         'destinationTestbed' : { 'uri' : uri },
+                        'credential': [ 'user: %s' % u ],
                         'user':  [ {'userID': { 'localname': u } } ],
                         'allocID' : { 'localname': 'test' },
-                        'createAccess' : [ { 'sshPubkey' : self.ssh_pubkey } ],
-                        'serviceAccess' : service_keys
                     }