commit f2d2ef0fa2517967ca6a6cd7a790a4d9a9150343
author Scott Baker <smbaker@gmail.com> Thu Oct 08 16:51:08 2015 -0700
committer Scott Baker <smbaker@gmail.com> Thu Oct 08 16:51:08 2015 -0700
tree 3a8b65aa5eecfd69110343580cabbaa59acda38c
parent 0768a545c061e8a3e1dae19197667371b1676107

do not destroy deployment if nodes are attached

xos/tosca/resources/deployment.py

diff --git a/xos/tosca/resources/deployment.py b/xos/tosca/resources/deployment.py
index 152b1f9..ed6734c 100644
--- a/xos/tosca/resources/deployment.py
+++ b/xos/tosca/resources/deployment.py
@@ -51,13 +51,13 @@
         self.postprocess_privileges(DeploymentRole, DeploymentPrivilege, rolemap, obj, "deployment")
 
     def delete(self, obj):
-        if self.get_property("no-delete"):
-            self.info("Deployment %s is marked no-delete")
-            return
-
         if obj.sites.exists():
             self.info("Deployment %s has active sites; skipping delete" % obj.name)
             return
+        for sd in obj.sitedeployments.all():
+            if sd.nodes.exists():
+                self.info("Deployment %s has active nodes; skipping delete" % obj.name)
+                return
         #if obj.nodes.exists():
         #    self.info("Deployment %s has active nodes; skipping delete" % obj.name)
         #    return