git://git.onelab.eu
/
plstackapi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
f8ae484
)
make tenant view tolerant of slicePrivileges that are missing their slice
author
Scott Baker
<smbaker@gmail.com>
Wed, 5 Nov 2014 19:05:45 +0000
(11:05 -0800)
committer
Scott Baker
<smbaker@gmail.com>
Wed, 5 Nov 2014 19:05:45 +0000
(11:05 -0800)
planetstack/core/dashboard/views/view_common.py
patch
|
blob
|
history
diff --git
a/planetstack/core/dashboard/views/view_common.py
b/planetstack/core/dashboard/views/view_common.py
index
7d51435
..
4bcb17d
100644
(file)
--- a/
planetstack/core/dashboard/views/view_common.py
+++ b/
planetstack/core/dashboard/views/view_common.py
@@
-61,8
+61,13
@@
def getSliceInfo(user):
userSliceInfo = []
for entry in slicePrivs:
userSliceInfo = []
for entry in slicePrivs:
- slicename = Slice.objects.get(id=entry.slice.id).name
- slice = Slice.objects.get(name=Slice.objects.get(id=entry.slice.id).name)
+ slice = Slice.objects.filter(id=entry.slice.id)
+ if not slice:
+ # the privilege is to a slice that doesn't exist
+ print "data model consistency problem, slice %s doesn't exist" % entry.slice.id
+ continue
+ slice = slice[0]
+ slicename = slice.name
sliverList=Sliver.objects.all()
sites_used = {}
for sliver in slice.slivers.all():
sliverList=Sliver.objects.all()
sites_used = {}
for sliver in slice.slivers.all():