From 016d72658dc3d9a1d571a9081aaa0b5633150a2b Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Tue, 3 Jan 2012 12:11:29 +0100 Subject: [PATCH] fix sfascan wrt recent changes --- sfa/client/sfascan.py | 5 +++-- sfa/client/sfi.py | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/sfa/client/sfascan.py b/sfa/client/sfascan.py index fdfa580d..458b3520 100644 --- a/sfa/client/sfascan.py +++ b/sfa/client/sfascan.py @@ -147,8 +147,9 @@ class Interface: try: client=Sfi(options) client.read_config() - key_file = client.get_key_file() - cert_file = client.get_cert_file(key_file) + client.bootstrap() + key_file = client.private_key + cert_file = client.my_gid logger.debug("using key %s & cert %s"%(key_file,cert_file)) url=self.url() logger.info('issuing GetVersion at %s'%url) diff --git a/sfa/client/sfi.py b/sfa/client/sfi.py index d91e7e25..4ff43acb 100644 --- a/sfa/client/sfi.py +++ b/sfa/client/sfi.py @@ -165,7 +165,8 @@ def unique_call_id(): return uuid.uuid4().urn class Sfi: - required_options=['verbose', 'debug', 'registry', 'sm', 'auth', 'user'] + # dirty hack to make this class usable from the outside + required_options=['verbose', 'debug', 'registry', 'sm', 'auth', 'user', 'user_private_key'] @staticmethod def default_sfi_dir (): -- 2.47.0