X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=networkmodel%2Fsrc%2Fmain%2Fresources%2FOSGI-INF%2Fblueprint%2Fnetworkmodel-blueprint.xml;h=d1a75ef37233645f7f994e3635a29eb46e1b0d21;hb=7181ac3c2277d1e1b4411a3b1b19d89a7bcc70fb;hp=0264ab255d78c9d03063ac02544d7eefee6b9c15;hpb=02879e9f6fadc2ba0fa0a6db8980129463e147a3;p=transportpce.git

diff --git a/networkmodel/src/main/resources/OSGI-INF/blueprint/networkmodel-blueprint.xml b/networkmodel/src/main/resources/OSGI-INF/blueprint/networkmodel-blueprint.xml
index 0264ab255..d1a75ef37 100644
--- a/networkmodel/src/main/resources/OSGI-INF/blueprint/networkmodel-blueprint.xml
+++ b/networkmodel/src/main/resources/OSGI-INF/blueprint/networkmodel-blueprint.xml
@@ -1,57 +1,68 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!-- Copyright © 2016 Orange and others. All rights reserved. This program and the accompanying materials 
-    are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, 
+<!-- Copyright © 2016 Orange and others. All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution,
     and is available at http://www.eclipse.org/legal/epl-v10.html -->
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
     odl:use-default-for-reference-types="true">
 
-    <reference id="dataBroker" interface="org.opendaylight.controller.md.sal.binding.api.DataBroker"
-        odl:type="default" />
-    <reference id="rpcProviderRegistry" interface="org.opendaylight.controller.sal.binding.api.RpcProviderRegistry" />
+    <reference id="dataBroker" interface="org.opendaylight.mdsal.binding.api.DataBroker" odl:type="default" />
+    <reference id="rpcProviderService" interface="org.opendaylight.mdsal.binding.api.RpcProviderService" />
     <reference id="deviceTransactionManager" interface="org.opendaylight.transportpce.common.device.DeviceTransactionManager" />
-    <reference id="openRoadmInterfaces" interface="org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaces" />
     <reference id="portMapping" interface="org.opendaylight.transportpce.common.mapping.PortMapping" />
+    <reference id="networkTransactionImpl" interface="org.opendaylight.transportpce.common.network.NetworkTransactionService" />
+    <reference id="mappingUtils" interface="org.opendaylight.transportpce.common.mapping.MappingUtils" />
 
-    <bean id="openRoadmTopology" class="org.opendaylight.transportpce.networkmodel.util.OpenRoadmTopology">
-        <argument ref="dataBroker" />
+    <bean id="openRoadmFactory" class="org.opendaylight.transportpce.networkmodel.util.OpenRoadmFactory">
+        <argument ref="mappingUtils" />
+        <argument ref="openRoadmTopology22" />
+        <argument ref="openRoadmOtnTopology22" />
+    </bean>
+
+    <bean id="openRoadmTopology22" class="org.opendaylight.transportpce.networkmodel.util.OpenRoadmTopology22">
+        <argument ref="networkTransactionImpl" />
+        <argument ref="deviceTransactionManager" />
+    </bean>
+
+    <bean id="openRoadmOtnTopology22" class="org.opendaylight.transportpce.networkmodel.util.OpenRoadmOtnTopology22">
+        <argument ref="networkTransactionImpl" />
         <argument ref="deviceTransactionManager" />
     </bean>
 
     <bean id="networkModelService" class="org.opendaylight.transportpce.networkmodel.service.NetworkModelServiceImpl">
-        <argument ref="dataBroker" />
+        <argument ref="networkTransactionImpl" />
         <argument ref="linkDiscoveryImpl" />
         <argument ref="deviceTransactionManager" />
-        <argument ref="openRoadmTopology" />
+        <argument ref="openRoadmFactory" />
         <argument ref="portMapping" />
     </bean>
 
     <bean id="provider" class="org.opendaylight.transportpce.networkmodel.NetworkModelProvider"
         init-method="init" destroy-method="close">
+        <argument ref="networkTransactionImpl" />
         <argument ref="dataBroker" />
-        <argument ref="rpcProviderRegistry" />
+        <argument ref="rpcProviderService" />
         <argument ref="networkutilsServiceImpl" />
         <argument ref="netconfTopologyListener" />
-        <argument ref="openRoadmTopology" />
+        <argument ref="openRoadmFactory" />
     </bean>
 
     <bean id="netconfTopologyListener" class="org.opendaylight.transportpce.networkmodel.NetConfTopologyListener">
         <argument ref="networkModelService" />
         <argument ref="dataBroker" />
-        <argument ref="linkDiscoveryImpl" />
         <argument ref="deviceTransactionManager" />
     </bean>
 
     <bean id="networkutilsServiceImpl" class="org.opendaylight.transportpce.networkmodel.NetworkUtilsImpl">
         <argument ref="dataBroker" />
-        <argument ref="openRoadmTopology" />
+        <argument ref="openRoadmFactory" />
     </bean>
 
     <bean id="linkDiscoveryImpl" class="org.opendaylight.transportpce.networkmodel.R2RLinkDiscovery">
         <argument ref="dataBroker" />
         <argument ref="deviceTransactionManager" />
-        <argument ref="openRoadmTopology" />
-        <argument ref="openRoadmInterfaces" />
+        <argument ref="openRoadmFactory" />
+        <argument ref="networkTransactionImpl" />
    </bean>
 
     <service ref="networkModelService" interface="org.opendaylight.transportpce.networkmodel.service.NetworkModelService" />