Integrate NetconfTopologyRPCProvider

[netconf.git] / netconf / netconf-topology-singleton / src / main / resources / OSGI-INF / blueprint / netconf-topology-singleton.xml

diff --git a/netconf/netconf-topology-singleton/src/main/resources/OSGI-INF/blueprint/netconf-topology-singleton.xml b/netconf/netconf-topology-singleton/src/main/resources/OSGI-INF/blueprint/netconf-topology-singleton.xml
index b2e2e59dd0ae0ea2536d3f8126eb0e824330a3b1..4aa47822989fbf3e242592e9a9af8a751fc66502 100644 (file)
--- a/netconf/netconf-topology-singleton/src/main/resources/OSGI-INF/blueprint/netconf-topology-singleton.xml
+++ b/netconf/netconf-topology-singleton/src/main/resources/OSGI-INF/blueprint/netconf-topology-singleton.xml
@@ -14,6 +14,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
     <reference id="dataBroker"
                interface="org.opendaylight.mdsal.binding.api.DataBroker"/>
+    <reference id="rpcProvider"
+               interface="org.opendaylight.mdsal.binding.api.RpcProviderService"/>
     <reference id="rpcRegistry"
                interface="org.opendaylight.mdsal.dom.api.DOMRpcProviderService"/>
     <reference id="actionRegistry"
@@ -35,12 +37,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
                interface="org.opendaylight.netconf.client.NetconfClientDispatcher"
                odl:type="netconf-client-dispatcher"/>
     <reference id="mountPointService"
-               interface="org.opendaylight.mdsal.dom.api.DOMMountPointService"
-               odl:type="default"/>
+               interface="org.opendaylight.mdsal.dom.api.DOMMountPointService"/>
     <reference id="deviceActionFactory"
                interface="org.opendaylight.netconf.sal.connect.api.DeviceActionFactory"/>
     <reference id="schemaManager"
                interface="org.opendaylight.netconf.sal.connect.api.SchemaResourceManager"/>
+    <reference id="baseSchemas"
+               interface="org.opendaylight.netconf.sal.connect.netconf.schema.mapping.BaseNetconfSchemas"/>
     <odl:clustered-app-config
             id="singletonConfig"
             binding-class="org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.topology.singleton.config.rev170419.Config"
@@ -61,6 +64,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
           init-method="init" destroy-method="close">
         <cm:managed-properties persistent-id="org.opendaylight.netconf.topology.sb.keypair"
                                update-strategy="container-managed"/>
+        <argument ref="baseSchemas"/>
         <argument ref="dataBroker"/>
         <argument ref="rpcRegistry"/>
         <argument ref="actionRegistry"/>
@@ -76,22 +80,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <property name="privateKeyPath" value="${private-key-path}"/>
         <property name="privateKeyPassphrase" value="${private-key-passphrase}"/>
         <argument ref="encryptionService" />
+        <argument ref="rpcProvider" />
         <argument ref="deviceActionFactory"/>
         <argument ref="schemaManager"/>
     </bean>
     <service ref="netconfTopologyManager"
              interface="org.opendaylight.netconf.topology.singleton.api.NetconfTopologySingletonService"/>
 
-    <bean id="netconfNodeRegisterEncryptedRPC"
-          class="org.opendaylight.netconf.sal.connect.util.NetconfTopologyRPCProvider"
-          >
-        <argument value="topology-netconf"/>
-        <argument ref="dataBroker"/>
-        <argument ref="encryptionService"/>
-    </bean>
-
-    <odl:rpc-implementation ref="netconfNodeRegisterEncryptedRPC"/>
-
     <bean id="netconfKeystoreProvider"
           class="org.opendaylight.netconf.sal.connect.util.NetconfSalKeystoreService">
         <argument ref="dataBroker"/>