Bug 1859 - Remove the fake limitation that LBaaS only works with

HTTP and HTTPS.

Now it allows all TCP ports. The user needs to take
caution not to lock themselves out by letting LBaaS take over
critical ports for direct access. The user also needs to ensure
that the members are all using same TCP ports.

Change-Id: I8bec4bf893446cf9478480d9cc9e76a8cb3ca9c9
Signed-off-by: Srini Seetharaman <srini.seetharaman@gmail.com>

diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/LBaaSHandler.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/LBaaSHandler.java
index ce45d6181de45051eca5e5cea3f5cfaf01872dbf..ec286e68cd13e2fc7bc9dd0d93811668956429fe 100644 (file)
--- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/LBaaSHandler.java
+++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/LBaaSHandler.java
@@ -177,11 +177,9 @@ public class LBaaSHandler extends AbstractHandler
             memberProtocol = neutronLBPool.getLoadBalancerPoolProtocol();
             if (memberProtocol == null)
                 continue;
-            /*
-             * Only HTTP and HTTPS are supported as of this version
-             * TODO: Support all TCP load-balancers
-             */
-            if (!(memberProtocol.equalsIgnoreCase(LoadBalancerConfiguration.PROTOCOL_HTTP) ||
+
+            if (!(memberProtocol.equalsIgnoreCase(LoadBalancerConfiguration.PROTOCOL_TCP) ||
+                  memberProtocol.equalsIgnoreCase(LoadBalancerConfiguration.PROTOCOL_HTTP) ||
                   memberProtocol.equalsIgnoreCase(LoadBalancerConfiguration.PROTOCOL_HTTPS)))
                 continue;
             for (NeutronLoadBalancerPoolMember neutronLBPoolMember: members) {

diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/LBaaSPoolHandler.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/LBaaSPoolHandler.java
index 41fa9dfe56357f5827b510b1cf3debaddc9b7807..81e191d5b9bbb2633857b7e800893050bb7e6018 100755 (executable)
--- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/LBaaSPoolHandler.java
+++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/LBaaSPoolHandler.java
@@ -54,7 +54,8 @@ public class LBaaSPoolHandler extends AbstractHandler
         String poolProtocol = neutronLBPool.getLoadBalancerPoolProtocol();
         if (poolProtocol == null)
             return HttpURLConnection.HTTP_BAD_REQUEST;
-        else if (!(poolProtocol.equalsIgnoreCase(LoadBalancerConfiguration.PROTOCOL_HTTP) ||
+        else if (!(poolProtocol.equalsIgnoreCase(LoadBalancerConfiguration.PROTOCOL_TCP) ||
+                poolProtocol.equalsIgnoreCase(LoadBalancerConfiguration.PROTOCOL_HTTP) ||
                 poolProtocol.equalsIgnoreCase(LoadBalancerConfiguration.PROTOCOL_HTTPS)))
             return HttpURLConnection.HTTP_NOT_ACCEPTABLE;
         else
@@ -110,7 +111,8 @@ public class LBaaSPoolHandler extends AbstractHandler
         String poolProtocol = neutronLBPool.getLoadBalancerPoolProtocol();
         if (poolProtocol == null)
             return HttpURLConnection.HTTP_BAD_REQUEST;
-        else if (!(poolProtocol.equalsIgnoreCase(LoadBalancerConfiguration.PROTOCOL_HTTP) ||
+        else if (!(poolProtocol.equalsIgnoreCase(LoadBalancerConfiguration.PROTOCOL_TCP) ||
+                poolProtocol.equalsIgnoreCase(LoadBalancerConfiguration.PROTOCOL_HTTP) ||
                 poolProtocol.equalsIgnoreCase(LoadBalancerConfiguration.PROTOCOL_HTTPS)))
             return HttpURLConnection.HTTP_NOT_ACCEPTABLE;
         else

diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/LBaaSPoolMemberHandler.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/LBaaSPoolMemberHandler.java
index 1fa02d90663b814408db1bb4aa8a008618732c43..9f6198c937c2408f3b753054f57fa86fa473e42b 100755 (executable)
--- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/LBaaSPoolMemberHandler.java
+++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/LBaaSPoolMemberHandler.java
@@ -198,7 +198,8 @@ public class LBaaSPoolMemberHandler extends AbstractHandler
         }
         NeutronLoadBalancerPool neutronLBPool = neutronLBPoolCache.getNeutronLoadBalancerPool(memberPoolID);
         memberProtocol = neutronLBPool.getLoadBalancerPoolProtocol();
-        if (!(memberProtocol.equalsIgnoreCase(LoadBalancerConfiguration.PROTOCOL_HTTP) ||
+        if (!(memberProtocol.equalsIgnoreCase(LoadBalancerConfiguration.PROTOCOL_TCP) ||
+                memberProtocol.equalsIgnoreCase(LoadBalancerConfiguration.PROTOCOL_HTTP) ||
                 memberProtocol.equalsIgnoreCase(LoadBalancerConfiguration.PROTOCOL_HTTPS)))
             return null;
 

diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/LoadBalancerConfiguration.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/LoadBalancerConfiguration.java
index 2ba9e47af6cc5a0b6cf57a54f060d70cb1b3e6ad..ac275347ec13a8cb574e2aa37038cf412d96dad0 100755 (executable)
--- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/LoadBalancerConfiguration.java
+++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/LoadBalancerConfiguration.java
@@ -19,10 +19,9 @@ import java.util.Map;
  */
 
 public class LoadBalancerConfiguration {
+    public static final String PROTOCOL_TCP = "TCP";
     public static final String PROTOCOL_HTTP = "HTTP";
     public static final String PROTOCOL_HTTPS = "HTTPS";
-    public static final Integer PROTOCOL_HTTP_PORT = 80;
-    public static final Integer PROTOCOL_HTTPS_PORT = 443;
 
     public class LoadBalancerPoolMember {
         String ipAddr;