Convert Vpn Utilities to Singleton

[netvirt.git] / vpnmanager / impl / src / main / java / org / opendaylight / netvirt / vpnmanager / intervpnlink / InterVpnLinkLocator.java

diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkLocator.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkLocator.java
index 8acffceef17bc118436ce8e595b37b35c8938cec..9c26f5584dc443201293e00d2eb95995267ba705 100644 (file)
--- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkLocator.java
+++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkLocator.java
@@ -42,11 +42,14 @@ public class InterVpnLinkLocator {
 
     private final DataBroker dataBroker;
     private final InterVpnLinkCache interVpnLinkCache;
+    private final VpnUtil vpnUtil;
 
     @Inject
-    public InterVpnLinkLocator(final DataBroker dataBroker, final InterVpnLinkCache interVpnLinkCache) {
+    public InterVpnLinkLocator(final DataBroker dataBroker, final InterVpnLinkCache interVpnLinkCache,
+                               final VpnUtil vpnUtil) {
         this.dataBroker = dataBroker;
         this.interVpnLinkCache = interVpnLinkCache;
+        this.vpnUtil = vpnUtil;
     }
 
     /**
@@ -162,8 +165,8 @@ public class InterVpnLinkLocator {
     }
 
     private List<String> getIRTsByVpnName(String vpnName) {
-        String vpn1Rd = VpnUtil.getVpnRd(dataBroker, vpnName);
-        final VpnInstanceOpDataEntry vpnInstance = VpnUtil.getVpnInstanceOpData(dataBroker, vpn1Rd);
+        String vpn1Rd = vpnUtil.getVpnRd(vpnName);
+        final VpnInstanceOpDataEntry vpnInstance = vpnUtil.getVpnInstanceOpData(vpn1Rd);
         return getRts(vpnInstance, VpnTarget.VrfRTType.ImportExtcommunity);
     }