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=0d5879d4657bffc5f67d9083889b33f0c932e74d;hpb=a7152c81a2a40da846c21c2c055e99aa9956fb18;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 0d5879d465..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">
@@ -56,6 +63,7 @@
     init-method="init" destroy-method="close">
     <argument ref="dataBroker" />
     <argument ref="mdsalUtils" />
+    <argument ref="elanConfig" />
   </bean>
 
   <bean id="elanPacketInHandler"
@@ -82,7 +90,7 @@
     <argument ref="itmRpcService" />
     <argument ref="elanInterfaceManager" />
     <argument ref="entityOwnershipService" />
-    <argument ref="elanBridgeManager" />
+    <argument ref="interfaceManager" />
   </bean>
 
   <bean id="elanStatisticsImpl" class="org.opendaylight.netvirt.elan.statisitcs.ElanStatisticsImpl">
@@ -116,7 +124,7 @@
   </bean>
 
   <bean id="elanVpnPortIpToPortListener"
-    class="org.opendaylight.netvirt.elan.internal.ElanVpnPortIpToPortListener"
+    class="org.opendaylight.netvirt.elan.internal.ElanLearntVpnVipToPortListener"
     init-method="init" destroy-method="close">
     <argument ref="dataBroker" />
     <argument ref="interfaceManager" />
@@ -142,6 +150,11 @@
     <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" />
@@ -149,7 +162,7 @@
   </bean>
 
   <bean id="elanStatusMonitor" class="org.opendaylight.netvirt.elan.statusanddiag.ElanStatusMonitorJMX"
-    init-method="init" />
+    init-method="init" destroy-method="close" />
 
   <bean id="l2GatewayConnectionListener"
     class="org.opendaylight.netvirt.elan.l2gw.listeners.L2GatewayConnectionListener"
@@ -175,9 +188,23 @@
     <argument ref="entityOwnershipService" />
   </bean>
 
-  <odl:clustered-app-config id="elanConfig"
-                            binding-class="org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.config.rev150710.ElanConfig">
-  </odl:clustered-app-config>
+  <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"
@@ -187,4 +214,12 @@
     <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>