X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=vpnservice%2Felanmanager%2Felanmanager-impl%2Fsrc%2Fmain%2Fresources%2Forg%2Fopendaylight%2Fblueprint%2Felanmanager.xml;h=64828a0bb4f4cdf5a9fdca6738d12457648d6af1;hb=df50caaabefc444ffaebdce32e7518bed3b9aa18;hp=4dd1dd1989afd3c20bf68df658619c6911813ac5;hpb=48bbcb6e3086fc09cbb827617a6756a2e95e471c;p=netvirt.git

diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/resources/org/opendaylight/blueprint/elanmanager.xml b/vpnservice/elanmanager/elanmanager-impl/src/main/resources/org/opendaylight/blueprint/elanmanager.xml
index 4dd1dd1989..64828a0bb4 100644
--- a/vpnservice/elanmanager/elanmanager-impl/src/main/resources/org/opendaylight/blueprint/elanmanager.xml
+++ b/vpnservice/elanmanager/elanmanager-impl/src/main/resources/org/opendaylight/blueprint/elanmanager.xml
@@ -24,8 +24,15 @@
   <odl:rpc-service id="idManagerService"
     interface="org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.IdManagerService" />
 
+  <odl:clustered-app-config id="elanConfig"
+                            binding-class="org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.config.rev150710.ElanConfig"
+                            default-config-file-name="netvirt-elanmanager-config.xml"
+                            update-strategy="none">
+  </odl:clustered-app-config>
+
   <bean id="elanBridgeManager" class="org.opendaylight.netvirt.elan.internal.ElanBridgeManager">
     <argument ref="dataBroker" />
+    <argument ref="elanConfig" />
   </bean>
 
   <bean id="elanForwardingEntriesHandler" class="org.opendaylight.netvirt.elan.utils.ElanForwardingEntriesHandler">
@@ -34,7 +41,7 @@
 
   <bean id="elanInterfaceManager"
     class="org.opendaylight.netvirt.elan.internal.ElanInterfaceManager"
-    destroy-method="close">
+    init-method="init" destroy-method="close">
     <argument ref="dataBroker" />
     <argument ref="idManagerService" />
     <argument ref="mdsalUtils" />
@@ -53,9 +60,10 @@
 
   <bean id="elanNodeListener"
     class="org.opendaylight.netvirt.elan.internal.ElanNodeListener"
-    destroy-method="close">
+    init-method="init" destroy-method="close">
     <argument ref="dataBroker" />
     <argument ref="mdsalUtils" />
+    <argument ref="elanConfig" />
   </bean>
 
   <bean id="elanPacketInHandler"
@@ -82,22 +90,20 @@
     <argument ref="itmRpcService" />
     <argument ref="elanInterfaceManager" />
     <argument ref="entityOwnershipService" />
+    <argument ref="interfaceManager" />
   </bean>
 
   <bean id="elanStatisticsImpl" class="org.opendaylight.netvirt.elan.statisitcs.ElanStatisticsImpl">
     <argument ref="dataBroker" />
     <argument ref="interfaceManager" />
-    <argument ref="mdsalUtils" />
-    <argument ref="elanUtils" />
   </bean>
   <odl:rpc-implementation ref="elanStatisticsImpl" />
 
   <bean id="elanInterfaceStateChangeListener"
-    class="org.opendaylight.netvirt.elan.internal.ElanInterfaceStateChangeListener">
+    class="org.opendaylight.netvirt.elan.internal.ElanInterfaceStateChangeListener"
+    init-method="init" destroy-method="close">
     <argument ref="dataBroker" />
     <argument ref="elanInterfaceManager" />
-    <argument ref="interfaceManager" />
-    <argument ref="elanUtils" />
   </bean>
 
   <bean id="elanInterfaceStateClusterListener"
@@ -110,12 +116,21 @@
   </bean>
 
   <bean id="elanDpnInterfaceClusteredListener"
