Changeset 4afcfc4

Timestamp:

Dec 9, 2009 3:53:14 PM (15 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

Location:

fedd/federation

Files:

• emulab_access.py (modified) (1 diff)
• experiment_control.py (modified) (2 diffs)

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
 

fedd/federation/experiment_control.py

@@ -816 +816 @@
                     "Access denied by %s (%s)" % (tb, uri))
 
-        if r.has_key('emulab'):
-            e = r['emulab']
-            p = e['project']
-            tbparam[tb] = { 
-                    "boss": e['boss'],
-                    "host": e['ops'],
-                    "domain": e['domain'],
-                    "fs": e['fileServer'],
-                    "eventserver": e['eventServer'],
-                    "project": unpack_id(p['name']),
-                    "emulab" : e,
-                    "allocID" : r['allocID'],
-                    "uri": uri,
-                    }
-            # Make the testbed name be the label the user applied
-            p['testbed'] = {'localname': tb }
-
-            for u in p['user']:
-                role = u.get('role', None)
-                if role == 'experimentCreation':
-                    tbparam[tb]['user'] = unpack_id(u['userID'])
-                    break
-            else:
-                raise service_error(service_error.internal, 
-                        "No createExperimentUser from %s" %tb)
-            # Add attributes to parameter space.  We don't allow attributes to
-            # overlay any parameters already installed.
-            for a in e['fedAttr']:
-                try:
-                    if a['attribute'] and \
-                            isinstance(a['attribute'], basestring)\
-                            and not tbparam[tb].has_key(a['attribute'].lower()):
-                        tbparam[tb][a['attribute'].lower()] = a['value']
-                except KeyError:
-                    self.log.error("Bad attribute in response: %s" % a)
-        else:
-            tbparam[tb] = { 
+        tbparam[tb] = { 
                 "allocID" : r['allocID'],
                 "uri": uri,
-            }
+                }
+
+        # Add attributes to parameter space.  We don't allow attributes to
+        # overlay any parameters already installed.
+        for a in r['fedAttr']:
+            try:
+                if a['attribute'] and \
+                        isinstance(a['attribute'], basestring)\
+                        and not tbparam[tb].has_key(a['attribute'].lower()):
+                    tbparam[tb][a['attribute'].lower()] = a['value']
+            except KeyError:
+                self.log.error("Bad attribute in response: %s" % a)
 
     def release_access(self, tb, aid, uri=None):
@@ -1989 +1964 @@
         self.state_lock.acquire()
         if self.state.has_key(key):
+            self.state[key]['experimentStatus'] = "starting"
             for e in self.state[key].get('experimentID',[]):
                 if not expid and e.has_key('fedid'):