X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetstack%2Fcore%2Fmodels%2Fnetwork.py;h=51cc0c8708de57ec6630c1e0eff8aa3d77d31b3c;hb=4df786ffd7b10707a21667dfb4494b1d05ff4eae;hp=298c54d335c4f7612469aec2c3f5440ca0d5018a;hpb=e3bbcf622e692f93fcc62ff7be7f49a206249b6c;p=plstackapi.git

diff --git a/planetstack/core/models/network.py b/planetstack/core/models/network.py
index 298c54d..51cc0c8 100644
--- a/planetstack/core/models/network.py
+++ b/planetstack/core/models/network.py
@@ -2,6 +2,7 @@ import os
 import socket
 from django.db import models
 from core.models import PlCoreBase, Site, Slice, Sliver, Deployment
+from core.models import DeploymentLinkManager,DeploymentLinkDeletionManager
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.contenttypes import generic
 
@@ -53,6 +54,52 @@ class Network(PlCoreBase):
     def can_update(self, user):
         return self.owner.can_update(user)
 
+    @property
+    def nat_list(self):
+        """ Support a list of ports in the format "protocol:port, protocol:port, ..."
+            examples:
+                tcp 123
+                tcp 123:133
+                tcp 123, tcp 124, tcp 125, udp 201, udp 202
+
+            User can put either a "/" or a " " between protocol and ports
+            Port ranges can be specified with "-" or ":"
+        """
+        nats = []
+        if self.ports:
+            parts = self.ports.split(",")
+            for part in parts:
+                part = part.strip()
+                if "/" in part:
+                    (protocol, ports) = part.split("/",1)
+                elif " " in part:
+                    (protocol, ports) = part.split(None,1)
+                else:
+                    raise TypeError('malformed port specifier %s, format example: "tcp 123, tcp 201:206, udp 333"' % part)
+
+                protocol = protocol.strip()
+                ports = ports.strip()
+
+                if not (protocol in ["udp", "tcp"]):
+                    raise TypeError('unknown protocol %s' % protocol)
+
+                if "-" in ports:
+                    (first, last) = ports.split("-")
+                    first = int(first.strip())
+                    last = int(last.strip())
+                    portStr = "%d:%d" % (first, last)
+                elif ":" in ports:
+                    (first, last) = ports.split(":")
+                    first = int(first.strip())
+                    last = int(last.strip())
+                    portStr = "%d:%d" % (first, last)
+                else:
+                    portStr = "%d" % int(ports)
+
+                nats.append( {"l4_protocol": protocol, "l4_port": portStr} )
+
+        return nats
+
     @staticmethod
     def select_by_user(user):
         if user.is_admin:
@@ -64,13 +111,16 @@ class Network(PlCoreBase):
         return qs
 
 class NetworkDeployments(PlCoreBase):
+    objects = DeploymentLinkManager()
+    deleted_objects = DeploymentLinkDeletionManager()
+
     # Stores the openstack ids at various deployments
-    network = models.ForeignKey(Network)    
+    network = models.ForeignKey(Network)
     deployment = models.ForeignKey(Deployment)
     net_id = models.CharField(null=True, blank=True, max_length=256, help_text="Quantum network")
     router_id = models.CharField(null=True, blank=True, max_length=256, help_text="Quantum router id")
-    subnet_id = models.CharField(null=True, blank=True, max_length=256, help_text="Quantum subnet id") 
-    subnet = models.CharField(max_length=32, blank=True)    
+    subnet_id = models.CharField(null=True, blank=True, max_length=256, help_text="Quantum subnet id")
+    subnet = models.CharField(max_length=32, blank=True)
        
     def can_update(self, user):
         return user.is_admin
@@ -83,7 +133,7 @@ class NetworkDeployments(PlCoreBase):
             slices = Slice.select_by_user(user)
             networks = Network.objects.filter(owner__in=slices)
             qs = NetworkDeployments.objects.filter(network__in=networks)
-        return qs      
+        return qs
 
 class NetworkSlice(PlCoreBase):
     # This object exists solely so we can implement the permission check when