NETVIRT-1630 migrate to md-sal APIs

[netvirt.git] / natservice / impl / src / main / resources / OSGI-INF / blueprint / natservice.xml

diff --git a/natservice/impl/src/main/resources/OSGI-INF/blueprint/natservice.xml b/natservice/impl/src/main/resources/OSGI-INF/blueprint/natservice.xml
index 0dae2be35fae7f278a009236bdd750736af0dc2f..8e0195dc0e534aa2e23cedefb3346de8fcf4bd44 100644 (file)
--- a/natservice/impl/src/main/resources/OSGI-INF/blueprint/natservice.xml
+++ b/natservice/impl/src/main/resources/OSGI-INF/blueprint/natservice.xml
@@ -5,7 +5,7 @@
            odl:use-default-for-reference-types="true">
 
   <reference id="dataBroker"
-             interface="org.opendaylight.controller.md.sal.binding.api.DataBroker"
+             interface="org.opendaylight.mdsal.binding.api.DataBroker"
              odl:type="default" />
   <reference id="iBgpManager"
              interface="org.opendaylight.netvirt.bgpmanager.api.IBgpManager" />
@@ -28,12 +28,17 @@
              interface="org.opendaylight.infrautils.jobcoordinator.JobCoordinator"/>
   <reference id="upgradeState"
              interface="org.opendaylight.serviceutils.upgrade.UpgradeState"/>
+  <reference id="vniUtils"
+             interface="org.opendaylight.genius.networkutils.VniUtils"/>
   <reference id="dataTreeEventCallbackRegistrar"
              interface="org.opendaylight.genius.datastoreutils.listeners.DataTreeEventCallbackRegistrar"/>
   <reference id="metricProvider"
              interface="org.opendaylight.infrautils.metrics.MetricProvider" />
   <reference id="cacheProvider"
              interface="org.opendaylight.infrautils.caches.CacheProvider"/>
+  <reference id="tombstonedNodeManager"
+    interface="org.opendaylight.genius.cloudscaler.api.TombstonedNodeManager"
+    availability="optional"/>
 
   <odl:rpc-service id="idManagerService"
                    interface="org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.IdManagerService" />
@@ -57,7 +62,6 @@
 
   <odl:notification-listener ref="naptPacketInHandler" />
   <odl:notification-listener ref="naptFlowRemovedEventHandler" />
-  <odl:notification-listener ref="routerToVpnListener" />
 
   <service ref="vpnFloatingIpHandler"
            interface="org.opendaylight.netvirt.natservice.internal.FloatingIPHandler" />