-    class="org.opendaylight.netvirt.elan.internal.ElanDpnInterfaceClusteredListener">
+    class="org.opendaylight.netvirt.elan.internal.ElanDpnInterfaceClusteredListener"
+    init-method="init" destroy-method="close">
     <argument ref="dataBroker" />
     <argument ref="entityOwnershipService" />
     <argument ref="elanUtils" />
   </bean>
 
+  <bean id="elanVpnPortIpToPortListener"
+    class="org.opendaylight.netvirt.elan.internal.ElanLearntVpnVipToPortListener"
+    init-method="init" destroy-method="close">
+    <argument ref="dataBroker" />
+    <argument ref="interfaceManager" />
+    <argument ref="elanUtils" />
+  </bean>
+
   <bean id="elanService" class="org.opendaylight.netvirt.elan.internal.ElanServiceProvider"
     init-method="init">
     <argument ref="idManagerService" />
@@ -126,6 +141,7 @@
     <argument ref="elanInterfaceManager" />
     <argument ref="elanStatusMonitor" />
     <argument ref="elanUtils" />
+    <argument ref="entityOwnershipService" />
   </bean>
   <service ref="elanService" odl:type="default" interface="org.opendaylight.netvirt.elanmanager.api.IElanService" />
 
@@ -134,14 +150,19 @@
     <argument ref="dataBroker" />
   </bean>
 
+  <bean id="cacheElanInstanceListener" class="org.opendaylight.netvirt.elan.utils.CacheElanInstanceListener"
+    init-method="init" destroy-method="close">
+    <argument ref="dataBroker" />
+  </bean>
+
   <bean id="hwvtepLocalUcastMacListener" class="org.opendaylight.netvirt.elan.l2gw.listeners.HwvtepLocalUcastMacListener"
     init-method="init" destroy-method="close">
     <argument ref="dataBroker" />
     <argument ref="elanUtils" />
   </bean>
 
-  <bean id="elanStatusMonitor" class="org.opendaylight.netvirt.elan.statusanddiag.ElanStatusMonitor"
-    init-method="init" />
+  <bean id="elanStatusMonitor" class="org.opendaylight.netvirt.elan.statusanddiag.ElanStatusMonitorJMX"
+    init-method="init" destroy-method="close" />
 
   <bean id="l2GatewayConnectionListener"
     class="org.opendaylight.netvirt.elan.l2gw.listeners.L2GatewayConnectionListener"
@@ -166,4 +187,39 @@
     <argument ref="elanUtils" />
     <argument ref="entityOwnershipService" />
   </bean>
-</blueprint>
\ No newline at end of file
+
+  <bean id="haEventHandler" class="org.opendaylight.netvirt.elan.l2gw.ha.handlers.HAEventHandler">
+    <argument ref="dataBroker" />
+  </bean>
+
+  <bean id="haConfigNodeListener" class="org.opendaylight.netvirt.elan.l2gw.ha.listeners.HAConfigNodeListener">
+    <argument ref="dataBroker" />
+    <argument ref="haEventHandler" />
+  </bean>
+
+  <bean id="haOpClusteredListener" class="org.opendaylight.netvirt.elan.l2gw.ha.listeners.HAOpClusteredListener">
+    <argument ref="dataBroker" />
+  </bean>
+
+  <bean id="haOpNodeListener" class="org.opendaylight.netvirt.elan.l2gw.ha.listeners.HAOpNodeListener">
+    <argument ref="dataBroker" />
+    <argument ref="haEventHandler" />
+  </bean>
+
+  <bean id="ElanOvsdbNodeListener"
+        class="org.opendaylight.netvirt.elan.internal.ElanOvsdbNodeListener"
+        init-method="init" destroy-method="close">
+    <argument ref="dataBroker" />
+    <argument ref="elanConfig" />
+    <argument ref="elanBridgeManager" />
+    <argument ref="elanService" />
+  </bean>
+
+  <bean id="elanGroupListener"
+        class="org.opendaylight.netvirt.elan.l2gw.listeners.ElanGroupListener">
+    <argument ref="elanInterfaceManager" />
+    <argument ref="dataBroker" />
+    <argument ref="elanUtils" />
+    <argument ref="entityOwnershipService" />
+  </bean>
+</blueprint>