Changeset d055eb1

Timestamp:

Apr 21, 2010 6:23:08 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

4c931af

Parents:

f7a54c6

Message:

Ftopo function returns the virtual to physical host mapping. Slight refactoring to support this.

File:

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

fedd/fedd_client.py

@@ -419 +419 @@
 
         
-
-# Querying experiment data follows the same control flow regardless of the
-# specific data retrieved.  This class encapsulates that control flow.
-class exp_data(exp_data_base):
-    def __init__(self): 
-        exp_data_base.__init__(self)
-
     def __call__(self):
         """
@@ -482 +475 @@
             sys.exit("Error processing RPC: %s" % e)
 
+        return (resp_dict, opts)
+
+
+# Querying experiment data follows the same control flow regardless of the
+# specific data retrieved.  This class encapsulates that control flow.
+class exp_data(exp_data_base):
+    def __init__(self): 
+        exp_data_base.__init__(self)
+
+    def __call__(self):
+        """
+        The control flow.  Compose the request and print the response.
+        """
+
+        resp_dict, opts = exp_data_base.__call__(self)
+
         for d in opts.data:
             key, output = self.params[d]
@@ -490 +499 @@
                 sys.exit("Bad response. %s" % e.message)
 
-class vtopo(exp_data):
+class ftopo(exp_data_base):
+    """
+    ftopo returns the mapping from logical name to local hostname
+    """
+    def __init__(self):
+        exp_data_base.__init__(self)
+    def __call__(self):
+        sys.argv.append('--data=experimentdescription')
+        resp, opts = exp_data_base.__call__(self)
+        if 'experimentdescription' in resp and \
+                'topdldescription' in resp['experimentdescription']:
+            top = \
+                topdl.Topology(\
+                **resp['experimentdescription']['topdldescription'])
+
+            for e in [ e for e in top.elements \
+                    if isinstance(e, topdl.Computer)]:
+                hn = e.get_attribute('hostname')
+                tb = e.get_attribute('testbed')
+                if hn and tb:
+                    print ":".join([",".join(e.name), hn, tb])
+
+
+
+
+class vtopo(exp_data_base):
     """
     vtopo is just an info --data=vtopo request, so this adds that parameter to
@@ -496 +530 @@
     """
     def __init__(self):
-        exp_data.__init__(self)
+        exp_data_base.__init__(self)
     def __call__(self):
         sys.argv.append('--data=vtopo')
-        exp_data.__call__(self)
-
-
-class vis(exp_data):
+        resp, opts = exp_data_base.__call__(self)
+        if 'vtopo' in resp:
+            self.print_vis_or_vtopo('vtopo')(resp['vtopo'])
+
+
+class vis(exp_data_base):
     """
     vis is just an info --data=vis request, so this adds that parameter to
@@ -508 +544 @@
     """
     def __init__(self):
-        exp_data.__init__(self)
+        exp_data_base.__init__(self)
     def __call__(self):
         sys.argv.append('--data=vis')
-        exp_data.__call__(self)
-
-class status(exp_data):
+        resp, opts = exp_data_base.__call__(self)
+        if 'vis' in resp:
+            self.print_vis_or_vtopo('vis')(resp['vis'])
+
+class status(exp_data_base):
     """
     status is just an info --data=status request, so this adds that parameter
@@ -519 +557 @@
     """
     def __init__(self):
-        exp_data.__init__(self)
+        exp_data_base.__init__(self)
     def __call__(self):
         sys.argv.append('--data=status')
-        exp_data.__call__(self)
+        resp, opts = exp_data_base.__call__(self)
+        if 'experimentStatus' in resp:
+            self.print_string(resp['experimentStatus'])
 
 class multi_exp_data(exp_data_base):
@@ -1834 +1874 @@
         'split': split(),\
         'access': access(),\
+        'ftopo': ftopo(),\
         'vtopo': vtopo(),\
         'vis': vis(),\