Changeset f671ef7

Timestamp:

Dec 1, 2011 9:57:47 AM (13 years ago)

Author:

Ted Faber <faber@…>

Branches:

compt_changes, info-ops, master

Children:

218ffe0

Parents:

1ae1aa2

Message:

Merge new info more reasonably

File:

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

fedd/federation/experiment_control.py

@@ -979 +979 @@
 
     def annotate_topology(self, top, data):
-        def add_new(ann, attr):
-            for a in ann:
-                if a not in attr: attr.append(a)
+        # These routines do various parts of the annotation
+        def add_new_names(nl, l):
+            """ add any names in nl to the list in l """
+            for n in nl:
+                if n not in l: l.append(n)
+        
+        def merge_services(ne, e):
+            for ns in ne.service:
+                # NB: the else is on the for
+                for s in e.service:
+                    if ns.name == s.name:
+                        s.importer = ns.importer
+                        s.param = ns.param
+                        s.description = ns.description
+                        s.status = ns.status
+                        break
+                else:
+                    e.service.append(ns)
+        
+        def merge_oses(ne, e):
+            """
+            Merge the operating system entries of ne into e
+            """
+            for nos in ne.os:
+                # NB: the else is on the for
+                for os in e.os:
+                    if nos.name == eos.name:
+                        eos.version = nos.version
+                        eos.version = nos.distribution
+                        eos.version = nos.distributionversion
+                        for a in nos.attribute:
+                            eos.set_attribute(a.attribute, a.value)
+                        break
+                else:
+                    e.os.append(nos)
 
         # Annotate the topology with embedding info
@@ -987 +1019 @@
             if isinstance(e, topdl.Computer):
                 for s in data:
-                    ann = s.node.get(e.name, None)
-                    if ann is not None:
-                        add_new(ann.localname, e.localname)
-                        e.status = ann.status
-                        add_new(ann.service, e.service)
-                        add_new(ann.operation, e.operation)
-                        if ann.os:
-                            e.os = ann.os
+                    ne = s.node.get(e.name, None)
+                    if ne is not None:
+                        add_new_names(ne.localname, e.localname)
+                        e.status = ne.status
+                        merge_services(ne, e)
+                        add_new_names(ne.operation, e.operation)
+                        if ne.os: merge_oses(ne, e)
                         break