From 900d8dff276a66f782bc0d3b25c8989cc86b544e Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Tue, 20 May 2014 16:19:25 +0200 Subject: [PATCH] oops again --- system/TestAuthSfa.py | 6 +++--- system/config_default.py | 1 - system/config_sfadebug.py | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/system/TestAuthSfa.py b/system/TestAuthSfa.py index d8aa1c9..f784796 100644 --- a/system/TestAuthSfa.py +++ b/system/TestAuthSfa.py @@ -54,7 +54,7 @@ class TestAuthSfa: # the hrn for the root authority def root_hrn (self): - return self.test_plc.plc_spec['sfa']['SFA_REGISTRY_ROOT_AUTH'] + return self.test_plc.plc_spec['sfa']['settings']['SFA_REGISTRY_ROOT_AUTH'] # the hrn for the auth/site def auth_hrn (self): @@ -100,10 +100,10 @@ class TestAuthSfa: SFI_USER=self.obj_hrn(self.auth_sfa_spec['pi_spec']['name']) fileconf.write ("SFI_USER='%s'"%SFI_USER) fileconf.write('\n') - SFI_REGISTRY='http://' + sfa_spec['SFA_REGISTRY_HOST'] + ':12345/' + SFI_REGISTRY='http://' + sfa_spec['settings']['SFA_REGISTRY_HOST'] + ':12345/' fileconf.write ("SFI_REGISTRY='%s'"%SFI_REGISTRY) fileconf.write('\n') - SFI_SM='http://' + sfa_spec['SFA_SM_HOST'] + ':12347/' + SFI_SM='http://' + sfa_spec['settings']['SFA_SM_HOST'] + ':12347/' fileconf.write ("SFI_SM='%s'"%SFI_SM) fileconf.write('\n') fileconf.close() diff --git a/system/config_default.py b/system/config_default.py index 508f880..974dd52 100644 --- a/system/config_default.py +++ b/system/config_default.py @@ -519,7 +519,6 @@ def plc (options,index) : 'ssh_node_debug_timers': (10,8), } -# NOTE: SFA currently has SFA_AGGREGATE_API_VERSION=2 baked into the code def sfa (options,index) : return { # the default is to use AMs in the various aggregates.xml diff --git a/system/config_sfadebug.py b/system/config_sfadebug.py index c7b14c1..a9a5a7c 100644 --- a/system/config_sfadebug.py +++ b/system/config_sfadebug.py @@ -5,7 +5,7 @@ def config (plc_specs, options): def tweak_loglevel (plc_spec): - plc_spec['sfa']['SFA_API_LOGLEVEL'] += 1 + plc_spec['sfa']['settings']['SFA_API_LOGLEVEL'] += 1 return plc_spec return [tweak_loglevel (plc_spec) for plc_spec in plc_specs ] -- 2.43.0