git://git.onelab.eu
/
nodemanager.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
77e2a03
)
Added registration for Sliver_LV account type
author
Xavi Leon
<xleon@ac.upc.edu>
Mon, 7 Nov 2011 23:00:04 +0000
(18:00 -0500)
committer
Xavi Leon
<xleon@ac.upc.edu>
Mon, 7 Nov 2011 23:00:04 +0000
(18:00 -0500)
slivermanager.py
patch
|
blob
|
history
diff --git
a/slivermanager.py
b/slivermanager.py
index
1d38758
..
d89bb22
100644
(file)
--- a/
slivermanager.py
+++ b/
slivermanager.py
@@
-17,7
+17,7
@@
import database
import accounts
import controller
import sliver_vs
import accounts
import controller
import sliver_vs
-import sliver_l
xc
+import sliver_l
ibvirt
try: from bwlimit import bwmin, bwmax
except ImportError: bwmin, bwmax = 8, 1000*1000*1000
try: from bwlimit import bwmin, bwmax
except ImportError: bwmin, bwmax = 8, 1000*1000*1000
@@
-209,8
+209,8
@@
def start():
for resname, default_amount in sliver_vs.DEFAULT_ALLOCATION.iteritems():
DEFAULT_ALLOCATION[resname]=default_amount
for resname, default_amount in sliver_vs.DEFAULT_ALLOCATION.iteritems():
DEFAULT_ALLOCATION[resname]=default_amount
- accounts.register_class(sliver_vs.Sliver_VS)
- accounts.register_class(sliver_l
xc.Sliver_LXC
)
+
#
accounts.register_class(sliver_vs.Sliver_VS)
+ accounts.register_class(sliver_l
ibvirt.Sliver_LV
)
accounts.register_class(controller.Controller)
database.start()
api_calls.deliver_ticket = deliver_ticket
accounts.register_class(controller.Controller)
database.start()
api_calls.deliver_ticket = deliver_ticket