Changeset ab847bc for fedd/federation/dragon_access.py

Timestamp:

Apr 28, 2010 4:09:53 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

12658df

Parents:

05fceef

Message:

New syntax for testbeds that includes a /instance rider. This allows users to
request multiple segments from a single testbed.

File:

• fedd/federation/dragon_access.py (modified) (4 diffs)

fedd/federation/dragon_access.py

@@ -9 +9 @@
 import time
 
-from threading import *
+from threading import Thread, Lock
 from subprocess import Popen, call, PIPE, STDOUT
 
@@ -804 +804 @@
             # redoing the allocation.
             self.state_lock.acquire()
-            retval = self.allocation[aid].get('started', None)
+            retval = self.state[aid].get('started', None)
             self.state_lock.release()
             if retval:
@@ -858 +858 @@
         self.export_store_info(certfile, vlan_no, connInfo)
 
+
         if gri:
+            rtopo = topo.clone()
+            for s in rtopo.substrates:
+                s.set_attribute('vlan', vlan_no)
+                s.set_attribute('gri', gri)
+
             # Grab the log (this is some anal locking, but better safe than
             # sorry)
@@ -867 +873 @@
             # if the 'started' key is in the allocation, we'll return it rather
             # than redo the setup.
-            self.allocation[aid]['started'] = { 
+            self.state[aid]['started'] = { 
                     'allocID': req['allocID'],
                     'allocationLog': logv,
+                    'segmentdescription': {
+                        'topdldescription': rtopo.to_dict()
+                        },
                     }
-            retval = self.allocation[aid]['started']
+            retval = self.state[aid]['started']
             self.write_state()
             self.state_lock.release()