Do not use odl:type for DataBroker

Specifying odl:type has been deprecated, do not use it.

Change-Id: I684157ff8ffb9455103439ae893769ceb58f83ad
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/aaa-cert/src/main/resources/OSGI-INF/blueprint/aaaCert.xml b/aaa-cert/src/main/resources/OSGI-INF/blueprint/aaaCert.xml
index 4b54c6cfa9dde2836fd4bad7962f11829492423c..eb11deeac71087694937d85dc42082e2a35992a1 100644 (file)
--- a/aaa-cert/src/main/resources/OSGI-INF/blueprint/aaaCert.xml
+++ b/aaa-cert/src/main/resources/OSGI-INF/blueprint/aaaCert.xml
@@ -6,7 +6,7 @@
                             binding-class="org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rev151126.AaaCertServiceConfig">
   </odl:clustered-app-config>
 
-  <reference id="dataBroker" interface="org.opendaylight.mdsal.binding.api.DataBroker" odl:type="default"/>
+  <reference id="dataBroker" interface="org.opendaylight.mdsal.binding.api.DataBroker"/>
 
   <reference id="encryService" interface="org.opendaylight.aaa.encrypt.AAAEncryptionService"/>
 

diff --git a/aaa-encrypt-service/impl/src/main/resources/OSGI-INF/blueprint/encryptservice.xml b/aaa-encrypt-service/impl/src/main/resources/OSGI-INF/blueprint/encryptservice.xml
index fa499549d87c203fe6ea8e5b89d064e1ccbcff50..36c2471040c3d13aab4bf339394e51d77fff89a0 100644 (file)
--- a/aaa-encrypt-service/impl/src/main/resources/OSGI-INF/blueprint/encryptservice.xml
+++ b/aaa-encrypt-service/impl/src/main/resources/OSGI-INF/blueprint/encryptservice.xml
@@ -2,7 +2,7 @@
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
                  xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0">
 
-  <reference id="dataBroker" interface="org.opendaylight.mdsal.binding.api.DataBroker" odl:type="default"/>
+  <reference id="dataBroker" interface="org.opendaylight.mdsal.binding.api.DataBroker"/>
 
   <odl:clustered-app-config id="encryptConfig" default-config-file-name="aaa-encrypt-service-config.xml"
         binding-class="org.opendaylight.yang.gen.v1.config.aaa.authn.encrypt.service.config.rev160915.AaaEncryptServiceConfig">