From f6fca1e7e6d73192925c33e792bea2d954c4783e Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Wed, 6 Apr 2011 11:24:24 +0200 Subject: [PATCH] configure-sfi in dry-run --- system/TestPlc.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/system/TestPlc.py b/system/TestPlc.py index 616afe7..398708e 100644 --- a/system/TestPlc.py +++ b/system/TestPlc.py @@ -1159,13 +1159,13 @@ class TestPlc: def conffile(self,filename): return "%s/%s"%(self.confdir(),filename) - def confsubdir(self,dirname,clean): + def confsubdir(self,dirname,clean,dry_run=False): subdirname="%s/%s"%(self.confdir(),dirname) if clean: utils.system("rm -rf %s"%subdirname) if not os.path.isdir(subdirname): utils.system("mkdir -p %s"%subdirname) - if not os.path.isdir(subdirname): + if not dry_run and not os.path.isdir(subdirname): raise "Cannot create config subdir %s for plc %s"%(dirname,self.name()) return subdirname @@ -1244,10 +1244,10 @@ class TestPlc: return self.run_in_guest('service sfa start')==0 def sfi_configure(self): - "Create /root/.sfi on the plc side" + "Create /root/.sfi on the plc side for sfi client configuration" sfa_spec=self.plc_spec['sfa'] - "sfi client configuration" - dir_name=self.confsubdir("dot-sfi",clean=True) + dir_name=self.confsubdir("dot-sfi",clean=True,dry_run=self.options.dry_run) + if self.options.dry_run: return True file_name=dir_name + os.sep + sfa_spec['piuser'] + '.pkey' fileconf=open(file_name,'w') fileconf.write (self.plc_spec['keys'][0]['private']) -- 2.43.0