Fixed classcast exceptions while processing the events

Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>

diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/translator/iaware/impl/NeutronFloatingIPChangeListener.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/translator/iaware/impl/NeutronFloatingIPChangeListener.java
index 083d380b2dd7be25db48a982809f733cb9885772..7f86117824c45f350aed4025d4252525df90ecc8 100644 (file)
--- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/translator/iaware/impl/NeutronFloatingIPChangeListener.java
+++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/translator/iaware/impl/NeutronFloatingIPChangeListener.java
@@ -58,24 +58,27 @@ public class NeutronFloatingIPChangeListener implements DataChangeListener, Auto
             AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> changes,
             Object[] subscribers) {
         for (Entry<InstanceIdentifier<?>, DataObject> newFloatingIP : changes.getCreatedData().entrySet()) {
-            NeutronFloatingIP floatingip= fromMd((Floatingip)newFloatingIP.getValue());
-            for(Object entry: subscribers){
-                INeutronFloatingIPAware subscriber = (INeutronFloatingIPAware)entry;
-                subscriber.neutronFloatingIPCreated(floatingip);
-            }
+               if(newFloatingIP instanceof Floatingip){
+                NeutronFloatingIP floatingip= fromMd((Floatingip)newFloatingIP.getValue());
+                for(Object entry: subscribers){
+                    INeutronFloatingIPAware subscriber = (INeutronFloatingIPAware)entry;
+                    subscriber.neutronFloatingIPCreated(floatingip);
+                }
+               }
         }
-
     }
 
     private void updateFloatingIP(
             AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> changes,
             Object[] subscribers) {
         for (Entry<InstanceIdentifier<?>, DataObject> updateFloatingIP : changes.getUpdatedData().entrySet()) {
-            NeutronFloatingIP floatingip = fromMd((Floatingip)updateFloatingIP.getValue());
-            for(Object entry: subscribers){
-                INeutronFloatingIPAware subscriber = (INeutronFloatingIPAware)entry;
-                subscriber.neutronFloatingIPUpdated(floatingip);
-            }
+               if(updateFloatingIP instanceof Floatingip){
+                NeutronFloatingIP floatingip = fromMd((Floatingip)updateFloatingIP.getValue());
+                for(Object entry: subscribers){
+                    INeutronFloatingIPAware subscriber = (INeutronFloatingIPAware)entry;
+                    subscriber.neutronFloatingIPUpdated(floatingip);
+                }
+               }
         }
     }
 
@@ -83,11 +86,13 @@ public class NeutronFloatingIPChangeListener implements DataChangeListener, Auto
             AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> changes,
             Object[] subscribers) {
         for (InstanceIdentifier<?> deletedFloatingIPPath : changes.getRemovedPaths()) {
-            NeutronFloatingIP floatingip = fromMd((Floatingip)changes.getOriginalData().get(deletedFloatingIPPath));
-            for(Object entry: subscribers){
-                INeutronFloatingIPAware subscriber = (INeutronFloatingIPAware)entry;
-                subscriber.neutronFloatingIPDeleted(floatingip);
-            }
+               if(deletedFloatingIPPath.getTargetType().equals(Floatingip.class)){
+                NeutronFloatingIP floatingip = fromMd((Floatingip)changes.getOriginalData().get(deletedFloatingIPPath));
+                for(Object entry: subscribers){
+                    INeutronFloatingIPAware subscriber = (INeutronFloatingIPAware)entry;
+                    subscriber.neutronFloatingIPDeleted(floatingip);
+                }
+               }
         }
     }
 

diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/translator/iaware/impl/NeutronLoadBalancerPoolChangeListener.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/translator/iaware/impl/NeutronLoadBalancerPoolChangeListener.java
index 737461b68a33c82ba2fdf2a4c202034181b50862..5ad3163c1af00cbb00c9784b14f92ce5628d8fc7 100644 (file)
--- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/translator/iaware/impl/NeutronLoadBalancerPoolChangeListener.java
+++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/translator/iaware/impl/NeutronLoadBalancerPoolChangeListener.java
@@ -84,33 +84,39 @@ public class NeutronLoadBalancerPoolChangeListener implements DataChangeListener
             AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> changes,
             Object[] subscribers) {
         for (Entry<InstanceIdentifier<?>, DataObject> newPool : changes.getCreatedData().entrySet()) {
-            NeutronLoadBalancerPool loadBalancerPool = fromMd((Pool) newPool.getValue());
-            for (Object entry : subscribers) {
-                INeutronLoadBalancerPoolAware subscriber = (INeutronLoadBalancerPoolAware) entry;
-                subscriber.neutronLoadBalancerPoolCreated(loadBalancerPool);
-            }
+               if(newPool instanceof Pool){
+                NeutronLoadBalancerPool loadBalancerPool = fromMd((Pool) newPool.getValue());
+                for (Object entry : subscribers) {
+                    INeutronLoadBalancerPoolAware subscriber = (INeutronLoadBalancerPoolAware) entry;
+                    subscriber.neutronLoadBalancerPoolCreated(loadBalancerPool);
+                }
+               }
         }
     }
     private void updatePool(
             AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> changes,
             Object[] subscribers) {
         for (Entry<InstanceIdentifier<?>, DataObject> updatePool : changes.getUpdatedData().entrySet()) {
-            NeutronLoadBalancerPool loadBalancerPool = fromMd((Pool)updatePool.getValue());
-            for(Object entry: subscribers){
-                INeutronLoadBalancerPoolAware subscriber = (INeutronLoadBalancerPoolAware) entry;
-                subscriber.neutronLoadBalancerPoolUpdated(loadBalancerPool);
-            }
+               if(updatePool instanceof Pool){
+                NeutronLoadBalancerPool loadBalancerPool = fromMd((Pool)updatePool.getValue());
+                for(Object entry: subscribers){
+                    INeutronLoadBalancerPoolAware subscriber = (INeutronLoadBalancerPoolAware) entry;
+                    subscriber.neutronLoadBalancerPoolUpdated(loadBalancerPool);
+                }
+               }
         }
     }
     private void deletePool(
             AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> changes,
             Object[] subscribers) {
         for (InstanceIdentifier<?> deletedPoolPath : changes.getRemovedPaths()) {
-            NeutronLoadBalancerPool loadBalancerPool = fromMd((Pool)changes.getOriginalData().get(deletedPoolPath));
-            for(Object entry: subscribers){
-                INeutronLoadBalancerPoolAware subscriber = (INeutronLoadBalancerPoolAware) entry;
-                subscriber.neutronLoadBalancerPoolDeleted(loadBalancerPool);
-            }
+               if(deletedPoolPath.getTargetType().equals(Pool.class)){
+                NeutronLoadBalancerPool loadBalancerPool = fromMd((Pool)changes.getOriginalData().get(deletedPoolPath));
+                for(Object entry: subscribers){
+                    INeutronLoadBalancerPoolAware subscriber = (INeutronLoadBalancerPoolAware) entry;
+                    subscriber.neutronLoadBalancerPoolDeleted(loadBalancerPool);
+                }
+               }
         }
     }
 

diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/translator/iaware/impl/NeutronLoadBalancerPoolMemberChangeListener.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/translator/iaware/impl/NeutronLoadBalancerPoolMemberChangeListener.java
index fd8ed0f9a15e404bfa7763e042a19bb84bc583de..1e0d8a39623c5f7e684833026446709818e18995 100644 (file)
--- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/translator/iaware/impl/NeutronLoadBalancerPoolMemberChangeListener.java
+++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/translator/iaware/impl/NeutronLoadBalancerPoolMemberChangeListener.java
@@ -69,35 +69,41 @@ public class NeutronLoadBalancerPoolMemberChangeListener implements DataChangeLi
             AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> changes,
             Object[] subscribers) {
         for (Entry<InstanceIdentifier<?>, DataObject> newPoolMember : changes.getCreatedData().entrySet()) {
-            NeutronLoadBalancerPoolMember neutronLBPoolMember = fromMd(newPoolMember.getKey(), (Member) newPoolMember.getValue());
-            for (Object entry : subscribers) {
-                INeutronLoadBalancerPoolMemberAware subscriber = (INeutronLoadBalancerPoolMemberAware) entry;
-                subscriber.neutronLoadBalancerPoolMemberCreated(neutronLBPoolMember);
-            }
+               if(newPoolMember instanceof Member){
+                NeutronLoadBalancerPoolMember neutronLBPoolMember = fromMd(newPoolMember.getKey(), (Member) newPoolMember.getValue());
+                for (Object entry : subscribers) {
+                    INeutronLoadBalancerPoolMemberAware subscriber = (INeutronLoadBalancerPoolMemberAware) entry;
+                    subscriber.neutronLoadBalancerPoolMemberCreated(neutronLBPoolMember);
+                }
+               }
         }
     }
     private void updatePoolMember(
             AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> changes,
             Object[] subscribers) {
         for (Entry<InstanceIdentifier<?>, DataObject> updatePoolMember : changes.getUpdatedData().entrySet()) {
-            NeutronLoadBalancerPoolMember neutronLBPoolMember =
-                    fromMd(updatePoolMember.getKey(), (Member) updatePoolMember.getValue());
-            for(Object entry: subscribers){
-                INeutronLoadBalancerPoolMemberAware subscriber = (INeutronLoadBalancerPoolMemberAware) entry;
-                subscriber.neutronLoadBalancerPoolMemberUpdated(neutronLBPoolMember);
-            }
+               if(updatePoolMember instanceof Member){
+                NeutronLoadBalancerPoolMember neutronLBPoolMember =
+                        fromMd(updatePoolMember.getKey(), (Member) updatePoolMember.getValue());
+                for(Object entry: subscribers){
+                    INeutronLoadBalancerPoolMemberAware subscriber = (INeutronLoadBalancerPoolMemberAware) entry;
+                    subscriber.neutronLoadBalancerPoolMemberUpdated(neutronLBPoolMember);
+                }
+               }
         }
     }
     private void deletePoolMember(
             AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> changes,
             Object[] subscribers) {
         for (InstanceIdentifier<?> deletedPoolMemberPath : changes.getRemovedPaths()) {
-            NeutronLoadBalancerPoolMember neutronLBPoolMember =
-                    fromMd(deletedPoolMemberPath, (Member) changes.getOriginalData().get(deletedPoolMemberPath));
-            for(Object entry: subscribers){
-                INeutronLoadBalancerPoolMemberAware subscriber = (INeutronLoadBalancerPoolMemberAware) entry;
-                subscriber.neutronLoadBalancerPoolMemberDeleted(neutronLBPoolMember);
-            }
+               if(deletedPoolMemberPath.getTargetType().equals(Member.class)){
+                NeutronLoadBalancerPoolMember neutronLBPoolMember =
+                        fromMd(deletedPoolMemberPath, (Member) changes.getOriginalData().get(deletedPoolMemberPath));
+                for(Object entry: subscribers){
+                    INeutronLoadBalancerPoolMemberAware subscriber = (INeutronLoadBalancerPoolMemberAware) entry;
+                    subscriber.neutronLoadBalancerPoolMemberDeleted(neutronLBPoolMember);
+                }
+               }
         }
     }
 

diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/translator/iaware/impl/NeutronNetworkChangeListener.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/translator/iaware/impl/NeutronNetworkChangeListener.java
index 37b5efb958ecdaaf408d141044151c24c077aef9..3c3c5443fe0ef8f87ae819bef28c31792dfc8653 100644 (file)
--- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/translator/iaware/impl/NeutronNetworkChangeListener.java
+++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/translator/iaware/impl/NeutronNetworkChangeListener.java
@@ -80,24 +80,27 @@ public class NeutronNetworkChangeListener implements DataChangeListener, AutoClo
             AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> changes,
             Object[] subscribers) {
         for (Entry<InstanceIdentifier<?>, DataObject> newNetwork : changes.getCreatedData().entrySet()) {
-            NeutronNetwork network = fromMd((Network)newNetwork.getValue());
-            for(Object entry: subscribers){
-                INeutronNetworkAware subscriber = (INeutronNetworkAware)entry;
-                subscriber.neutronNetworkCreated(network);
-            }
+               if(newNetwork instanceof Network){
+                NeutronNetwork network = fromMd((Network)newNetwork.getValue());
+                for(Object entry: subscribers){
+                    INeutronNetworkAware subscriber = (INeutronNetworkAware)entry;
+                    subscriber.neutronNetworkCreated(network);
+                }
+               }
         }
-
     }
 
     private void updateNetwork(
             AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> changes,
             Object[] subscribers) {
         for (Entry<InstanceIdentifier<?>, DataObject> updateNetwork : changes.getUpdatedData().entrySet()) {
-            NeutronNetwork network = fromMd((Network)updateNetwork.getValue());
-            for(Object entry: subscribers){
-                INeutronNetworkAware subscriber = (INeutronNetworkAware)entry;
-                subscriber.neutronNetworkUpdated(network);
-            }
+               if(updateNetwork instanceof Network){
+                NeutronNetwork network = fromMd((Network)updateNetwork.getValue());
+                for(Object entry: subscribers){
+                    INeutronNetworkAware subscriber = (INeutronNetworkAware)entry;
+                    subscriber.neutronNetworkUpdated(network);
+                }
+               }
         }
     }
 
@@ -105,11 +108,13 @@ public class NeutronNetworkChangeListener implements DataChangeListener, AutoClo
             AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> changes,
             Object[] subscribers) {
         for (InstanceIdentifier<?> deletedNetworkPath : changes.getRemovedPaths()) {
-            NeutronNetwork network = fromMd((Network)changes.getOriginalData().get(deletedNetworkPath));
-            for(Object entry: subscribers){
-                INeutronNetworkAware subscriber = (INeutronNetworkAware)entry;
-                subscriber.neutronNetworkDeleted(network);
-            }
+               if(deletedNetworkPath.getTargetType().equals(Network.class)){
+                NeutronNetwork network = fromMd((Network)changes.getOriginalData().get(deletedNetworkPath));
+                for(Object entry: subscribers){
+                    INeutronNetworkAware subscriber = (INeutronNetworkAware)entry;
+                    subscriber.neutronNetworkDeleted(network);
+                }
+               }
         }
     }
 

diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/translator/iaware/impl/NeutronPortChangeListener.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/translator/iaware/impl/NeutronPortChangeListener.java
index 3c3f340ae374305a131924048c130d7467311c02..0d173e895c30b4efcb29943dab0b7f75fbb5e941 100644 (file)
--- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/translator/iaware/impl/NeutronPortChangeListener.java
+++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/translator/iaware/impl/NeutronPortChangeListener.java
@@ -75,24 +75,27 @@ public class NeutronPortChangeListener implements DataChangeListener, AutoClosea
             AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> changes,
             Object[] subscribers) {
         for (Entry<InstanceIdentifier<?>, DataObject> newPort : changes.getCreatedData().entrySet()) {
-            NeutronPort port = fromMd((Port)newPort.getValue());
-            for(Object entry: subscribers){
-                INeutronPortAware subscriber = (INeutronPortAware)entry;
-                subscriber.neutronPortCreated(port);
-            }
+               if(newPort instanceof Port){
+                NeutronPort port = fromMd((Port)newPort.getValue());
+                for(Object entry: subscribers){
+                    INeutronPortAware subscriber = (INeutronPortAware)entry;
+                    subscriber.neutronPortCreated(port);
+                }
+               }
         }
-
     }
 
     private void updatePort(
             AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> changes,
             Object[] subscribers) {
         for (Entry<InstanceIdentifier<?>, DataObject> updatePort : changes.getUpdatedData().entrySet()) {
-            NeutronPort port = fromMd((Port)updatePort.getValue());
-            for(Object entry: subscribers){
-                INeutronPortAware subscriber = (INeutronPortAware)entry;
-                subscriber.neutronPortUpdated(port);
-            }
+               if(updatePort instanceof Port){
+                NeutronPort port = fromMd((Port)updatePort.getValue());
+                for(Object entry: subscribers){
+                    INeutronPortAware subscriber = (INeutronPortAware)entry;
+                    subscriber.neutronPortUpdated(port);
+                }
+               }
         }
     }
 
