git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0a57718
)
merge from geni branch, truncate login base of geni slices to 20 characters
author
Tony Mack
<tmack@cs.princeton.edu>
Tue, 7 Sep 2010 15:48:29 +0000
(15:48 +0000)
committer
Tony Mack
<tmack@cs.princeton.edu>
Tue, 7 Sep 2010 15:48:29 +0000
(15:48 +0000)
sfa/managers/aggregate_manager_pl.py
patch
|
blob
|
history
diff --git
a/sfa/managers/aggregate_manager_pl.py
b/sfa/managers/aggregate_manager_pl.py
index
c80e02b
..
2204296
100644
(file)
--- 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 = {}
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['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
site['max_slivers'] = 1000
reg_objects['site'] = site