Correcting typo in aggregates.xml

Fixing trusted roots auto import in bash nukem.
Fixing Getslices and GetLeases in slabdriver.py

diff --git a/sfa/senslab/config/aggregates.xml b/sfa/senslab/config/aggregates.xml
index bceddac..824b7fe 100644 (file)
--- a/sfa/senslab/config/aggregates.xml
+++ b/sfa/senslab/config/aggregates.xml
@@ -1,5 +1,5 @@
 <aggregates>
-       <aggregate addr="192.168.0.252" hrn="senslab" port="12347"/>
+       <aggregate addr="192.168.0.252" hrn="senslab" port="12346"/>
        <aggregate addr="192.168.0.249" hrn="senslab2" port="52346"/>
-       <aggregate addr="138.96.112.249" hrn="ple" port="12347"/>
+       <aggregate addr="138.96.112.249" hrn="ple" port="12346"/>
 </aggregates>

diff --git a/sfa/senslab/config/bash_nukem b/sfa/senslab/config/bash_nukem
index b4fc03c..1ed5532 100755 (executable)
--- a/sfa/senslab/config/bash_nukem
+++ b/sfa/senslab/config/bash_nukem
@@ -78,6 +78,30 @@ sudo cp $git_local_repo/sfa/senslab/config/$vm/default_config.xml /etc/sfa/defau
 # 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
+
+
+#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 
+fi
+
+if [ ! -f /etc/sfa/oar_config.py ] 
+then
+    sudo cp $git_local_repo/sfa/senslab/config/oar_config.py  /etc/sfa/oar_config.py 
+fi
+
+sudo service sfa restart
+
+# User stuff : clean your folder
+cd  ~/.sfi
+rm *.sscert *.cred *.gid sfi_cache.dat
+cd ~
+
+# Import the datbase form ldap
+sudo sfaadmin.py registry import_registry
+sudo service sfa restart
+
 sudo cp $git_local_repo/sfa/senslab/config/registries.xml /etc/sfa/registries.xml
 sudo cp $git_local_repo/sfa/senslab/config/aggregates.xml /etc/sfa/aggregates.xml
 
@@ -111,26 +135,6 @@ case "$3" in
         ;;
 esac
 
-#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 
-fi
-
-if [ ! -f /etc/sfa/oar_config.py ] 
-then
-    sudo cp $git_local_repo/sfa/senslab/config/oar_config.py  /etc/sfa/oar_config.py 
-fi
-
-sudo service sfa restart
-
-# User stuff : clean your folder
-cd  ~/.sfi
-rm *.sscert *.cred *.gid sfi_cache.dat
-cd ~
-
-# Import the datbase form ldap
-sudo sfaadmin.py registry import_registry
 sudo service sfa restart
 
 sudo rm -rf /var/lib/sfa/authorities/plc

diff --git a/sfa/senslab/slabdriver.py b/sfa/senslab/slabdriver.py
index fa64ab7..106a821 100644 (file)
--- a/sfa/senslab/slabdriver.py
+++ b/sfa/senslab/slabdriver.py
@@ -15,7 +15,7 @@ from sfa.managers.driver import Driver
 from sfa.rspecs.version_manager import VersionManager
 from sfa.rspecs.rspec import RSpec
 
-from sfa.util.xrn import hrn_to_urn, get_authority
+from sfa.util.xrn import Xrn, hrn_to_urn, get_authority
 
 
 ## thierry: everything that is API-related (i.e. handling incoming requests) 
@@ -182,9 +182,9 @@ class SlabDriver(Driver):
     
         if users:
             slice_record = users[0].get('slice_record', {}) 
-            logger.debug("SLABDRIVER.PY \t create_sliver \t\
-                                        slice_record %s \r\n \r\n users %s" \
-                                        %(slice_record, users))
+            logger.debug("SLABDRIVER.PY \t ===============create_sliver \t\
+                                        creds %s \r\n \r\n users %s" \
+                                        %(creds, users))
             slice_record['user'] = {'keys':users[0]['keys'], \
                                     'email':users[0]['email'], \
                                     'hrn':slice_record['reg-researchers'][0]}
@@ -966,7 +966,7 @@ class SlabDriver(Driver):
             #query_slice_list = dbsession.query(RegRecord).filter_by(type='slice').all()
             #query_slice_list = slab_dbsession.query(SenslabXP).all()
             return_slicerec_dictlist = []
-            for record in query_slice_list:
+            for record in query_slice_list: 
                 tmp = record.__dict__
                 tmp['reg_researchers'] = tmp['reg_researchers'][0].__dict__
                 #del tmp['reg_researchers']['_sa_instance_state']
@@ -1396,8 +1396,12 @@ class SlabDriver(Driver):
                             #self.root_auth, node['hostname']))
                     slab_xrn = slab_xrn_object(self.root_auth, node)
                     resa['component_id_list'].append(slab_xrn.urn)
+                    resa['slice_hrn'] = Xrn(resa['slice_id']).get_hrn()
                     
                 if lease_filter_dict:
+                    logger.debug("SLABDRIVER \tGetLeases resa_ %s \r\n leasefilter %s"\
+                                            %(resa,lease_filter_dict)) 
+                        
                     if lease_filter_dict['name'] == resa['slice_hrn']:
                         reservation_list.append(resa)