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 1d65e3e96b20e6cd622d5fb8cb0b8c52a114afea..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
@@ -24,6 +24,8 @@
   <reference id="vpnManager"
              interface="org.opendaylight.netvirt.vpnmanager.api.IVpnManager"
              availability="optional" />
+  <reference id="entityOwnershipService"
+             interface="org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipService" />
 
   <odl:rpc-service id="idManagerService"
                    interface="org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.IdManagerService" />
@@ -58,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"
@@ -70,10 +80,10 @@
     <argument ref="fibManager" />
     <argument ref="odlInterfaceRpcService" />
     <argument ref="vpnFootprintService" />
-    <argument ref="vpnOpDataSyncer" />
-    <argument ref="neutronVpnService" />
     <argument ref="interfaceManager" />
     <argument ref="vpnManager" />
+    <argument ref="interVpnLinkService" />
+    <argument ref="arpResponderHandler" />
   </bean>
 
   <bean id="interfaceStateChangeListener"
@@ -107,19 +117,24 @@
     <argument ref="alivenessManager" />
     <argument ref="neutronVpnService" />
     <argument ref="interfaceManager" />
+    <argument ref="entityOwnershipService" />
   </bean>
 
   <bean id="subnetRoutePacketInHandler"
         class="org.opendaylight.netvirt.vpnmanager.SubnetRoutePacketInHandler">
     <argument ref="dataBroker" />
     <argument ref="packetProcessingService" />
+    <argument ref="odlInterfaceRpcService" />
+    <argument ref="centralizedSwitchProvider" />
   </bean>
   <service ref="subnetRoutePacketInHandler" odl:type="default"
            interface="org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.PacketProcessingListener" />
   <odl:notification-listener ref="subnetRoutePacketInHandler" />
 
   <odl:clustered-app-config id="vpnConfig"
-                            binding-class="org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.vpn.config.rev161130.VpnConfig">
+                            binding-class="org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.vpn.config.rev161130.VpnConfig"
+                            default-config-file-name="netvirt-vpnmanager-config.xml"
+                            update-strategy="none">
   </odl:clustered-app-config>
 
   <bean id="arpNotificationHandler"
@@ -139,6 +154,8 @@
     <argument ref="dataBroker" />
     <argument ref="vpnInterfaceManager" />
     <argument ref="vpnSubnetRouteHandler" />
+    <argument ref="subnetOpDpnManager" />
+    <argument ref="neutronVpnService" />
   </bean>
 
   <bean id="vpnSubnetRouteHandler"
@@ -150,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"
@@ -179,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" />
@@ -194,6 +210,7 @@
     <argument ref="vpnInterfaceManager" />
     <argument ref="fibManager" />
     <argument ref="vpnOpDataSyncer" />
+    <argument ref="mdsalUtils" />
   </bean>
 
   <bean id="fibEntriesListener" class="org.opendaylight.netvirt.vpnmanager.FibEntriesListener"
@@ -215,7 +232,18 @@
            interface="org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.vpn.rpc.rev160201.VpnRpcService" />
 
   <bean id="interVpnLinkService"
-        class="org.opendaylight.netvirt.vpnmanager.intervpnlink.InterVpnLinkService">
+        class="org.opendaylight.netvirt.vpnmanager.intervpnlink.IVpnLinkServiceImpl"
+        init-method="start" destroy-method="close">
+    <argument ref="dataBroker" />
+    <argument ref="idManagerService" />
+    <argument ref="bgpmanager" />
+    <argument ref="fibManager" />
+  </bean>
+  <service ref="interVpnLinkService"
+           interface="org.opendaylight.netvirt.vpnmanager.api.intervpnlink.IVpnLinkService"/>
+
+  <bean id="interVpnLinkLocator"
+        class="org.opendaylight.netvirt.vpnmanager.intervpnlink.InterVpnLinkLocator" >
     <argument ref="dataBroker" />
   </bean>
 
@@ -229,10 +257,18 @@
     <argument ref="fibManager" />
     <argument ref="notificationPublishService" />
     <argument ref="interVpnLinkService" />
+    <argument ref="interVpnLinkLocator" />
     <argument ref="vpnFootprintService" />
     <argument ref="vpnOpDataSyncer" />
   </bean>
 
+  <bean id="interVpnLinkStateListener"
+        class="org.opendaylight.netvirt.vpnmanager.intervpnlink.InterVpnLinkStateListener"
+        init-method="start" destroy-method="close">
+     <argument ref="dataBroker" />
+     <argument ref="interVpnLinkService" />
+  </bean>
+
   <bean id="interVpnLinkNodeListener"
         class="org.opendaylight.netvirt.vpnmanager.intervpnlink.InterVpnLinkNodeListener"
         init-method="start" destroy-method="close">
@@ -282,4 +318,46 @@
         <argument ref="dataBroker" />
         <argument ref="vpnManager" />
   </bean>
+
+  <bean id="l3vpnRegistry"
+        class="org.opendaylight.netvirt.vpnmanager.populator.registry.L3vpnRegistry"
+        init-method="init" destroy-method="close">
+  </bean>
+
+  <bean id="l3vpnOverMplsGrePopulator"
+        class="org.opendaylight.netvirt.vpnmanager.populator.impl.L3vpnOverMplsGrePopulator"
+        init-method="init" destroy-method="close">
+    <argument ref="dataBroker" />
+    <argument ref="vpnInterfaceManager" />
+    <argument ref="bgpmanager" />
+    <argument ref="fibManager" />
+    <argument ref="idManagerService" />
+  </bean>
+
+  <bean id="l3vpnOverVxlanPopulator"
+        class="org.opendaylight.netvirt.vpnmanager.populator.impl.L3vpnOverVxlanPopulator"
+        init-method="init" destroy-method="close">
+    <argument ref="dataBroker" />
+    <argument ref="vpnInterfaceManager" />
+    <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>