Convert to JobCoordinator in policyservice-impl

DataStoreJobCoordinator is deprecated so convert to use JobCoordinator.

Change-Id: I4e12d77e8626a7638c3cd4ada700061ee5ae81ae
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>

diff --git a/vpnservice/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/PolicyAceFlowProgrammer.java b/vpnservice/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/PolicyAceFlowProgrammer.java
index 3e90e7d39f11814e860f8158e8f607b3905b4de6..69ef5a68a50252355bb2ef51360af9f37ed8eaf6 100644 (file)
--- a/vpnservice/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/PolicyAceFlowProgrammer.java
+++ b/vpnservice/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/PolicyAceFlowProgrammer.java
@@ -20,11 +20,11 @@ import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
-import org.opendaylight.genius.datastoreutils.DataStoreJobCoordinator;
 import org.opendaylight.genius.interfacemanager.interfaces.IInterfaceManager;
 import org.opendaylight.genius.mdsalutil.InstructionInfo;
 import org.opendaylight.genius.mdsalutil.MatchInfoBase;
 import org.opendaylight.genius.mdsalutil.NwConstants;
+import org.opendaylight.infrautils.jobcoordinator.JobCoordinator;
 import org.opendaylight.netvirt.aclservice.api.utils.IAclServiceUtil;
 import org.opendaylight.netvirt.policyservice.util.PolicyServiceFlowUtil;
 import org.opendaylight.netvirt.policyservice.util.PolicyServiceUtil;
