Changeset 40c599fc6b630e00fa88daf69d9d01825abe4573

Timestamp:

01/12/12 19:40:11 (4 months ago)

Author:

Ted Faber <faber@…>

Children:

cfc4d68cb4e45963ff15d3552f527f4c420f6978

Parents:

3ce6b208613eee2da17b5fb77a2537249e74f2f4, 0fb29735cf4da5d2c08d4321c0628303fb09b3f5

git-committer:

Ted Faber <faber@isi.edu> / 2012-01-12T19:40:11Z-0800

Message:

Merge branch 'info-ops' of  git://fedd.deterlab.net/fedd into info-ops

Files:

• fedd/federation/topdl.py (modified) (1 diff)
• wsdl/topdl.xsd (modified) (1 diff)

fedd/federation/topdl.py

@@ -928 +928 @@
 
     for eidx, e in enumerate(t.elements):
-        if e.name: name = e.name
-        else: name = "unnamed_node%d" % eidx
-        
-        ips = [ ]
-        for idx, i in enumerate(e.interface):
-            ip = i.get_attribute('ip4_address')
-            ips.append(ip)
-            port = "%s:%d" % (name, idx)
-            for idx, s in enumerate(i.subs):
-                bw = 100000
-                delay = 0.0
-                if s.capacity:
-                    bw = s.capacity.rate
-                if i.capacity:
-                    bw = i.capacity.rate
-
-                if s.latency:
-                    delay = s.latency.time
-                if i.latency:
-                    bw = i.latency.time
-
-                lans.append({
-                    'member': port,
-                    'vname': s.name,
-                    'ip': ip,
-                    'vnode': name,
-                    'delay': delay,
-                    'bandwidth': bw,
-                    })
-        nodes.append({
-            'ips': ":".join(ips),
-            'vname': name,
-            })
+        if isinstance(e, Computer):
+            if e.name: name = e.name
+            else: name = "unnamed_node%d" % eidx
+            
+            ips = [ ]
+            for idx, i in enumerate(e.interface):
+                ip = i.get_attribute('ip4_address')
+                ips.append(ip)
+                port = "%s:%d" % (name, idx)
+                for idx, s in enumerate(i.subs):
+                    bw = 100000
+                    delay = 0.0
+                    if s.capacity:
+                        bw = s.capacity.rate
+                    if i.capacity:
+                        bw = i.capacity.rate
+
+                    if s.latency:
+                        delay = s.latency.time
+                    if i.latency:
+                        bw = i.latency.time
+
+                    lans.append({
+                        'member': port,
+                        'vname': s.name,
+                        'ip': ip,
+                        'vnode': name,
+                        'delay': delay,
+                        'bandwidth': bw,
+                        })
+            nodes.append({
+                'ips': ":".join(ips),
+                'vname': name,
+                })
 
     return { 'node': nodes, 'lan': lans }

wsdl/topdl.xsd

@@ -95 +95 @@
       <xsd:element name="importer" type="xsd:string" 
         minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="param" type="tns:serviceParamTypeType" 
+      <xsd:element name="param" type="tns:serviceParamType" 
         minOccurs="0" maxOccurs="unbounded"/>
       <xsd:element name="description" type="xsd:string"