Bug 8960: port information for 1 dpn is missing in subnet-op-data and

[netvirt.git] / vpnservice / vpnmanager / vpnmanager-impl / src / main / resources / org / opendaylight / blueprint / vpnmanager.xml

diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/resources/org/opendaylight/blueprint/vpnmanager.xml b/vpnservice/vpnmanager/vpnmanager-impl/src/main/resources/org/opendaylight/blueprint/vpnmanager.xml
index 2cfe3c92aa7f434e5cecd82b3c8b9048834eca9d..2f431524d08edd107c8ee3dc473ff5c3fb1d706f 100644 (file)
--- a/vpnservice/vpnmanager/vpnmanager-impl/src/main/resources/org/opendaylight/blueprint/vpnmanager.xml
+++ b/vpnservice/vpnmanager/vpnmanager-impl/src/main/resources/org/opendaylight/blueprint/vpnmanager.xml
@@ -60,6 +60,14 @@
     <argument ref="notificationPublishService" />
     <argument ref="vpnOpDataSyncer" />
   </bean>
+  <service ref="vpnFootprintService"
+           interface="org.opendaylight.netvirt.vpnmanager.api.IVpnFootprintService" />
+
+  <bean id="arpResponderHandler" class="org.opendaylight.netvirt.vpnmanager.arp.responder.ArpResponderHandler">
+    <argument ref="dataBroker" />
+    <argument ref="elanService" />
+    <argument ref="interfaceManager" />
+  </bean>
 
   <bean id="vpnInterfaceManager"
         class="org.opendaylight.netvirt.vpnmanager.VpnInterfaceManager"
@@ -74,6 +82,8 @@
     <argument ref="vpnFootprintService" />
     <argument ref="interfaceManager" />
     <argument ref="vpnManager" />
+    <argument ref="interVpnLinkService" />
+    <argument ref="arpResponderHandler" />
   </bean>
 
   <bean id="interfaceStateChangeListener"
@@ -110,13 +120,6 @@
     <argument ref="entityOwnershipService" />
   </bean>
 
-  <bean id="subnetMacHandler"
-        class="org.opendaylight.netvirt.vpnmanager.SubnetMacHandler"
-        init-method="start" destroy-method="close">
-    <argument ref="dataBroker" />
-    <argument ref="mdsalUtils" />
-  </bean>
-
   <bean id="subnetRoutePacketInHandler"
         class="org.opendaylight.netvirt.vpnmanager.SubnetRoutePacketInHandler">
     <argument ref="dataBroker" />
@@ -151,6 +154,8 @@
     <argument ref="dataBroker" />
     <argument ref="vpnInterfaceManager" />
     <argument ref="vpnSubnetRouteHandler" />
+    <argument ref="subnetOpDpnManager" />
+    <argument ref="neutronVpnService" />
   </bean>
 
   <bean id="vpnSubnetRouteHandler"
@@ -162,10 +167,8 @@
     <argument ref="idManagerService" />
     <argument ref="lockManagerService" />
     <argument ref="vpnOpDataSyncer"/>
+    <argument ref="VpnNodeListener"/>
   </bean>
-  <service ref="vpnSubnetRouteHandler" odl:type="default"
-           interface="org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.neutronvpn.rev150602.NeutronvpnListener" />
-  <odl:notification-listener ref="vpnSubnetRouteHandler" />
 
   <bean id="tunnelInterfaceStateListener"
         class="org.opendaylight.netvirt.vpnmanager.TunnelInterfaceStateListener"
@@ -191,8 +194,9 @@
     <argument ref="vpnInterfaceManager" />
     <argument ref="mdsalUtils" />
     <argument ref="vpnFootprintService" />
-    <argument ref="odlInterfaceRpcService" />
     <argument ref="elanService" />
+    <argument ref="interfaceManager" />
+    <argument ref="vpnSubnetRouteHandler" />
   </bean>
   <service ref="vpnManagerImpl"
            interface="org.opendaylight.netvirt.vpnmanager.api.IVpnManager" />
@@ -338,4 +342,22 @@
     <argument ref="bgpmanager" />
     <argument ref="fibManager" />
   </bean>
+
+  <bean id="subnetmapChangeListener"
+        class="org.opendaylight.netvirt.vpnmanager.SubnetmapChangeListener"
+        init-method="start" destroy-method="close">
+    <argument ref="dataBroker" />
+    <argument ref="vpnSubnetRouteHandler" />
+  </bean>
+
+  <bean id="vpnOpStatusListener"
+        class="org.opendaylight.netvirt.vpnmanager.VpnOpStatusListener"
+        init-method="start" destroy-method="close">
+    <argument ref="dataBroker" />
+    <argument ref="bgpmanager" />
+    <argument ref="idManagerService" />
+    <argument ref="fibManager" />
+    <argument ref="mdsalUtils" />
+    <argument ref="vpnFootprintService" />
+  </bean>
 </blueprint>