Changeset 5b74b63 for fedd/federation/topdl.py

Timestamp:

Feb 20, 2010 12:07:17 PM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

39ee3cc

Parents:

2fdf4b3

Message:

Initial commit of support for transit connection info

File:

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

fedd/federation/topdl.py

@@ -55 +55 @@
 
 class ConsistencyError(RuntimeError): pass
+class NamespaceError(RuntimeError): pass
 
 class Attribute(base):
@@ -199 +200 @@
 
 class Interface(base):
-    def __init__(self, substrate, capacity=None, latency=None, attribute=[],
-            element=None):
+    def __init__(self, substrate, name=None, capacity=None, latency=None,
+            attribute=[], element=None):
+        self.name = name
         self.substrate = self.make_list(substrate)
         self.capacity = self.init_class(Capacity, capacity)
@@ -216 +218 @@
         else: l = None
 
-        return Interface(substrate=self.substrate,
+        return Interface(substrate=self.substrate, name=self.name,
                 capacity=c, latency=l,
                 attribute = [ a.clone() for a in self.attribute])
 
     def to_dict(self):
-        rv = { 'substrate': self.substrate }
+        rv = { 'substrate': self.substrate, 'name': self.name }
         if self.capacity:
             rv['capacity'] = self.capacity.to_dict()
@@ -403 +405 @@
         self.incorporate_elements()
 
+    @staticmethod
+    def name_element_interfaces(e):
+        names = set([i.name for i in e.interface if i.name])
+        inum = 0
+        for i in [ i for i in e.interface if not i.name]:
+            while inum < 1000:
+                n = "inf%03d" % inum
+                inum += 1
+                if n not in names:
+                    i.name = n
+                    break
+            else:
+                raise NamespaceError("Cannot make new interface name")
+
+
+
+    def name_interfaces(self):
+        """
+        For any interface without a name attribute, assign a unique one within
+        its element.
+        """
+
+        for e in self.elements:
+            self.name_element_interfaces(e)
+
+
     def incorporate_elements(self):
 
@@ -416 +444 @@
 
         for e in self.elements:
+            self.name_element_interfaces(e)
             for i in e.interface:
                 i.element = e
@@ -781 +810 @@
         out += '\t\t<node_type type_name="%s" slots="%s"/>\n' % (hw, slots)
         for i, ii in enumerate(e.interface):
-            iname = "if%03d" % i
-            out += '\t\t<interface virtual_id="%s"/>\n' % iname
-            ifname[ii] = iname
+            out += '\t\t<interface virtual_id="%s"/>\n' % ii.name
             ifnode[ii] = name
         for f in filters:
@@ -797 +824 @@
         for ii in s.interfaces:
             out += ('\t\t<interface_ref virtual_node_id="%s"' + \
-                    'virtual_interface_id="%s"/>\n') % (ifnode[ii], ifname[ii])
+                    'virtual_interface_id="%s"/>\n') % (ifnode[ii], ii.name)
         for f in filters:
             out += f(s)