Changeset 68bb551

Timestamp:

Sep 17, 2009 5:23:32 PM (15 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

157ac77

Parents:

23dec62

Message:

Get the allocation log into the response and add the vlan number as an attribute. Some misc debugging code removed as well.

Next, we make the experiment controller deal with this new thing.

File:

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

fedd/federation/dragon_access.py

@@ -581 +581 @@
                         close_fds=True)
                 for line in p.stdout:
-                    log.debug("Line from createReservation: %s" %line)
                     m = status_re.match(line)
                     if m:
@@ -600 +599 @@
 
             while status in ('ACCEPTED', 'INSETUP', 'PENDING'):
-                time.sleep(30)
+                time.sleep(5)
                 log.debug("[start_segment]: %s" % " ".join(cmd))
                 if not self.create_debug:
@@ -612 +611 @@
                     dest = None
                     for line in p.stdout:
-                        log.debug("Line from query: %s" %line)
                         if not in_path:
                             m = status_re.match(line)
@@ -661 +659 @@
                         raise service_error(service_error.internal,
                                 "Different VPNs on DRAGON ends")
+                    log.debug("Status: %s" % status or "none")
                 else:
                     status = 'ACTIVE'
@@ -741 +740 @@
                     "Can't find creation user for %s" %aid)
 
-        gri, vlan_no = self.start_segment(repo, src, dest, cap, vlans)
-        print "back from start_segement %s %d" % (gri, vlan_no)
+        gri, vlan_no = self.start_segment(repo, src, dest, cap, vlans,
+                log=alloc_log)
 
         if gri:
@@ -753 +752 @@
             self.state_lock.release()
 
-            print "returning %s " %  { 'allocID': req['allocID'], 'allocationLog': logv }
-            return { 'allocID': req['allocID'], 'allocationLog': logv }
+            return { 
+                    'allocID': req['allocID'],
+                    'allocationLog': logv,
+                    'fedAttr': [
+                        {'attribute': 'vlan', 'value': '%d' % vlan_no }
+                        ]
+                    }
         elif err:
             raise service_error(service_error.federant,