@@ -57,19 +57,20 @@ public class PolicyAceFlowProgrammer {
     private final PolicyIdManager policyIdManager;
     private final PolicyServiceUtil policyServiceUtil;
     private final PolicyServiceFlowUtil policyFlowUtil;
-    private final DataStoreJobCoordinator coordinator;
+    private final JobCoordinator coordinator;
 
     @Inject
     public PolicyAceFlowProgrammer(final DataBroker dataBroker, final IAclServiceUtil aclServiceUtil,
             final IInterfaceManager interfaceManager, final PolicyIdManager policyIdManager,
-            final PolicyServiceUtil policyServiceUtil, final PolicyServiceFlowUtil policyFlowUtil) {
+            final PolicyServiceUtil policyServiceUtil, final PolicyServiceFlowUtil policyFlowUtil,
+            final JobCoordinator coordinator) {
         this.dataBroker = dataBroker;
         this.aclServiceUtil = aclServiceUtil;
         this.interfaceManager = interfaceManager;
         this.policyIdManager = policyIdManager;
         this.policyServiceUtil = policyServiceUtil;
         this.policyFlowUtil = policyFlowUtil;
-        this.coordinator = DataStoreJobCoordinator.getInstance();
+        this.coordinator = coordinator;
     }
 
     public void programAceFlows(Ace ace, BigInteger dpId, int addOrRemove) {

diff --git a/vpnservice/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/PolicyRouteFlowProgrammer.java b/vpnservice/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/PolicyRouteFlowProgrammer.java
index abec96da0648f9a709af7276c94e537730b2da25..42c33523f7526c54d1ec759698c42edb7f4c4318 100644 (file)
--- a/vpnservice/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/PolicyRouteFlowProgrammer.java
+++ b/vpnservice/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/PolicyRouteFlowProgrammer.java
@@ -9,20 +9,17 @@
 package org.opendaylight.netvirt.policyservice;
 
 import com.google.common.base.Optional;
-
 import java.math.BigInteger;
 import java.util.Collections;
 import java.util.List;
-
 import javax.inject.Inject;
 import javax.inject.Singleton;
-
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
-import org.opendaylight.genius.datastoreutils.DataStoreJobCoordinator;
 import org.opendaylight.genius.mdsalutil.InstructionInfo;
 import org.opendaylight.genius.mdsalutil.MatchInfoBase;
 import org.opendaylight.genius.mdsalutil.NwConstants;
+import org.opendaylight.infrautils.jobcoordinator.JobCoordinator;
 import org.opendaylight.netvirt.policyservice.util.PolicyServiceFlowUtil;
 import org.opendaylight.netvirt.policyservice.util.PolicyServiceUtil;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.GroupTypes;
@@ -46,16 +43,17 @@ public class PolicyRouteFlowProgrammer {
     private final PolicyIdManager policyIdManager;
     private final PolicyServiceUtil policyServiceUtil;
     private final PolicyServiceFlowUtil policyFlowUtil;
-    private final DataStoreJobCoordinator coordinator;
+    private final JobCoordinator coordinator;
 
     @Inject
     public PolicyRouteFlowProgrammer(final DataBroker dataBroker, final PolicyIdManager policyIdManager,
-            final PolicyServiceUtil policyServiceUtil, final PolicyServiceFlowUtil policyFlowUtil) {
+            final PolicyServiceUtil policyServiceUtil, final PolicyServiceFlowUtil policyFlowUtil,
+            final JobCoordinator coordinator) {
         this.dataBroker = dataBroker;
         this.policyIdManager = policyIdManager;
         this.policyServiceUtil = policyServiceUtil;
         this.policyFlowUtil = policyFlowUtil;
-        this.coordinator = DataStoreJobCoordinator.getInstance();
+        this.coordinator = coordinator;
     }
 
     public void programPolicyClassifierFlows(String policyClassifierName, List<BigInteger> localDpIds,

diff --git a/vpnservice/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/PolicyRouteGroupProgrammer.java b/vpnservice/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/PolicyRouteGroupProgrammer.java
index 27a74a051dead37f6016eed1d8e6474374362683..2c3125d2fc8a604d36f109642063fedcfaa72bfe 100644 (file)
--- a/vpnservice/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/PolicyRouteGroupProgrammer.java
+++ b/vpnservice/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/PolicyRouteGroupProgrammer.java
@@ -11,13 +11,11 @@ package org.opendaylight.netvirt.policyservice;
 import java.math.BigInteger;
 import java.util.Collections;
 import java.util.List;
-
 import javax.inject.Inject;
 import javax.inject.Singleton;
-
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
-import org.opendaylight.genius.datastoreutils.DataStoreJobCoordinator;
+import org.opendaylight.infrautils.jobcoordinator.JobCoordinator;
 import org.opendaylight.netvirt.policyservice.util.PolicyServiceFlowUtil;
 import org.opendaylight.netvirt.policyservice.util.PolicyServiceUtil;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.GroupTypes;
@@ -44,16 +42,17 @@ public class PolicyRouteGroupProgrammer {
     private final PolicyIdManager policyIdManager;
     private final PolicyServiceUtil policyServiceUtil;
     private final PolicyServiceFlowUtil policyServiceFlowUtil;
-    private final DataStoreJobCoordinator coordinator;
+    private final JobCoordinator coordinator;
 
     @Inject
     public PolicyRouteGroupProgrammer(final DataBroker dataBroker, final PolicyIdManager policyIdManager,
-            final PolicyServiceUtil policyServiceUtil, final PolicyServiceFlowUtil policyServiceFlowUtil) {
+            final PolicyServiceUtil policyServiceUtil, final PolicyServiceFlowUtil policyServiceFlowUtil,
+            final JobCoordinator coordinator) {
         this.dataBroker = dataBroker;
         this.policyIdManager = policyIdManager;
         this.policyServiceUtil = policyServiceUtil;
         this.policyServiceFlowUtil = policyServiceFlowUtil;
-        this.coordinator = DataStoreJobCoordinator.getInstance();
+        this.coordinator = coordinator;
     }
 
     public void programPolicyClassifierGroups(String policyClassifier, List<BigInteger> localDpIds,

diff --git a/vpnservice/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/listeners/TunnelStateChangeListener.java b/vpnservice/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/listeners/TunnelStateChangeListener.java
index 8e0f61b2f04046c288e3d49d8df49999240b4157..7d5633f4fdc689be4a7194747afa2a039222d3bc 100644 (file)
--- a/vpnservice/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/listeners/TunnelStateChangeListener.java
+++ b/vpnservice/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/listeners/TunnelStateChangeListener.java
@@ -11,19 +11,17 @@ package org.opendaylight.netvirt.policyservice.listeners;
 import java.math.BigInteger;
 import java.util.Collections;
 import java.util.List;
-
 import javax.annotation.PostConstruct;
 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.datastoreutils.DataStoreJobCoordinator;
 import org.opendaylight.genius.interfacemanager.globals.InterfaceServiceUtil;
 import org.opendaylight.genius.interfacemanager.interfaces.IInterfaceManager;
 import org.opendaylight.genius.mdsalutil.MDSALUtil;
 import org.opendaylight.genius.mdsalutil.NwConstants;
+import org.opendaylight.infrautils.jobcoordinator.JobCoordinator;
 import org.opendaylight.netvirt.policyservice.PolicyRouteFlowProgrammer;
 import org.opendaylight.netvirt.policyservice.PolicyServiceConstants;
 import org.opendaylight.netvirt.policyservice.util.PolicyServiceUtil;
@@ -60,16 +58,17 @@ public class TunnelStateChangeListener
     private final PolicyServiceUtil policyServiceUtil;
     private final PolicyRouteFlowProgrammer routeFlowProgrammer;
     private final IInterfaceManager interfaceManager;
-    private final DataStoreJobCoordinator coordinator;
+    private final JobCoordinator coordinator;
 
     @Inject
     public TunnelStateChangeListener(DataBroker dataBroker, final PolicyServiceUtil policyServiceUtil,
-            final PolicyRouteFlowProgrammer routeFlowProgrammer, final IInterfaceManager interfaceManager) {
+            final PolicyRouteFlowProgrammer routeFlowProgrammer, final IInterfaceManager interfaceManager,
+            final JobCoordinator coordinator) {
         this.dataBroker = dataBroker;
         this.policyServiceUtil = policyServiceUtil;
         this.routeFlowProgrammer = routeFlowProgrammer;
         this.interfaceManager = interfaceManager;
-        this.coordinator = DataStoreJobCoordinator.getInstance();
+        this.coordinator = coordinator;
     }
 
     @Override

diff --git a/vpnservice/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/util/PolicyServiceUtil.java b/vpnservice/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/util/PolicyServiceUtil.java
index 1c3d2d013070a85665874e68f0ff245f8bde4ab7..5554bfc0f4f526cec02161ddb853184491fcb03f 100644 (file)
--- a/vpnservice/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/util/PolicyServiceUtil.java
+++ b/vpnservice/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/util/PolicyServiceUtil.java
@@ -9,7 +9,6 @@
 package org.opendaylight.netvirt.policyservice.util;
 
 import com.google.common.base.Optional;
-
 import java.math.BigInteger;
 import java.util.Collection;
 import java.util.Collections;
@@ -19,19 +18,17 @@ import java.util.Objects;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.stream.Collectors;
-
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
 import javax.inject.Singleton;
-
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
-import org.opendaylight.genius.datastoreutils.DataStoreJobCoordinator;
 import org.opendaylight.genius.datastoreutils.SingleTransactionDataBroker;
 import org.opendaylight.genius.interfacemanager.globals.InterfaceInfo;
 import org.opendaylight.genius.interfacemanager.interfaces.IInterfaceManager;
+import org.opendaylight.infrautils.jobcoordinator.JobCoordinator;
 import org.opendaylight.netvirt.elanmanager.api.IElanBridgeManager;
 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.AclBase;
@@ -92,16 +89,17 @@ public class PolicyServiceUtil {
     private final IElanBridgeManager bridgeManager;
     private final ItmRpcService itmRpcService;
     private final IInterfaceManager interfaceManager;
-    private final DataStoreJobCoordinator coordinator;
+    private final JobCoordinator coordinator;
 
     @Inject
     public PolicyServiceUtil(final DataBroker dataBroker, final IElanBridgeManager bridgeManager,
-            final ItmRpcService itmRpcService, final IInterfaceManager interfaceManager) {
+            final ItmRpcService itmRpcService, final IInterfaceManager interfaceManager,
+            final JobCoordinator coordinator) {
         this.dataBroker = dataBroker;
         this.bridgeManager = bridgeManager;
         this.itmRpcService = itmRpcService;
         this.interfaceManager = interfaceManager;
-        this.coordinator = DataStoreJobCoordinator.getInstance();
+        this.coordinator = coordinator;
     }
 
     public Optional<String> getAcePolicyClassifier(Ace ace) {

diff --git a/vpnservice/policyservice/impl/src/main/resources/org/opendaylight/blueprint/policyservice.xml b/vpnservice/policyservice/impl/src/main/resources/org/opendaylight/blueprint/policyservice.xml
index 143e5164f994604d1cbd1ffd33415b7669880085..722db1d1082fa1e1ab37bae173e9133885fe6809 100644 (file)
--- a/vpnservice/policyservice/impl/src/main/resources/org/opendaylight/blueprint/policyservice.xml
+++ b/vpnservice/policyservice/impl/src/main/resources/org/opendaylight/blueprint/policyservice.xml
@@ -18,6 +18,8 @@
     interface="org.opendaylight.netvirt.elanmanager.api.IElanService" />
   <reference id="iVpnManager"
     interface="org.opendaylight.netvirt.vpnmanager.api.IVpnManager" />
+  <reference id="jobCoordinator"
+             interface="org.opendaylight.infrautils.jobcoordinator.JobCoordinator"/>
 
   <odl:rpc-service id="itmRpcService"
     interface="org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.rpcs.rev160406.ItmRpcService" />