Changeset b4b19c7 for fedd/fedd_client.py

Timestamp:

Apr 21, 2010 5:31:03 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

f7a54c6

Parents:

f54e8e4

Message:

Get topology information into the info operation, as annotations of a topology description. This required adding such information to the start segment replies as well

File:

• fedd/fedd_client.py (modified) (3 diffs)

fedd/fedd_client.py

@@ -134 +134 @@
         self.add_option("--data", dest="data", default=[],
                 action="append", type="choice",
-                choices=("id", "federant", "vtopo", "vis", "log", "status"),
+                choices=("id", "experimentdescription", "federant", "vtopo", 
+                    "vis", "log", "status"),
                 help="data to extract")
 
@@ -360 +361 @@
         # called.
         self.params = {
-                'vis': ('vis', self.print_xml('vis')),
-                'vtopo': ('vtopo', self.print_xml('vtopo')),
+                'vis': ('vis', self.print_vis_or_vtopo('vis')),
+                'vtopo': ('vtopo', self.print_vis_or_vtopo('vtopo')),
                 'federant': ('federant', self.print_xml),
+                'experimentdescription': \
+                        ('experimentdescription', self.print_xml),
                 'id': ('experimentID', self.print_id),
                 'status': ('experimentStatus', self.print_string),
@@ -379 +382 @@
                     print >>out, "%s: %s" % (k, id[k])
 
-    class print_xml:
+    def print_xml(self, d, out=sys.stdout):
+        """
+        Very simple ugly xml formatter of the kinds of dicts that come back
+        from services.
+        """
+        if isinstance(d, dict):
+            for k, v in d.items():
+                print >>out, "<%s>" % k
+                self.print_xml(v, out)
+                print >>out, "</%s>" % k
+        elif isinstance(d, list):
+            for x in d:
+                self.print_xml(x, out)
+        else:
+            print >>out, d
+
+
+    class print_vis_or_vtopo:
         """
         Print the retrieved data is a simple xml representation of the dict.