git://git.onelab.eu
/
plstackapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removing plural from model names. some cleanup
[plstackapi.git]
/
planetstack
/
core
/
models
/
slice.py
diff --git
a/planetstack/core/models/slice.py
b/planetstack/core/models/slice.py
index
52a5dd6
..
e182388
100644
(file)
--- a/
planetstack/core/models/slice.py
+++ b/
planetstack/core/models/slice.py
@@
-94,7
+94,7
@@
class Slice(PlCoreBase):
nets = Network.objects.filter(slices=self)
nets.delete()
# delete slice controllers
nets = Network.objects.filter(slices=self)
nets.delete()
# delete slice controllers
- slice_controllers = ControllerSlice
s
.objects.filter(slice=self)
+ slice_controllers = ControllerSlice.objects.filter(slice=self)
slice_controllers.delete()
# delete slice privilege
slice_privileges = SlicePrivilege.objects.filter(slice=self)
slice_controllers.delete()
# delete slice privilege
slice_privileges = SlicePrivilege.objects.filter(slice=self)
@@
-129,7
+129,7
@@
class SlicePrivilege(PlCoreBase):
qs = SlicePrivilege.objects.filter(id__in=sp_ids)
return qs
qs = SlicePrivilege.objects.filter(id__in=sp_ids)
return qs
-class ControllerSlice
s
(PlCoreBase):
+class ControllerSlice(PlCoreBase):
objects = ControllerLinkManager()
deleted_objects = ControllerLinkDeletionManager()
objects = ControllerLinkManager()
deleted_objects = ControllerLinkDeletionManager()
@@
-142,10
+142,10
@@
class ControllerSlices(PlCoreBase):
@staticmethod
def select_by_user(user):
if user.is_admin:
@staticmethod
def select_by_user(user):
if user.is_admin:
- qs = ControllerSlice
s
.objects.all()
+ qs = ControllerSlice.objects.all()
else:
slices = Slice.select_by_user(user)
else:
slices = Slice.select_by_user(user)
- qs = ControllerSlice
s
.objects.filter(slice__in=slices)
+ qs = ControllerSlice.objects.filter(slice__in=slices)
return qs
def get_cpu_stats(self):
return qs
def get_cpu_stats(self):