From: Loic Baron <loic.baron@lip6.fr>
Date: Mon, 2 Dec 2013 13:04:15 +0000 (+0100)
Subject: Fixed call to know the trusted roots of an AM sfi.py trusted to call the AM / sfi... 
X-Git-Tag: geni-v2-broken-and-discontinued~2
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=4ecf0ed9290e707cf7c75a6e51da1c3ca63f2b7e

Fixed call to know the trusted roots of an AM sfi.py trusted to call the AM / sfi.py trusted -R for the Registry
---

diff --git a/sfa/client/sfi.py b/sfa/client/sfi.py
index b331a578..e4e10899 100644
--- a/sfa/client/sfi.py
+++ b/sfa/client/sfi.py
@@ -386,6 +386,11 @@ class Sfi:
                               action="store_true", dest="version_local", default=False,
                               help="display version of the local client")
 
+        if command in ("trusted"):
+            parser.add_option("-R","--registry-version",
+                             action="store_true", dest="version_registry", default=False,
+                             help="probe registry version instead of sliceapi")
+
         if command in ("add", "update"):
             parser.add_option('-x', '--xrn', dest='xrn', metavar='<xrn>', help='object hrn/urn (mandatory)')
             parser.add_option('-t', '--type', dest='type', metavar='<type>', help='object type', default=None)
@@ -1624,13 +1629,23 @@ $ sfi m -b http://mymanifold.foo.com:7080/
         """
         return the trusted certs at this interface (get_trusted_certs)
         """ 
-        trusted_certs = self.registry().get_trusted_certs()
+        if options.version_registry:
+            server=self.registry()
+        else:
+            server = self.sliceapi()
+            
+        auth_cred = self.my_authority_credential_string()
+        trusted_certs = server.get_trusted_certs(auth_cred)
+
+        if not options.version_registry:
+            trusted_certs = ReturnValue.get_value(trusted_certs)
+
         for trusted_cert in trusted_certs:
-            print "\n===========================================================\n"
-            gid = GID(string=trusted_cert)
-            gid.dump()
-            cert = Certificate(string=trusted_cert)
-            self.logger.debug('Sfi.trusted -> %r'%cert.get_subject())
-            print "Certificate:\n%s\n\n"%trusted_cert
-        return 
+             print "\n===========================================================\n"
+             gid = GID(string=trusted_cert)
+             gid.dump()
+             cert = Certificate(string=trusted_cert)
+             self.logger.debug('Sfi.trusted -> %r'%cert.get_subject())
+             print "Certificate:\n%s\n\n"%trusted_cert
 
+        return