Merge "Bug 6687: Fix NPE when updating ExternalNetwork"

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

diff --git a/vpnservice/natservice/natservice-impl/src/main/resources/org/opendaylight/blueprint/natservice.xml b/vpnservice/natservice/natservice-impl/src/main/resources/org/opendaylight/blueprint/natservice.xml
index 88b6673a1692a0c0b2c2d30a66551b8bc86221a8..e14c650ecf954ad847342b4683b765fea5bf1039 100644 (file)
--- a/vpnservice/natservice/natservice-impl/src/main/resources/org/opendaylight/blueprint/natservice.xml
+++ b/vpnservice/natservice/natservice-impl/src/main/resources/org/opendaylight/blueprint/natservice.xml
@@ -18,6 +18,8 @@
              interface="org.opendaylight.genius.mdsalutil.interfaces.IMdsalApiManager" />
   <reference id="neutronvpnManager"
              interface="org.opendaylight.netvirt.neutronvpn.interfaces.INeutronVpnManager" />
+  <reference id="vpnManager"
+             interface="org.opendaylight.netvirt.vpnmanager.api.IVpnManager" />
 
   <odl:rpc-service id="idManagerService"
                    interface="org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.IdManagerService" />
@@ -33,6 +35,15 @@
                    interface="org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.vpn.rpc.rev160201.VpnRpcService" />
   <odl:rpc-service id="fibRpcService"
                    interface="org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.fib.rpc.rev160121.FibRpcService" />
+  <odl:rpc-service id="odlArputilService"
+                   interface="org.opendaylight.yang.gen.v1.urn.opendaylight.genius.arputil.rev160406.OdlArputilService" />
+
+  <bean id="subnetmapListener"
+        class="org.opendaylight.netvirt.natservice.internal.SubnetmapListener"
+        init-method="init" destroy-method="close">
+    <argument ref="dataBroker" />
+    <argument ref="externalNetworkGroupInstaller" />
+  </bean>
 
   <bean id="floatingIPListener"
         class="org.opendaylight.netvirt.natservice.internal.FloatingIPListener"
@@ -88,6 +99,8 @@
     <argument ref="fibRpcService" />
     <argument ref="floatingIPListener" />
     <argument ref="fibManager" />
+    <argument ref="odlArputilService" />
+    <argument ref="vpnManager" />
   </bean>
   <service ref="vpnFloatingIpHandler"
            interface="org.opendaylight.netvirt.natservice.internal.FloatingIPHandler" />