Changeset 4afcfc4 for fedd/federation/emulab_access.py

Timestamp:

Dec 9, 2009 3:53:14 PM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

c122b0c

Parents:

bde2217

Message:

getting the emulab structure out of the access commands

File:

• fedd/federation/emulab_access.py (modified) (1 diff)

fedd/federation/emulab_access.py

@@ -498 +498 @@
         msg = { 
                 'allocID': alloc_id,
-                'emulab': { 
-                    'domain': self.domain,
-                    'boss': self.boss,
-                    'ops': self.ops,
-                    'fileServer': self.fileserver,
-                    'eventServer': self.eventserver,
-                    'project': ap['project']
-                },
+                'fedAttr': [
+                    { 'attribute': 'domain', 'value': self.domain } , 
+                    { 'attribute': 'project', 'value': 
+                        ap['project'].get('name', {}).get('localname', "???") },
+                ]
             }
         if len(self.attrs) > 0:
-            msg['emulab']['fedAttr'] = \
+            msg['fedAttr'].extend(
                 [ { 'attribute': x, 'value' : y } \
-                        for x,y in self.attrs.iteritems()]
+                        for x,y in self.attrs.iteritems()])
         return msg