@@ -100,11 +103,13 @@ public class NeutronPortChangeListener implements DataChangeListener, AutoClosea
             AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> changes,
             Object[] subscribers) {
         for (InstanceIdentifier<?> deletedPortPath : changes.getRemovedPaths()) {
-            NeutronPort port = fromMd((Port)changes.getOriginalData().get(deletedPortPath));
-            for(Object entry: subscribers){
-                INeutronPortAware subscriber = (INeutronPortAware)entry;
-                subscriber.neutronPortDeleted(port);
-            }
+               if(deletedPortPath.getTargetType().equals(Port.class)){
+                NeutronPort port = fromMd((Port)changes.getOriginalData().get(deletedPortPath));
+                for(Object entry: subscribers){
+                    INeutronPortAware subscriber = (INeutronPortAware)entry;
+                    subscriber.neutronPortDeleted(port);
+                }
+               }
         }
     }
 

diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/translator/iaware/impl/NeutronRouterChangeListener.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/translator/iaware/impl/NeutronRouterChangeListener.java
index 3da2cd3c710a66b48f401e0e2530806a8ab0a703..947451e43145a6cc054fdb0510a2ed629e04b307 100644 (file)
--- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/translator/iaware/impl/NeutronRouterChangeListener.java
+++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/translator/iaware/impl/NeutronRouterChangeListener.java
@@ -67,11 +67,13 @@ public class NeutronRouterChangeListener implements DataChangeListener, AutoClos
             AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> changes,
             Object[] subscribers) {
         for (Entry<InstanceIdentifier<?>, DataObject> newRouter : changes.getCreatedData().entrySet()) {
-            NeutronRouter router = fromMd((Router)newRouter.getValue());
-            for(Object entry: subscribers){
-                INeutronRouterAware subscriber = (INeutronRouterAware)entry;
-                subscriber.neutronRouterCreated(router);
-            }
+               if(newRouter instanceof Router){
+                NeutronRouter router = fromMd((Router)newRouter.getValue());
+                for(Object entry: subscribers){
+                    INeutronRouterAware subscriber = (INeutronRouterAware)entry;
+                    subscriber.neutronRouterCreated(router);
+                }
+               }
         }
 
     }
@@ -80,11 +82,13 @@ public class NeutronRouterChangeListener implements DataChangeListener, AutoClos
             AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> changes,
             Object[] subscribers) {
         for (Entry<InstanceIdentifier<?>, DataObject> updateRouter : changes.getUpdatedData().entrySet()) {
-            NeutronRouter router = fromMd((Router)updateRouter.getValue());
-            for(Object entry: subscribers){
-                INeutronRouterAware subscriber = (INeutronRouterAware)entry;
-                subscriber.neutronRouterUpdated(router);
-            }
+               if(updateRouter instanceof Router){
+                NeutronRouter router = fromMd((Router)updateRouter.getValue());
+                for(Object entry: subscribers){
+                    INeutronRouterAware subscriber = (INeutronRouterAware)entry;
+                    subscriber.neutronRouterUpdated(router);
+                }
+               }
         }
     }
 
