git://git.onelab.eu
/
unfold.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
26056d6
)
Slicename is unique among all authorities
author
Yasin Rahman
<mohammed-yasin.rahman@lip6.fr>
Fri, 10 Apr 2015 16:44:42 +0000
(18:44 +0200)
committer
Yasin Rahman
<mohammed-yasin.rahman@lip6.fr>
Fri, 10 Apr 2015 16:44:42 +0000
(18:44 +0200)
portal/slicerequestview.py
patch
|
blob
|
history
diff --git
a/portal/slicerequestview.py
b/portal/slicerequestview.py
index
5a72007
..
f0643e2
100644
(file)
--- a/
portal/slicerequestview.py
+++ b/
portal/slicerequestview.py
@@
-135,12
+135,13
@@
class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
# create slice_hrn based on authority_hrn and slice_name
slice_name = slice_request['slice_name']
# create slice_hrn based on authority_hrn and slice_name
slice_name = slice_request['slice_name']
- req_slice_hrn = authority_hrn + '.' + slice_name
- # comparing requested slice_hrn with the existing slice_hrn
- slice_query = Query().get('myslice:slice').select('slice_hrn','parent_authority').filter_by('parent_authority','==',authority_hrn)
+ # slice name is unique among all authorities
+ slice_query = Query().get('myslice:slice').select('slice_hrn')
slice_details_sfa = execute_admin_query(wsgi_request, slice_query)
for _slice in slice_details_sfa:
slice_details_sfa = execute_admin_query(wsgi_request, slice_query)
for _slice in slice_details_sfa:
- if _slice['slice_hrn'] == req_slice_hrn:
+ split_list = _slice['slice_hrn'].split('.')
+ sfa_slice_name = split_list[-1]
+ if sfa_slice_name == slice_name:
errors.append('Slice already exists. Please use a different slice name.')
errors.append('Slice already exists. Please use a different slice name.')