apply checkstyle check during build for neutron-ovsdb

[groupbasedpolicy.git] / neutron-ovsdb / src / main / java / org / opendaylight / groupbasedpolicy / neutron / ovsdb / NeutronOvsdb.java

diff --git a/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/NeutronOvsdb.java b/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/NeutronOvsdb.java
index ae4ce1ee6fa14c5a60728d7841094dd9b948df7e..0f115816d32aaec802c266a46dd33a9aec554bb3 100644 (file)
--- a/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/NeutronOvsdb.java
+++ b/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/NeutronOvsdb.java
@@ -10,41 +10,37 @@ package org.opendaylight.groupbasedpolicy.neutron.ovsdb;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.endpoint.rev140421.EndpointService;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceRegistration;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.neutron.ovsdb.params.rev160812.IntegrationBridgeSetting;
 
 public class NeutronOvsdb implements AutoCloseable {
 
-    private final List<ServiceRegistration<?>> registrations = new ArrayList<ServiceRegistration<?>>();
     private final TerminationPointDataChangeListener tpListener;
-    private final NodeDataChangeListener nodeListener;
-    private final NeutronGbpFloatingIpListener neutronGbpFloatingIpListener;
+    private final PortByEndpointListener portByEndpointListener;
+    private final OvsdbNodeListener ovsdbNodeListener;
+    private final ProviderPhysicalNetworkListener provPhysNetListener;
 
-    public NeutronOvsdb(DataBroker dataProvider, RpcProviderRegistry rpcProvider, BundleContext context) {
+    public NeutronOvsdb(DataBroker dataProvider, EndpointService epService,
+            IntegrationBridgeSetting integrationbridgeSettings) {
         checkNotNull(dataProvider);
-        checkNotNull(rpcProvider);
-        checkNotNull(context);
-
-        EndpointService epService = rpcProvider.getRpcService(EndpointService.class);
         tpListener = new TerminationPointDataChangeListener(dataProvider, epService);
-        nodeListener = new NodeDataChangeListener(dataProvider);
-        neutronGbpFloatingIpListener = new NeutronGbpFloatingIpListener(dataProvider);
+        ovsdbNodeListener = new OvsdbNodeListener(dataProvider, integrationbridgeSettings);
+        portByEndpointListener = new PortByEndpointListener(dataProvider);
+        provPhysNetListener = new ProviderPhysicalNetworkListener(dataProvider);
     }
 
     /**
+     * Used to properly close running instance.
+     *
      * @see java.lang.AutoCloseable#close()
      */
     @Override
     public void close() throws Exception {
-        for (ServiceRegistration<?> registration : registrations) {
-            registration.unregister();
-        }
+        tpListener.close();
+        ovsdbNodeListener.close();
+        portByEndpointListener.close();
+        provPhysNetListener.close();
     }
 
 }