# First restart sfa (prevents stalling when connecting
# to the DB and dropping tables)
sudo service sfa restart
+
# Nuke the database
sudo sfaadmin.py registry nuke
# Drop table in slab_sfa
# to avoid duplicates.
-
psql -d slab_sfa -U sfa -W -q -c "drop table slice_senslab;"
# sudo cp $git_local_repo/sfa/senslab/config/$vm/site.xml /etc/sfa/site.xml
# sudo cp $git_local_repo/sfa/senslab/config/$vm/site_config /etc/sfa/configs/site_config
# sudo ln -s ldap_config.py /etc/sfa/ldap_config.py
-sudo cp $git_local_repo/sfa/senslab/config/ldap_config.py /etc/sfa/ldap_config.py
-sudo cp $git_local_repo/sfa/senslab/config/oar_config.py /etc/sfa/oar_config.py
+
+#Senslab LDAP and OAR access config files
+if [ !-f /etc/sfa/ldap_config.py ]
+then
+ sudo cp $git_local_repo/sfa/senslab/config/ldap_config.py /etc/sfa/ldap_config.py
+
+if [ !-f /etc/sfa/oar_config.py ]
+then
+ sudo cp $git_local_repo/sfa/senslab/config/oar_config.py /etc/sfa/oar_config.py
+
sudo service sfa restart
# User stuff : clean your folder
#slicerec_dict.update({'node_ids':[lease['reserved_nodes'][n]['hostname'] for n in lease['reserved_nodes']]})
slicerec_dict.update({'list_node_ids':{'hostname':reserved_list}})
slicerec_dict.update({'node_ids':lease['reserved_nodes']})
- slicerec_dict.update(fixed_slicerec_dict)
- slicerec_dict.update({'hrn':\
+ #If the slice does not belong to senslab:
+ if fixed_slicerec_dict:
+ slicerec_dict.update(fixed_slicerec_dict)
+ slicerec_dict.update({'hrn':\
str(fixed_slicerec_dict['slice_hrn'])})
if owner == lease['user']:
slicerec_dict['oar_job_id'] = lease['lease_id']
reserved_list = []
- for reserved_node in lease['reserved_nodes']:
- reserved_list.append(reserved_node['hostname'])
+
+ #for reserved_node in lease['reserved_nodes']:
+ logger.debug("SLABDRIVER.PY \tGetSlices lease %s " %(lease ))
+ #reserved_list.append(reserved_node['hostname'])
+ reserved_list.extend(lease['reserved_nodes'])
#slicerec_dict.update({'node_ids':{'hostname':reserved_list}})
#slicerec_dict.update({'node_ids':[lease['reserved_nodes'][n]['hostname'] for n in lease['reserved_nodes']]})
slicerec_dict.update({'node_ids':lease['reserved_nodes']})
try:
for rec in recslice_list:
record['oar_job_id'].append(rec['oar_job_id'])
+ record['node_ids'] = [ self.root_auth + hostname for hostname in rec['node_ids']]
except KeyError:
pass
if slices_list:
for sl in slices_list:
- logger.debug("SLABSLICE \tverify_slice slicename %s sl %s \
- slice_record %s"%(slicename, sl, \
+ logger.debug("SLABSLICE \tverify_slice slicename %s slices_list %s sl %s \
+ slice_record %s"%(slicename, slices_list,sl, \
slice_record))
sfa_slice = sl
sfa_slice.update(slice_record)