patch by Thomas Dreibholz - ovs-vsctl and not ovs-ovsctl

[nodemanager.git] / account.py

diff --git a/account.py b/account.py
index 4d74a1b..9f18024 100644 (file)
--- a/account.py
+++ b/account.py
@@ -73,7 +73,8 @@ def get(name):
     try:
         if name not in name_worker: name_worker[name] = Worker(name)
         return name_worker[name]
-    finally: name_worker_lock.release()
+    finally:
+        name_worker_lock.release()
 
 
 class Account:
@@ -138,19 +139,31 @@ class Account:
         pass
     def is_running(self):
         pass
+    def needs_reimage(self, target_slicefamily):
+        stampname = "/vservers/{}/etc/slicefamily".format(self.name)
+        try:
+            with open(stampname) as f:
+                current_slicefamily = f.read().strip()
+                return current_slicefamily != target_slicefamily
+        except IOError as e:
+            logger.verbose("Account.needs_reimage: missing slicefamily {} - left as-is"
+                           .format(self.name))
+            return False
 
     ### this used to be a plain method but because it needs to be invoked by destroy
     # which is a static method, they need to become static as well
     # needs to be done before sliver starts (checked with vs and lxc)
     @staticmethod
-    def mount_ssh_dir (slicename): return Account._manage_ssh_dir (slicename, do_mount=True)
+    def mount_ssh_dir (slicename):
+        return Account._manage_ssh_dir (slicename, do_mount=True)
     @staticmethod
-    def umount_ssh_dir (slicename): return Account._manage_ssh_dir (slicename, do_mount=False)
+    def umount_ssh_dir (slicename):
+        return Account._manage_ssh_dir (slicename, do_mount=False)
 
     # bind mount / umount root side dir to sliver side
     @staticmethod
     def _manage_ssh_dir (slicename, do_mount):
-        logger.log ("_manage_ssh_dir, requested to "+("mount" if do_mount else "umount")+" ssh dir for "+ slicename)
+        logger.log("_manage_ssh_dir, requested to "+("mount" if do_mount else "umount")+" ssh dir for "+ slicename)
         try:
             root_ssh = "/home/{}/.ssh".format(slicename)
             sliver_ssh = "/vservers/{}/home/{}/.ssh".format(slicename, slicename)
@@ -215,7 +228,8 @@ class Worker:
                 # this sliver has the lease, it is safe to start it
                 if not self.is_running():
                     self.start(rec)
-                else: self.configure(rec)
+                else:
+                    self.configure(rec)
             else:
                 # not having the lease, do not start it
                 self.configure(rec)
@@ -223,7 +237,7 @@ class Worker:
         # xxx it's not clear what to do when a sliver changes type/class
         # in a reservable node
         else:
-            if not self.is_running() or next_class != curr_class:
+            if not self.is_running() or self.needs_reimage(rec['vref']) or next_class != curr_class:
                 self.start(rec)
             else:
                 self.configure(rec)
@@ -243,22 +257,41 @@ class Worker:
         self._acct.stop()
 
     def is_running(self):
-        if (self._acct != None) and self._acct.is_running():
-            status = True
+        if self._acct and self._acct.is_running():
+            return True
         else:
-            status = False
-            logger.verbose("account: Worker({}): is not running".format(self.name))
-        return status
+            logger.verbose("Worker.is_running ({}) - no account or not running".format(self.name))
+            return False
 
+    def needs_reimage(self, target_slicefamily):
+        if not self._acct:
+            logger.verbose("Worker.needs_reimage ({}) - no account -> True".format(self.name))
+            return True
+        else:
+            account_needs_reimage = self._acct.needs_reimage(target_slicefamily)
+            if account_needs_reimage:
+                logger.log("Worker.needs_reimage ({}) - account needs reimage (tmp: DRY RUN)"
+                           .format(self.name))
+            else:
+                logger.verbose("Worker.needs_reimage ({}) - everything fine"
+                               .format(self.name))
+            return account_needs_reimage
+    
     def _destroy(self, curr_class):
         self._acct = None
         if curr_class:
             destroy_sem.acquire()
-            try: curr_class.destroy(self.name)
-            finally: destroy_sem.release()
+            try:
+                logger.verbose("account._destroy is callling destroy from {}"
+                               .format(curr_class.__name__))
+                curr_class.destroy(self.name)
+            finally:
+                destroy_sem.release()
 
     def _get_class(self):
-        try: shell = pwd.getpwnam(self.name)[6]
-        except KeyError: return None
+        try:
+            shell = pwd.getpwnam(self.name)[6]
+        except KeyError:
+            return None
         return shell_acct_class[shell]