MRI version bumpup for Aluminium

[netvirt.git] / neutronvpn / impl / src / main / java / org / opendaylight / netvirt / neutronvpn / NeutronSecurityGroupListener.java

diff --git a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronSecurityGroupListener.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronSecurityGroupListener.java
index d6c0b30c46e01480571eec8859ee091bb6e342c9..2133dca65e75004c804fa2eef3cadb2cc7a8d3e6 100644 (file)
--- a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronSecurityGroupListener.java
+++ b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronSecurityGroupListener.java
@@ -7,22 +7,20 @@
  */
 package org.opendaylight.netvirt.neutronvpn;
 
-import static org.opendaylight.controller.md.sal.binding.api.WriteTransaction.CREATE_MISSING_PARENTS;
 import static org.opendaylight.genius.infra.Datastore.CONFIGURATION;
 
 import java.util.ArrayList;
 import java.util.Collections;
-
-import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;
-
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.genius.datastoreutils.AsyncDataTreeChangeListenerBase;
 import org.opendaylight.genius.infra.ManagedNewTransactionRunner;
 import org.opendaylight.genius.infra.ManagedNewTransactionRunnerImpl;
 import org.opendaylight.infrautils.jobcoordinator.JobCoordinator;
+import org.opendaylight.infrautils.utils.concurrent.Executors;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
+import org.opendaylight.serviceutils.tools.listener.AbstractAsyncDataTreeChangeListener;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160218.AccessLists;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160218.access.lists.Acl;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160218.access.lists.AclBuilder;
@@ -38,8 +36,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @Singleton
-public class NeutronSecurityGroupListener
-        extends AsyncDataTreeChangeListenerBase<SecurityGroup, NeutronSecurityGroupListener> {
+public class NeutronSecurityGroupListener extends AbstractAsyncDataTreeChangeListener<SecurityGroup> {
     private static final Logger LOG = LoggerFactory.getLogger(NeutronSecurityGroupListener.class);
     private final DataBroker dataBroker;
     private final ManagedNewTransactionRunner txRunner;
@@ -49,28 +46,30 @@ public class NeutronSecurityGroupListener
     @Inject
     public NeutronSecurityGroupListener(DataBroker dataBroker, JobCoordinator jobCoordinator,
             final NeutronSecurityGroupUtils neutronSecurityGroupUtils) {
-        super(SecurityGroup.class, NeutronSecurityGroupListener.class);
+        super(dataBroker, LogicalDatastoreType.CONFIGURATION, InstanceIdentifier.create(Neutron.class)
+                .child(SecurityGroups.class).child(SecurityGroup.class),
+                Executors.newSingleThreadExecutor("NeutronSecurityGroupListener", LOG));
         this.dataBroker = dataBroker;
         this.jobCoordinator = jobCoordinator;
         this.txRunner = new ManagedNewTransactionRunnerImpl(dataBroker);
         this.neutronSecurityGroupUtils = neutronSecurityGroupUtils;
+        init();
     }
 
-    @Override
-    @PostConstruct
     public void init() {
         LOG.info("{} init", getClass().getSimpleName());
         neutronSecurityGroupUtils.createAclIdPool();
-        registerListener(LogicalDatastoreType.CONFIGURATION, dataBroker);
     }
 
     @Override
-    protected InstanceIdentifier<SecurityGroup> getWildCardPath() {
-        return InstanceIdentifier.create(Neutron.class).child(SecurityGroups.class).child(SecurityGroup.class);
+    @PreDestroy
+    public void close() {
+        super.close();
+        Executors.shutdownAndAwaitTermination(getExecutorService());
     }
 
     @Override
-    protected void remove(InstanceIdentifier<SecurityGroup> key, SecurityGroup securityGroup) {
+    public void remove(InstanceIdentifier<SecurityGroup> key, SecurityGroup securityGroup) {
         LOG.trace("Removing securityGroup: {}", securityGroup);
         InstanceIdentifier<Acl> identifier = getAclInstanceIdentifier(securityGroup);
         String securityGroupId = securityGroup.key().getUuid().getValue();
@@ -82,13 +81,13 @@ public class NeutronSecurityGroupListener
     }
 
     @Override
-    protected void update(InstanceIdentifier<SecurityGroup> key, SecurityGroup dataObjectModificationBefore,
+    public void update(InstanceIdentifier<SecurityGroup> key, SecurityGroup dataObjectModificationBefore,
         SecurityGroup dataObjectModificationAfter) {
         LOG.debug("Do nothing");
     }
 
     @Override
-    protected void add(InstanceIdentifier<SecurityGroup> instanceIdentifier, SecurityGroup securityGroup) {
+    public void add(InstanceIdentifier<SecurityGroup> instanceIdentifier, SecurityGroup securityGroup) {
         LOG.trace("Adding securityGroup: {}", securityGroup);
         String securityGroupId = securityGroup.key().getUuid().getValue();
         InstanceIdentifier<Acl> identifier = getAclInstanceIdentifier(securityGroup);
@@ -96,15 +95,10 @@ public class NeutronSecurityGroupListener
             Integer aclTag = neutronSecurityGroupUtils.allocateAclTag(securityGroupId);
             Acl acl = toAclBuilder(securityGroup, aclTag).build();
             return Collections.singletonList(txRunner.callWithNewWriteOnlyTransactionAndSubmit(CONFIGURATION,
-                tx -> tx.put(identifier, acl, CREATE_MISSING_PARENTS)));
+                tx -> tx.mergeParentStructurePut(identifier, acl)));
         });
     }
 
-    @Override
-    protected NeutronSecurityGroupListener getDataTreeChangeListener() {
-        return this;
-    }
-
     private InstanceIdentifier<Acl> getAclInstanceIdentifier(SecurityGroup securityGroup) {
         return InstanceIdentifier
             .builder(AccessLists.class).child(Acl.class,