pl: we need to distinguish between local pl sites/slices and foreign ones coming...

[sfa.git] / sfa / planetlab / plslices.py

diff --git a/sfa/planetlab/plslices.py b/sfa/planetlab/plslices.py
index 9a118ad..b6cec88 100644 (file)
--- a/sfa/planetlab/plslices.py
+++ b/sfa/planetlab/plslices.py
@@ -330,6 +330,13 @@ class PlSlices:
             login_base = slice_hrn.split('.')[-2][:12]
         else:
             login_base = hash_loginbase(site_hrn)
+        #plxrn = PlXrn(xrn=slice_xrn)
+        #slice_hrn = plxrn.get_hrn()
+        #type = plxrn.get_type()
+        #site_hrn = plxrn.get_authority_hrn()
+        #authority_name = plxrn.pl_authname()
+        #slicename = plxrn.pl_slicename()
+        #login_base = plxrn.pl_login_base()
 
         sites = self.driver.shell.GetSites({'peer_id': None},['site_id','name','abbreviated_name','login_base','hrn'])
 
@@ -368,9 +375,14 @@ class PlSlices:
             login_base = slice_hrn.split('.')[-2][:12]
         else:
             login_base = hash_loginbase(site_hrn)
-
-
         slice_name = '_'.join([login_base, slice_part])
+        #plxrn = PlXrn(xrn=slice_hrn)
+        #slice_hrn = plxrn.get_hrn()
+        #type = plxrn.get_type()
+        #site_hrn = plxrn.get_authority_hrn()
+        #authority_name = plxrn.pl_authname()
+        #slicename = plxrn.pl_slicename()
+        #login_base = plxrn.pl_login_base()
 
         slices = self.driver.shell.GetSlices({'peer_id': None},['slice_id','name','hrn'])
         # Filter slices by HRN
@@ -446,7 +458,7 @@ class PlSlices:
 
         # Add persons or add persons to slice
         for person_hrn in persons_to_add:
-             person_email = users_by_hrn[person_hrn].get('email', None)
+             person_email = users_by_hrn[person_hrn].get('email', "%s@geni.net"%person_hrn.split('.')[-1])
              if person_email and person_email in persons_by_email.keys():
                  # check if the user already exist in PL
                  person_id = persons_by_email[person_email]['person_id']