Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi

[plstackapi.git] / planetstack / core / models / sliver.py

diff --git a/planetstack/core/models/sliver.py b/planetstack/core/models/sliver.py
index 0f37bc9..e0ce5e2 100644 (file)
--- a/planetstack/core/models/sliver.py
+++ b/planetstack/core/models/sliver.py
@@ -44,14 +44,30 @@ class Sliver(PlCoreBase):
             self.creator = self.caller
         self.deploymentNetwork = self.node.deployment
 
-        if not self.deploymentNetwork.test_acl(slice=self.slice):
-            raise exceptions.ValidationError("Deployment %s's ACL does not allow any of this slice %s's users" % (self.deploymentNetwork.name, self.slice.name))
+# XXX smbaker - disabled for now, was causing fault in tenant view create slice
+#        if not self.deploymentNetwork.test_acl(slice=self.slice):
+#            raise exceptions.ValidationError("Deployment %s's ACL does not allow any of this slice %s's users" % (self.deploymentNetwork.name, self.slice.name))
 
         super(Sliver, self).save(*args, **kwds)
 
     def can_update(self, user):
         return self.slice.can_update(user)
 
+    def all_ips(self):
+        ips={}
+        for ns in self.networksliver_set.all():
+           ips[ns.network.name] = ns.ip
+        return ips
+
+    def all_ips_string(self):
+        result = []
+        ips = self.all_ips()
+        for key in sorted(ips.keys()):
+            #result.append("%s = %s" % (key, ips[key]))
+            result.append(ips[key])
+        return ", ".join(result)
+    all_ips_string.short_description = "addresses"
+
     @staticmethod
     def select_by_user(user):
         if user.is_admin: