Changeset df3179c

Timestamp:

May 19, 2010 7:21:24 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

4b68c58

Parents:

966c620

Message:

Whoops. Allow unspecified capacities in ns output

File:

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

fedd/federation/topdl.py

@@ -716 +716 @@
     for idx, s in enumerate(t.substrates):
         loss = s.get_attribute('loss')
-        if s.latency:
-            delay = s.latency.time
-        else:
-            delay = 0
+        if s.latency: delay = s.latency.time
+        else: delay = 0
+
+        if s.capacity: rate = s.capacity.rate
+        else: rate = 100000
         name = to_tcl_name(s.name or "sub%d" % idx)
 
@@ -727 +728 @@
                     for i in s.interfaces]
             out += 'set %s [$ns make-lan "%s" %fkb %fms ]\n' % \
-                    (name, " ".join(members), s.capacity.rate, delay)
+                    (name, " ".join(members), rate, delay)
             if loss:
                 "tb-set-lan-loss ${%s} %f\n" % (name, float(loss))
@@ -737 +738 @@
                     out += "tb-set-ip-lan ${%s} ${%s} %s\n" % \
                             (to_tcl_name(e.name), name, ip)
-                if i.capacity and i.capacity.rate != s.capacity.rate:
+                if i.capacity and i.capacity.rate != rate:
                     out += "tb-set-node-lan-bandwidth ${%s} ${%s} %fkb\n" % \
                             (to_tcl_name(e.name), name, i.capacity.rate)
@@ -754 +755 @@
             out += "set %s [$ns duplex-link ${%s} ${%s} %fkb %fms DropTail]\n" %\
                     (name, to_tcl_name(f.element.name), 
-                            to_tcl_name(t.element.name),
-                            s.capacity.rate, delay)
+                            to_tcl_name(t.element.name), rate, delay)
             if loss:
                 out += "tb-set-link-loss ${%s} %f\n" % (name, float(loss))
@@ -762 +762 @@
                 lloss = i.get_attribute("loss")
                 cap_override = i.capacity and \
-                        i.capacity.rate != s.capacity.rate
+                        i.capacity.rate != rate
                 delay_override = i.latency and \
                         i.latency.time != delay
@@ -768 +768 @@
                 if cap_override or delay_override or loss_override:
                     if i.capacity: cap = i.capacity.rate
-                    else: cap = s.capacity.rate
+                    else: cap = rate
 
                     if i.latency: delay = i.latency.time