Splitting the LBaaS northbound events into three individual event types

(specifically, LB, LB-Pool, LB-Pool-Member)

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

diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/AbstractEvent.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/AbstractEvent.java
index 7a57032b0b79a4a7d99221ee8112cfb8e39cbebf..31320efe985e24cfbd22f5ce7b5c883bbd7042c4 100644 (file)
--- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/AbstractEvent.java
+++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/AbstractEvent.java
@@ -25,7 +25,9 @@ public abstract class AbstractEvent {
         NEUTRON_ROUTER,
         NEUTRON_SUBNET,
         NEUTRON_FWAAS,
-        NEUTRON_LBAAS;
+        NEUTRON_LOAD_BALANCER,
+        NEUTRON_LOAD_BALANCER_POOL,
+        NEUTRON_LOAD_BALANCER_POOL_MEMBER;
 
         public static final int size = HandlerType.values().length;
     }

diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/Activator.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/Activator.java
index d13cb33e766a679993766a7e1d1f0d6e7ccff7a3..32483b80244a58c26d9ec3735c0091299f572e91 100644 (file)
--- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/Activator.java
+++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/Activator.java
@@ -240,7 +240,8 @@ public class Activator extends ComponentActivatorAbstractBase {
 
         if (imp.equals(LBaaSHandler.class)) {
             Properties lbaasHandlerProperties = new Properties();
-            lbaasHandlerProperties.put(Constants.EVENT_HANDLER_TYPE_PROPERTY, AbstractEvent.HandlerType.NEUTRON_LBAAS);
+            lbaasHandlerProperties.put(Constants.EVENT_HANDLER_TYPE_PROPERTY,
+                    AbstractEvent.HandlerType.NEUTRON_LOAD_BALANCER);
             c.setInterface(new String[] {INeutronLoadBalancerAware.class.getName(),
                                          INeutronLoadBalancerPoolAware.class.getName(),
                                          INeutronLoadBalancerPoolMemberAware.class.getName()},

diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/NorthboundEvent.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/NorthboundEvent.java
index ca3dbf2a19beec0390d77822f20b75bf566fc2ff..57fa0b250f7d5cd645b782b236a00e48f396079b 100644 (file)
--- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/NorthboundEvent.java
+++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/NorthboundEvent.java
@@ -11,6 +11,9 @@
 package org.opendaylight.ovsdb.openstack.netvirt;
 
 import org.opendaylight.controller.networkconfig.neutron.NeutronFloatingIP;
+import org.opendaylight.controller.networkconfig.neutron.NeutronLoadBalancer;
+import org.opendaylight.controller.networkconfig.neutron.NeutronLoadBalancerPool;
+import org.opendaylight.controller.networkconfig.neutron.NeutronLoadBalancerPoolMember;
 import org.opendaylight.controller.networkconfig.neutron.NeutronNetwork;
 import org.opendaylight.controller.networkconfig.neutron.NeutronPort;
 import org.opendaylight.controller.networkconfig.neutron.NeutronRouter;
@@ -26,6 +29,9 @@ public class NorthboundEvent extends AbstractEvent {
     private NeutronRouter_Interface routerInterface;
     private NeutronFloatingIP neutronFloatingIP;
     private NeutronNetwork neutronNetwork;
+    private NeutronLoadBalancer loadBalancer;
+    private NeutronLoadBalancerPool loadBalancerPool;
+    private NeutronLoadBalancerPoolMember loadBalancerPoolMember;
 
     NorthboundEvent(NeutronPort port, Action action) {
         super(HandlerType.NEUTRON_PORT, action);
@@ -58,6 +64,21 @@ public class NorthboundEvent extends AbstractEvent {
         this.neutronNetwork = neutronNetwork;
     }
 
+    NorthboundEvent(NeutronLoadBalancer loadBalancer, Action action) {
+        super(HandlerType.NEUTRON_LOAD_BALANCER, action);
+        this.loadBalancer = loadBalancer;
+    }
+
+    NorthboundEvent(NeutronLoadBalancerPool loadBalancerPool, Action action) {
+        super(HandlerType.NEUTRON_LOAD_BALANCER_POOL, action);
+        this.loadBalancerPool = loadBalancerPool;
+    }
+
+    NorthboundEvent(NeutronLoadBalancerPoolMember loadBalancerPoolMember, Action action) {
+        super(HandlerType.NEUTRON_LOAD_BALANCER_POOL_MEMBER, action);
+        this.loadBalancerPoolMember = loadBalancerPoolMember;
+    }
+
     public NeutronPort getPort() {
         return port;
     }
@@ -76,6 +97,15 @@ public class NorthboundEvent extends AbstractEvent {
     public NeutronNetwork getNeutronNetwork() {
         return neutronNetwork;
     }
+    public NeutronLoadBalancer getLoadBalancer() {
+        return loadBalancer;
+    }
+    public NeutronLoadBalancerPool getLoadBalancerPool() {
+        return loadBalancerPool;
+    }
+    public NeutronLoadBalancerPoolMember getLoadBalancerPoolMember() {
+        return loadBalancerPoolMember;
+    }
 
     @Override
     public String toString() {
@@ -143,6 +173,21 @@ public class NorthboundEvent extends AbstractEvent {
                 return false;
         } else if (!neutronNetwork.equals(other.neutronNetwork))
             return false;
+        if (loadBalancer == null) {
+            if (other.loadBalancer != null)
+                return false;
+        } else if (!loadBalancer.equals(other.loadBalancer))
+            return false;
+        if (loadBalancerPool == null) {
+            if (other.loadBalancerPool != null)
+                return false;
+        } else if (!loadBalancerPool.equals(other.loadBalancerPool))
+            return false;
+        if (loadBalancerPoolMember == null) {
+            if (other.loadBalancerPoolMember != null)
+                return false;
+        } else if (!loadBalancerPoolMember.equals(other.loadBalancerPoolMember))
+            return false;
         return true;
     }
 }