@@ -92,11 +96,13 @@ public class NeutronRouterChangeListener implements DataChangeListener, AutoClos
             AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> changes,
             Object[] subscribers) {
         for (InstanceIdentifier<?> deletedRouterPath : changes.getRemovedPaths()) {
-            NeutronRouter router = fromMd((Router)changes.getOriginalData().get(deletedRouterPath));
-            for(Object entry: subscribers){
-                INeutronRouterAware subscriber = (INeutronRouterAware)entry;
-                subscriber.neutronRouterDeleted(router);
-            }
+               if(deletedRouterPath.getTargetType().equals(Router.class)){
+                NeutronRouter router = fromMd((Router)changes.getOriginalData().get(deletedRouterPath));
+                for(Object entry: subscribers){
+                    INeutronRouterAware subscriber = (INeutronRouterAware)entry;
+                    subscriber.neutronRouterDeleted(router);
+                }
+               }
         }
     }
 

diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/translator/iaware/impl/NeutronSubnetChangeListener.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/translator/iaware/impl/NeutronSubnetChangeListener.java
index 4ebb09db1ef251e8c7456477c4b0ee7857fa3bfb..fbf0003ab0623f4376abffc742ccbdc16f01207f 100644 (file)
--- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/translator/iaware/impl/NeutronSubnetChangeListener.java
+++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/translator/iaware/impl/NeutronSubnetChangeListener.java
@@ -93,24 +93,27 @@ public class NeutronSubnetChangeListener implements DataChangeListener, AutoClos
             AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> changes,
             Object[] subscribers) {
         for (Entry<InstanceIdentifier<?>, DataObject> newSubnet : changes.getCreatedData().entrySet()) {
-            NeutronSubnet subnet = fromMd((Subnet)newSubnet.getValue());
-            for(Object entry: subscribers){
-                INeutronSubnetAware subscriber = (INeutronSubnetAware)entry;
-                subscriber.neutronSubnetCreated(subnet);
-            }
+               if(newSubnet instanceof Subnet){
+                NeutronSubnet subnet = fromMd((Subnet)newSubnet.getValue());
+                for(Object entry: subscribers){
+                    INeutronSubnetAware subscriber = (INeutronSubnetAware)entry;
+                    subscriber.neutronSubnetCreated(subnet);
+                }
+               }
         }
-
     }
 
     private void updateSubnet(
             AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> changes,
             Object[] subscribers) {
         for (Entry<InstanceIdentifier<?>, DataObject> updateSubnet : changes.getUpdatedData().entrySet()) {
-            NeutronSubnet subnet = fromMd((Subnet)updateSubnet.getValue());
-            for(Object entry: subscribers){
-                INeutronSubnetAware subscriber = (INeutronSubnetAware)entry;
-                subscriber.neutronSubnetUpdated(subnet);
-            }
+               if(updateSubnet instanceof Subnet){
+                NeutronSubnet subnet = fromMd((Subnet)updateSubnet.getValue());
+                for(Object entry: subscribers){
+                    INeutronSubnetAware subscriber = (INeutronSubnetAware)entry;
+                    subscriber.neutronSubnetUpdated(subnet);
+                }
+               }
         }
     }
 
@@ -118,11 +121,13 @@ public class NeutronSubnetChangeListener implements DataChangeListener, AutoClos
             AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> changes,
             Object[] subscribers) {
         for (InstanceIdentifier<?> deletedSubnetPath : changes.getRemovedPaths()) {
-            NeutronSubnet subnet = fromMd((Subnet)changes.getOriginalData().get(deletedSubnetPath));
-            for(Object entry: subscribers){
-                INeutronSubnetAware subscriber = (INeutronSubnetAware)entry;
-                subscriber.neutronSubnetDeleted(subnet);
-            }
+               if(deletedSubnetPath.getTargetType().equals(Subnet.class)){
+                NeutronSubnet subnet = fromMd((Subnet)changes.getOriginalData().get(deletedSubnetPath));
+                for(Object entry: subscribers){
+                    INeutronSubnetAware subscriber = (INeutronSubnetAware)entry;
+                    subscriber.neutronSubnetDeleted(subnet);
+                }
+               }
         }
     }