git://git.onelab.eu
/
tests.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
attempt to fix the add_sfa step
[tests.git]
/
system
/
TestPlc.py
diff --git
a/system/TestPlc.py
b/system/TestPlc.py
index
546ba5d
..
812b867
100644
(file)
--- a/
system/TestPlc.py
+++ b/
system/TestPlc.py
@@
-1,4
+1,6
@@
-# $Id$
+# Thierry Parmentelat <thierry.parmentelat@inria.fr>
+# Copyright (C) 2010 INRIA
+#
import os, os.path
import datetime
import time
import os, os.path
import datetime
import time
@@
-535,8
+537,9
@@
class TestPlc:
tmpname='%s.plc-config-tty'%(self.name())
fileconf=open(tmpname,'w')
for var in [ 'PLC_NAME',
tmpname='%s.plc-config-tty'%(self.name())
fileconf=open(tmpname,'w')
for var in [ 'PLC_NAME',
- 'PLC_ROOT_PASSWORD',
'PLC_ROOT_USER',
'PLC_ROOT_USER',
+ 'PLC_ROOT_PASSWORD',
+ 'PLC_SLICE_PREFIX',
'PLC_MAIL_ENABLED',
'PLC_MAIL_SUPPORT_ADDRESS',
'PLC_DB_HOST',
'PLC_MAIL_ENABLED',
'PLC_MAIL_SUPPORT_ADDRESS',
'PLC_DB_HOST',
@@
-1072,7
+1075,7
@@
class TestPlc:
tmpname='%s.sfa-config-tty'%(self.name())
fileconf=open(tmpname,'w')
for var in [ 'SFA_REGISTRY_ROOT_AUTH',
tmpname='%s.sfa-config-tty'%(self.name())
fileconf=open(tmpname,'w')
for var in [ 'SFA_REGISTRY_ROOT_AUTH',
- 'SFA_REGISTRY_LEVEL1_AUTH',
+
#
'SFA_REGISTRY_LEVEL1_AUTH',
'SFA_REGISTRY_HOST',
'SFA_AGGREGATE_HOST',
'SFA_SM_HOST',
'SFA_REGISTRY_HOST',
'SFA_AGGREGATE_HOST',
'SFA_SM_HOST',
@@
-1081,7
+1084,8
@@
class TestPlc:
'SFA_PLC_DB_HOST',
'SFA_PLC_DB_USER',
'SFA_PLC_DB_PASSWORD',
'SFA_PLC_DB_HOST',
'SFA_PLC_DB_USER',
'SFA_PLC_DB_PASSWORD',
- 'SFA_PLC_URL']:
+ 'SFA_PLC_URL',
+ ]:
fileconf.write ('e %s\n%s\n'%(var,self.plc_spec['sfa'][var]))
fileconf.write('w\n')
fileconf.write('R\n')
fileconf.write ('e %s\n%s\n'%(var,self.plc_spec['sfa'][var]))
fileconf.write('w\n')
fileconf.write('R\n')
@@
-1104,6
+1108,7
@@
class TestPlc:
return self.run_in_guest('service sfa start')==0
def setup_sfa(self):
return self.run_in_guest('service sfa start')==0
def setup_sfa(self):
+ sfa_spec=self.plc_spec['sfa']
"sfi client configuration"
dir_name=".sfi"
if os.path.exists(dir_name):
"sfi client configuration"
dir_name=".sfi"
if os.path.exists(dir_name):
@@
-1116,23
+1121,23
@@
class TestPlc:
file_name=dir_name + os.sep + 'sfi_config'
fileconf=open(file_name,'w')
file_name=dir_name + os.sep + 'sfi_config'
fileconf=open(file_name,'w')
- SFI_AUTH=
self.plc_spec['sfa']['SFA_REGISTRY_ROOT_AUTH']+".main"
+ SFI_AUTH=
"%s.%s"%(sfa_spec['SFA_REGISTRY_ROOT_AUTH'],sfa_spec['login_base'])
fileconf.write ("SFI_AUTH='%s'"%SFI_AUTH)
fileconf.write('\n')
SFI_USER=SFI_AUTH+'.fake-pi1'
fileconf.write ("SFI_USER='%s'"%SFI_USER)
fileconf.write('\n')
fileconf.write ("SFI_AUTH='%s'"%SFI_AUTH)
fileconf.write('\n')
SFI_USER=SFI_AUTH+'.fake-pi1'
fileconf.write ("SFI_USER='%s'"%SFI_USER)
fileconf.write('\n')
- SFI_REGISTRY='http://' + s
elf.plc_spec['sfa']
['SFA_PLC_DB_HOST'] + ':12345/'
+ SFI_REGISTRY='http://' + s
fa_spec
['SFA_PLC_DB_HOST'] + ':12345/'
fileconf.write ("SFI_REGISTRY='%s'"%SFI_REGISTRY)
fileconf.write('\n')
fileconf.write ("SFI_REGISTRY='%s'"%SFI_REGISTRY)
fileconf.write('\n')
- SFI_SM='http://' + s
elf.plc_spec['sfa']
['SFA_PLC_DB_HOST'] + ':12347/'
+ SFI_SM='http://' + s
fa_spec
['SFA_PLC_DB_HOST'] + ':12347/'
fileconf.write ("SFI_SM='%s'"%SFI_SM)
fileconf.write('\n')
fileconf.close()
file_name=dir_name + os.sep + 'person.xml'
fileconf=open(file_name,'w')
fileconf.write ("SFI_SM='%s'"%SFI_SM)
fileconf.write('\n')
fileconf.close()
file_name=dir_name + os.sep + 'person.xml'
fileconf=open(file_name,'w')
- for record in s
elf.plc_spec['sfa']
['sfa_person_xml']:
+ for record in s
fa_spec
['sfa_person_xml']:
person_record=record
fileconf.write(person_record)
fileconf.write('\n')
person_record=record
fileconf.write(person_record)
fileconf.write('\n')
@@
-1140,9
+1145,9
@@
class TestPlc:
file_name=dir_name + os.sep + 'slice.xml'
fileconf=open(file_name,'w')
file_name=dir_name + os.sep + 'slice.xml'
fileconf=open(file_name,'w')
- for record in s
elf.plc_spec['sfa']
['sfa_slice_xml']:
+ for record in s
fa_spec
['sfa_slice_xml']:
slice_record=record
slice_record=record
- #slice_record=s
elf.plc_spec['sfa']
['sfa_slice_xml']
+ #slice_record=s
fa_spec
['sfa_slice_xml']
fileconf.write(slice_record)
fileconf.write('\n')
fileconf.close()
fileconf.write(slice_record)
fileconf.write('\n')
fileconf.close()
@@
-1150,7
+1155,7
@@
class TestPlc:
file_name=dir_name + os.sep + 'slice.rspec'
fileconf=open(file_name,'w')
slice_rspec=''
file_name=dir_name + os.sep + 'slice.rspec'
fileconf=open(file_name,'w')
slice_rspec=''
- for (key, value) in s
elf.plc_spec['sfa']
['sfa_slice_rspec'].items():
+ for (key, value) in s
fa_spec
['sfa_slice_rspec'].items():
slice_rspec +=value
fileconf.write(slice_rspec)
fileconf.write('\n')
slice_rspec +=value
fileconf.write(slice_rspec)
fileconf.write('\n')