Changeset 4a53c72

Timestamp:

May 17, 2010 9:08:23 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

5e4025d

Parents:

2e0a952

Message:

A few more places to change the computer name from list to single string

File:

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

fedd/federation/topdl.py

@@ -592 +592 @@
 
     for eidx, e in enumerate(t.elements):
-        if e.name: name = e.name[0]
+        if e.name: name = e.name
         else: name = "unnamed_node%d" % eidx
         
@@ -713 +713 @@
         if len(s.interfaces) > 2:
             # Lan
-            members = [ to_tcl_name("${%s}") % i.element.name[0] \
+            members = [ to_tcl_name("${%s}") % i.element.name \
                     for i in s.interfaces]
             out += 'set %s [$ns make-lan "%s" %fkb %fms ]\n' % \
@@ -725 +725 @@
                 if ip:
                     out += "tb-set-ip-lan ${%s} ${%s} %s\n" % \
-                            (to_tcl_name(e.name[0]), name, ip)
+                            (to_tcl_name(e.name), name, ip)
                 if i.capacity and i.capacity.rate != s.capacity.rate:
                     out += "tb-set-node-lan-bandwidth ${%s} ${%s} %fkb\n" % \
-                            (to_tcl_name(e.name[0]), name, i.capacity.rate)
+                            (to_tcl_name(e.name), name, i.capacity.rate)
                 if i.latency and i.latency.time != delay:
                     out += "tb-set-node-lan-delay ${%s} ${%s} %fms\n" % \
-                            (to_tcl_name(e.name[0]), name, i.latency.time)
+                            (to_tcl_name(e.name), name, i.latency.time)
                 iloss = i.get_attribute('loss')
                 if loss and iloss != loss :
                     out += "tb-set-node-lan-loss ${%s} ${%s} %f\n" % \
-                            (to_tcl_name(e.name[0]), name, float(loss))
+                            (to_tcl_name(e.name), name, float(loss))
             out+= "\n"
         elif len(s.interfaces) == 2:
@@ -742 +742 @@
 
             out += "set %s [$ns duplex-link ${%s} ${%s} %fkb %fms DropTail]\n" %\
-                    (name, to_tcl_name(f.element.name[0]), 
-                            to_tcl_name(t.element.name[0]),
+                    (name, to_tcl_name(f.element.name), 
+                            to_tcl_name(t.element.name),
                             s.capacity.rate, delay)
             if loss:
@@ -765 +765 @@
 
                     out += "tb-set-link-simplex-params ${%s} ${%s} %fms %fkb %f\n"\
-                            % (name, to_tcl_name(i.element.name[0]),
+                            % (name, to_tcl_name(i.element.name),
                                     delay, cap, loss)
                 ip = i.get_attribute('ip4_address')
                 if ip:
                     out += "tb-set-ip-link ${%s} ${%s} %s\n" % \
-                            (to_tcl_name(i.element.name[0]), name, ip)
+                            (to_tcl_name(i.element.name), name, ip)
             out+= "\n"
         for f in filters: