Merge dev/fluorine work across to master

[unimgr.git] / impl / src / main / resources / org / opendaylight / blueprint / unimgr.xml

diff --git a/impl/src/main/resources/org/opendaylight/blueprint/unimgr.xml b/impl/src/main/resources/org/opendaylight/blueprint/unimgr.xml
index a955eac27fc3383c05f22e40dad1ae6ba1ec437e..bf9b124079e654adb5e286cf147a08d266f5db71 100644 (file)
--- a/impl/src/main/resources/org/opendaylight/blueprint/unimgr.xml
+++ b/impl/src/main/resources/org/opendaylight/blueprint/unimgr.xml
@@ -11,12 +11,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
            xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd"
            xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0" odl:use-default-for-reference-types="true">
 
-    <bean id="unimgrProvider" class="org.opendaylight.unimgr.impl.UnimgrProvider" init-method="init" destroy-method="close">
-        <argument index="0" ref="dataBroker" />
-        <!-- TODO [bmi] extract listeners configuration & registration -->
-    </bean>
-
-    <service id="unimgrProviderService" interface="org.opendaylight.unimgr.api.IUnimgrConsoleProvider" ref="unimgrProvider" odl:type="default" />
     <service interface="org.opendaylight.unimgr.mef.nrp.api.TopologyManager" ref="topologyService" odl:type="default" />
 
     <bean id="activationDriverRepo" class="org.opendaylight.unimgr.mef.nrp.impl.ActivationDriverRepoServiceImpl">
@@ -32,7 +26,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
         <argument ref="dataBroker"/>
     </bean>
 
-    <bean id="requestValidator" class="org.opendaylight.unimgr.mef.nrp.impl.DefaultValidator" />
+    <bean id="requestValidator" class="org.opendaylight.unimgr.mef.nrp.impl.DefaultValidator" >
+        <argument index="0" ref="dataBroker" />
+    </bean>
 
     <bean id="tapiConnectivityService" class="org.opendaylight.unimgr.mef.nrp.impl.connectivityservice.TapiConnectivityServiceImpl" init-method="init">
         <property name="driverRepo" ref="activationDriverRepo" />
@@ -48,12 +44,16 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
         <property name="broker" ref="dataBroker" />
     </bean>
 
+    <bean id="tapiCommonService" class="org.opendaylight.unimgr.mef.nrp.impl.commonservice.TapiCommonServiceImpl" init-method="init">
+        <property name="broker" ref="dataBroker" />
+    </bean>
+
     <bean id="basicDecomposer" class="org.opendaylight.unimgr.mef.nrp.impl.decomposer.BasicDecomposer">
         <argument ref="dataBroker" />
     </bean>
-
-    <odl:rpc-implementation ref="tapiConnectivityService" interface="org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.tapi.connectivity.rev171113.TapiConnectivityService" />
-    <odl:rpc-implementation ref="tapiTopologyService" interface="org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.tapi.topology.rev171113.TapiTopologyService" />
+    <odl:rpc-implementation ref="tapiConnectivityService" interface="org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev180307.TapiConnectivityService" />
+    <odl:rpc-implementation ref="tapiTopologyService" interface="org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev180307.TapiTopologyService" />
+    <odl:rpc-implementation ref="tapiCommonService" interface="org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev180307.TapiCommonService" />
 
     <reference id="dataBroker" interface="org.opendaylight.controller.md.sal.binding.api.DataBroker"/>
     <reference-list id="driverBuilders" interface="org.opendaylight.unimgr.mef.nrp.api.ActivationDriverBuilder" availability="optional">