From: Tony Mack <tmack@cs.princeton.edu>
Date: Tue, 7 Sep 2010 15:48:29 +0000 (+0000)
Subject: merge from geni branch, truncate login base of geni slices to 20 characters
X-Git-Tag: sfa-1.0-0~1
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;ds=sidebyside;h=ab602af22bbc5d199ab6df7334da5891d9dd6988;p=sfa.git

merge from geni branch, truncate login base of geni slices to 20 characters
---

diff --git a/sfa/managers/aggregate_manager_pl.py b/sfa/managers/aggregate_manager_pl.py
index c80e02bc..2204296d 100644
--- a/sfa/managers/aggregate_manager_pl.py
+++ b/sfa/managers/aggregate_manager_pl.py
@@ -76,15 +76,15 @@ def __get_registry_objects(slice_xrn, creds, users):
 
         site = {}
         site['site_id'] = 0
-        site['name'] = 'geni.%s' % hrn_auth
+        site['name'] = 'geni.%s' % hrn_auth[:20]
         site['enabled'] = True
         site['max_slices'] = 100
 
         # Note:
         # Is it okay if this login base is the same as one already at this myplc site?
         # Do we need uniqueness?  Should use hrn_auth instead of just the leaf perhaps?
-        site['login_base'] = get_leaf(hrn_auth)
-        site['abbreviated_name'] = hrn
+        site['login_base'] = hrn_auth[:20]
+        site['abbreviated_name'] = hrn_auth[:20]
         site['max_slivers'] = 1000
         reg_objects['site'] = site