X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=database.py;h=c8623b3bc11395d172ce6a5f50802e54d8bdf6e7;hb=a4ec40ee564d5f16925aec2e2a383ec37640dd2e;hp=92c5ef4280ab31031c24c2eccd0e08e70ea75b02;hpb=fac3b5e83cd67c043ef6e25a9411e9e0b76b69e1;p=nodemanager.git diff --git a/database.py b/database.py index 92c5ef4..c8623b3 100644 --- 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 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()