Merge "Updated OLM module to support 7.1 devices"

[transportpce.git] / pce / src / main / resources / OSGI-INF / blueprint / pce-blueprint.xml

diff --git a/pce/src/main/resources/OSGI-INF/blueprint/pce-blueprint.xml b/pce/src/main/resources/OSGI-INF/blueprint/pce-blueprint.xml
index 7560106a0626e4742ddd9aee08e71f4999b0fbfa..1716b4aeb1917511b7ee1d797d47a250f7bb48b2 100755 (executable)
--- a/pce/src/main/resources/OSGI-INF/blueprint/pce-blueprint.xml
+++ b/pce/src/main/resources/OSGI-INF/blueprint/pce-blueprint.xml
@@ -11,32 +11,44 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
 -->
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
   xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
+  xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0"
   odl:use-default-for-reference-types="true">
+    <cm:property-placeholder persistent-id="org.opendaylight.transportpce.pce" update-strategy="reload">
+        <cm:default-properties>
+            <cm:property name="url" value="http://127.0.0.1:8008" />
+            <cm:property name="username" value="gnpy" />
+            <cm:property name="password" value="gnpy" />
+        </cm:default-properties>
+    </cm:property-placeholder>
 
   <reference id="networkTransactionImpl" interface="org.opendaylight.transportpce.common.network.NetworkTransactionService" />
-
-  <reference id="dataBroker"
-        interface="org.opendaylight.controller.md.sal.binding.api.DataBroker"
-        odl:type="default"/>
-
-  <reference id="rpcRegistry"
-        interface="org.opendaylight.controller.sal.binding.api.RpcProviderRegistry"/>
-
-  <reference id="notificationPublishService"
-        interface="org.opendaylight.controller.md.sal.binding.api.NotificationPublishService"
-        odl:type="default" />
+  <reference id="bindingDOMCodecServices" interface="org.opendaylight.mdsal.binding.dom.codec.spi.BindingDOMCodecServices" />
+  <reference id="dataBroker" interface="org.opendaylight.mdsal.binding.api.DataBroker"/>
+  <reference id="rpcService" interface="org.opendaylight.mdsal.binding.api.RpcProviderService"/>
+  <reference id="notificationPublishService" interface="org.opendaylight.mdsal.binding.api.NotificationPublishService"/>
+  <reference id="portMapping" interface="org.opendaylight.transportpce.common.mapping.PortMapping"/>
 
   <bean id="pceServiceImpl"
         class="org.opendaylight.transportpce.pce.service.PathComputationServiceImpl"
         init-method="init" destroy-method="close">
     <argument ref="networkTransactionImpl"/>
     <argument ref="notificationPublishService" />
+    <argument ref="gnpyConsumer" />
+    <argument ref="portMapping" />
+  </bean>
+
+  <bean id="gnpyConsumer"
+        class="org.opendaylight.transportpce.pce.gnpy.consumer.GnpyConsumerImpl">
+     <argument value="${url}"/>
+     <argument value="${username}"/>
+     <argument value="${password}"/>
+     <argument ref="bindingDOMCodecServices" />
   </bean>
 
   <bean id="provider"
         class="org.opendaylight.transportpce.pce.impl.PceProvider"
         init-method="init" destroy-method="close">
-    <argument ref="rpcRegistry" />
+    <argument ref="rpcService" />
     <argument ref="pceServiceImpl" />
   </bean>