Merge Master in geni-v3 conflict resolution

[sfa.git] / sfa / methods / Resolve.py

diff --git a/sfa/methods/Resolve.py b/sfa/methods/Resolve.py
index 7abc6cd..f3a6e67 100644 (file)
--- a/sfa/methods/Resolve.py
+++ b/sfa/methods/Resolve.py
@@ -18,17 +18,23 @@ class Resolve(Method):
 
     interfaces = ['registry']
     
+    # should we not accept an optional 'details' argument ?
     accepts = [
         Mixed(Parameter(str, "Human readable name (hrn or urn)"),
               Parameter(list, "List of Human readable names ([hrn])")),
         Mixed(Parameter(str, "Credential string"),
-              Parameter(list, "List of credentials)"))  
+              Parameter(list, "List of credentials)")),
+        Parameter(dict, "options"),
         ]
 
     # xxx used to be [SfaRecord]
     returns = [Parameter(dict, "registry record")]
     
-    def call(self, xrns, creds):
+    def call(self, xrns, creds, options={}):
+        # use details=False by default, only when explicitly specified do we want 
+        # to mess with the testbed details
+        if 'details' in options: details=options['details']
+        else:                    details=False
         type = None
         if not isinstance(xrns, types.ListType):
             type = Xrn(xrns).get_type()
@@ -42,5 +48,5 @@ class Resolve(Method):
         self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, origin_hrn, hrns, self.name))
  
         # send the call to the right manager
-        return self.api.manager.Resolve(self.api, xrns, type)
+        return self.api.manager.Resolve(self.api, xrns, type, details=details)