Changeset f81aba7

Timestamp:

Mar 4, 2010 3:17:27 PM (15 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

6280b1f

Parents:

632dd59

Message:

MOre ProtoGENI accomodations

File:

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

fedd/federation/topdl.py

@@ -797 +797 @@
         slots = e.get_attribute("slots") or "1";
         startup = e.get_attribute("startup")
-        tarfiles = " ".join([ "%s %s" % (s.install, s.location) \
-                for s in e.software if s.location and s.install ])
+        # XXX: unreliable on ProtoGENI 20100303
+        #tarfiles = " ".join([ "%s %s" % (s.install, s.location) \
+        #       for s in e.software if s.location and s.install ])
 
         extras = ""
         if startup: extras += '\t\tstartup_command="%s"\n' % startup
-        if tarfiles: extras +='\t\ttarfiles="%s"\n' % tarfiles
+        #if tarfiles: extras +='\t\ttarfiles="%s"\n' % tarfiles
         out += '\t<node virtual_id="%s"\n\t\tvirtualization_type="%s"\n' % \
                 (name, virt_type)
@@ -817 +818 @@
 
     for i, s in enumerate(t.substrates):
-        out += '\t<link virtual_id="%s" link_type="ethernet">\n'
+        if len(s.interfaces) == 0: 
+            continue
+        out += '\t<link virtual_id="%s" link_type="ethernet">\n' % s.name
         if s.capacity and s.capacity.kind == "max":
-            out += '\t\t<bandwidth>%f</bandwidth>\n' % s.capacity.rate
+            bwout = True
+            out += '\t\t<bandwidth>%d</bandwidth>\n' % s.capacity.rate
+        else:
+            bwout = False
         if s.latency and s.latency.kind == "max":
-            out += '\t\t<latency>%f</latency>\n' % s.latency.time
+            out += '\t\t<latency>%d</latency>\n' % s.latency.time
+        elif bwout:
+            out += '\t\t<latency>0</latency>\n'
         for ii in s.interfaces:
             out += ('\t\t<interface_ref virtual_node_id="%s" ' + \