Fixing socket for vpp endpoint

[groupbasedpolicy.git] / neutron-vpp-mapper / src / main / java / org / opendaylight / groupbasedpolicy / neutron / vpp / mapper / processors / NeutronListener.java

diff --git a/neutron-vpp-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/vpp/mapper/processors/NeutronListener.java b/neutron-vpp-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/vpp/mapper/processors/NeutronListener.java
index d8b5073dd3b67b1de752aed640b58d3133be6dd6..e4fe158c57cd8f7c669a855ffd100cab29449d2f 100644 (file)
--- a/neutron-vpp-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/vpp/mapper/processors/NeutronListener.java
+++ b/neutron-vpp-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/vpp/mapper/processors/NeutronListener.java
@@ -1,5 +1,5 @@
 /*\r
- * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved.\r
+ * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved.\r
  *\r
  * This program and the accompanying materials are made available under the\r
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
@@ -16,10 +16,10 @@ import java.util.List;
 import java.util.Set;\r
 import java.util.concurrent.ExecutionException;\r
 \r
+import org.opendaylight.controller.md.sal.binding.api.ClusteredDataTreeChangeListener;\r
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;\r
 import org.opendaylight.controller.md.sal.binding.api.DataObjectModification;\r
 import org.opendaylight.controller.md.sal.binding.api.DataObjectModification.ModificationType;\r
-import org.opendaylight.controller.md.sal.binding.api.DataTreeChangeListener;\r
 import org.opendaylight.controller.md.sal.binding.api.DataTreeIdentifier;\r
 import org.opendaylight.controller.md.sal.binding.api.DataTreeModification;\r
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;\r
@@ -31,10 +31,11 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.PathArgument;
 import org.slf4j.Logger;\r
 import org.slf4j.LoggerFactory;\r
 \r
+import com.google.common.annotations.VisibleForTesting;\r
 import com.google.common.collect.Iterators;\r
 import com.google.common.collect.PeekingIterator;\r
 \r
-public class NeutronListener implements DataTreeChangeListener<Neutron>, Closeable {\r
+public class NeutronListener implements ClusteredDataTreeChangeListener<Neutron>, Closeable {\r
 \r
     private static final Logger LOG = LoggerFactory.getLogger(NeutronListener.class);\r
 \r
@@ -49,7 +50,8 @@ public class NeutronListener implements DataTreeChangeListener<Neutron>, Closeab
 \r
     private void registerHandlersAndListeners(DataBroker dataBroker) {\r
         PortHandler portHandler = new PortHandler(dataBroker);\r
-        dataChangeProviders.add(new BaseEndpointByPortListener(portHandler, dataBroker));\r
+        dataChangeProviders.add(new PortAware(portHandler, dataBroker));\r
+        dataChangeProviders.add(new NetworkAware(dataBroker));\r
     }\r
 \r
     @Override\r
@@ -115,6 +117,16 @@ public class NeutronListener implements DataTreeChangeListener<Neutron>, Closeab
         }\r
     }\r
 \r
+    @VisibleForTesting\r
+    void clearDataChangeProviders() {\r
+        dataChangeProviders.clear();\r
+    }\r
+\r
+    @VisibleForTesting\r
+    <T extends DataObject> void addDataChangeProvider(MappingProvider<T> t) {\r
+        dataChangeProviders.add(t);\r
+    }\r
+\r
     @Override\r
     public void close() {\r
         registeredListener.close();\r