From: Faiyaz Ahmed <faiyaza@cs.princeton.edu>
Date: Mon, 10 Nov 2008 19:00:28 +0000 (+0000)
Subject: Keep rspecs for delegated slices in sync w/ PLC
X-Git-Tag: NodeManager-1.8-1~26
X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=commitdiff_plain;h=a4ec40ee564d5f16925aec2e2a383ec37640dd2e

Keep rspecs for delegated slices in sync w/ PLC
---

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()