Bulk merge of l2gw changes

[netvirt.git] / elanmanager / impl / src / main / java / org / opendaylight / netvirt / elan / l2gw / utils / ElanRefUtil.java

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/ElanRefUtil.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/ElanRefUtil.java
index 44989fccefe1b0e7cdf0a1ce0e49cb3575c783c3..f9e1faae983da450456c00377b68d234e6aef31e 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/ElanRefUtil.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/ElanRefUtil.java
@@ -11,11 +11,15 @@ import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.opendaylight.infrautils.jobcoordinator.JobCoordinator;
 import org.opendaylight.mdsal.binding.api.DataBroker;
-import org.opendaylight.netvirt.elan.cache.ConfigMcastCache;
 import org.opendaylight.netvirt.elan.cache.ElanInstanceCache;
 import org.opendaylight.netvirt.elan.cache.ElanInstanceDpnsCache;
 import org.opendaylight.netvirt.elan.cache.ElanInterfaceCache;
+import org.opendaylight.netvirt.elan.internal.ElanGroupCache;
+import org.opendaylight.netvirt.elan.l2gw.listeners.ElanMacTableCache;
+import org.opendaylight.netvirt.elan.l2gw.listeners.HwvtepConfigNodeCache;
 import org.opendaylight.netvirt.elan.utils.ElanClusterUtils;
+import org.opendaylight.netvirt.elan.utils.ElanItmUtils;
+import org.opendaylight.netvirt.elan.utils.ElanUtils;
 import org.opendaylight.netvirt.elan.utils.Scheduler;
 
 @Singleton
@@ -28,23 +32,35 @@ public class ElanRefUtil {
     private final ElanInstanceCache elanInstanceCache;
     private final ElanInstanceDpnsCache elanInstanceDpnsCache;
     private final ElanInterfaceCache elanInterfaceCache;
-    private final ConfigMcastCache configMcastCache;
+    private final ElanMacTableCache elanMacTableCache;
+    private final ElanGroupCache elanGroupCache;
+    private final HwvtepConfigNodeCache hwvtepConfigNodeCache;
+    private final ElanUtils elanUtils;
+    private final ElanItmUtils elanItmUtils;
 
     @Inject
     public ElanRefUtil(DataBroker dataBroker,
                        ElanClusterUtils elanClusterUtils,
+                       ElanGroupCache elanGroupCache,
                        ElanInstanceCache elanInstanceCache,
                        ElanInstanceDpnsCache elanInstanceDpnsCache,
                        ElanInterfaceCache elanInterfaceCache,
-                       ConfigMcastCache configMcastCache,
+                       ElanItmUtils elanItmUtils,
+                       ElanMacTableCache elanMacTableCache,
+                       ElanUtils elanUtils,
+                       HwvtepConfigNodeCache hwvtepConfigNodeCache,
                        JobCoordinator jobCoordinator,
                        Scheduler scheduler) {
         this.dataBroker = dataBroker;
         this.elanClusterUtils = elanClusterUtils;
+        this.elanGroupCache = elanGroupCache;
         this.elanInstanceCache = elanInstanceCache;
         this.elanInstanceDpnsCache = elanInstanceDpnsCache;
         this.elanInterfaceCache = elanInterfaceCache;
-        this.configMcastCache = configMcastCache;
+        this.elanItmUtils = elanItmUtils;
+        this.elanMacTableCache = elanMacTableCache;
+        this.elanUtils = elanUtils;
+        this.hwvtepConfigNodeCache = hwvtepConfigNodeCache;
         this.jobCoordinator = jobCoordinator;
         this.scheduler = scheduler;
     }
@@ -57,6 +73,10 @@ public class ElanRefUtil {
         return elanClusterUtils;
     }
 
+    public ElanGroupCache getElanGroupCache() {
+        return elanGroupCache;
+    }
+
     public ElanInstanceCache getElanInstanceCache() {
         return elanInstanceCache;
     }
@@ -69,6 +89,22 @@ public class ElanRefUtil {
         return elanInterfaceCache;
     }
 
+    public ElanItmUtils getElanItmUtils() {
+        return elanItmUtils;
+    }
+
+    public ElanMacTableCache getElanMacTableCache() {
+        return elanMacTableCache;
+    }
+
+    public ElanUtils getElanUtils() {
+        return elanUtils;
+    }
+
+    public HwvtepConfigNodeCache getHwvtepConfigNodeCache() {
+        return hwvtepConfigNodeCache;
+    }
+
     public JobCoordinator getJobCoordinator() {
         return jobCoordinator;
     }
@@ -76,8 +112,4 @@ public class ElanRefUtil {
     public Scheduler getScheduler() {
         return scheduler;
     }
-
-    public ConfigMcastCache getConfigMcastCache() {
-        return configMcastCache;
-    }
 }
\ No newline at end of file