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:
fac3b5e
)
Keep rspecs for delegated slices in sync w/ PLC
author
Faiyaz Ahmed
<faiyaza@cs.princeton.edu>
Mon, 10 Nov 2008 19:00:28 +0000
(19:00 +0000)
committer
Faiyaz Ahmed
<faiyaza@cs.princeton.edu>
Mon, 10 Nov 2008 19:00:28 +0000
(19:00 +0000)
database.py
patch
|
blob
|
history
diff --git
a/database.py
b/database.py
index
92c5ef4
..
c8623b3
100644
(file)
--- a/
database.py
+++ b/
database.py
@@
-104,7
+104,13
@@
class Database(dict):
if name not in self: accounts.get(name).ensure_destroyed()
for name, rec in self.iteritems():
if rec['instantiation'] == 'plc-instantiated': accounts.get(name).ensure_created(rec)
if name not in self: accounts.get(name).ensure_destroyed()
for name, rec in self.iteritems():
if rec['instantiation'] == 'plc-instantiated': accounts.get(name).ensure_created(rec)
- if rec['instantiation'] == 'nm-controller': accounts.get(name).ensure_created(rec)
+ elif rec['instantiation'] == 'nm-controller': accounts.get(name).ensure_created(rec)
+ # Back door to ensure PLC overrides Ticket in delegation.
+ elif rec['instantiation'] == 'delegated':
+ slivr = accounts.get(name)
+ # if the ticket has been delivered and the nm-contoroller started the slice
+ # update rspecs and keep them up to date.
+ if slivr.is_running(): slivr.ensure_created(rec)
# Wake up bwmom to update limits.
bwmon.lock.set()
# Wake up bwmom to update limits.
bwmon.lock.set()