Changeset 4c65f67 for fedd/federation

Timestamp:

Dec 2, 2010 5:47:12 PM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master

Children:

3cec20c

Parents:

61a634d

Message:

Fix debugging settings so that we can use create_debug

Location:

fedd/federation

Files:

• geniapi_proxy.py (modified) (1 diff)
• protogeni_proxy.py (modified) (1 diff)

fedd/federation/geniapi_proxy.py

@@ -110 +110 @@
         tables above.
         '''
-        gmethod = self.method_map.get(method, method)
-        gparams = [f(params) for f in self.arg_map.get(method, [])]
+        if not self.debug:
+            gmethod = self.method_map.get(method, method)
+            gparams = [f(params) for f in self.arg_map.get(method, [])]
 
-        return self.geniapi_call(self.cm_url, gmethod, gparams, context)
+            return self.geniapi_call(self.cm_url, gmethod, gparams, context)
+        else:
+            if method in self.debug_fail:
+                raise self.ProtoGENIError(op=method, code='unknown',
+                        output='No output')
+            elif self.debug_response.has_key(method):
+                return self.debug_response[method]
+            else:
+                return "%s XML blob" % method
 
 

fedd/federation/protogeni_proxy.py

@@ -29 +29 @@
         self.call_SetValue = service_caller('SetValue')
 
-        self.debug_fail = ['Resolve']
+        self.debug_fail = []
         self.debug_response = {
                 'RedeemTicket': ("XML blob1", "XML blob2"),
-                'SliceStatus': { 'status': 'ready' },
+                'SliverStatus': { 'status': 'ready' },
+                'Resolve': { 
+                    'creator_urn': 'debugCreatorURN',
+                    'urn': 'debugURN',
+                    },
+                'GetKeys': [ { 'key': 'k' } ],
+                'CreateSliver': 'manifest',
             }