remove attributes odl:type default from blueprints

Their use is discouraged since Aluminium.
https://docs.opendaylight.org/en/stable-aluminium/release-notes/upgrade-process.html#use-of-odl-type-in-blueprint-is-discouraged

Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I3bb5832b439202d9539338afb71433d34573b74a
(cherry picked from commit 95e998dc482a3a0ba6ad702867a01eddf18a49b4)

diff --git a/bgp/benchmark-app/src/main/resources/OSGI-INF/blueprint/bgp-app-peer-benchmark.xml b/bgp/benchmark-app/src/main/resources/OSGI-INF/blueprint/bgp-app-peer-benchmark.xml
index e940c09d87e291fa1200d751d10cb10de689b68e..408a3f82c46297655a174127c3e74f6d21e7e44d 100644 (file)
--- a/bgp/benchmark-app/src/main/resources/OSGI-INF/blueprint/bgp-app-peer-benchmark.xml
+++ b/bgp/benchmark-app/src/main/resources/OSGI-INF/blueprint/bgp-app-peer-benchmark.xml
@@ -8,7 +8,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"/>
     <reference id="rpcRegistry" interface="org.opendaylight.mdsal.binding.api.RpcProviderService"/>
 
     <odl:clustered-app-config id="bgpBenchmarkConfig"

diff --git a/bgp/openconfig-rp-impl/src/main/resources/OSGI-INF/blueprint/bgp-openconfig-routing-policy-impl.xml b/bgp/openconfig-rp-impl/src/main/resources/OSGI-INF/blueprint/bgp-openconfig-routing-policy-impl.xml
index c3467ae17a4c8126ef6e5ba69a50057604702a5b..82570c63f5cfa4fde1502d5369bc03b5fde4e5f5 100644 (file)
--- a/bgp/openconfig-rp-impl/src/main/resources/OSGI-INF/blueprint/bgp-openconfig-routing-policy-impl.xml
+++ b/bgp/openconfig-rp-impl/src/main/resources/OSGI-INF/blueprint/bgp-openconfig-routing-policy-impl.xml
@@ -8,7 +8,7 @@
 -->
 <blueprint xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
            xmlns="http://www.osgi.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"/>
 
     <reference id="statementRegistry"
                interface="org.opendaylight.protocol.bgp.openconfig.routing.policy.spi.registry.StatementRegistryConsumer"/>

diff --git a/bgp/openconfig-rp-statement/src/main/resources/OSGI-INF/blueprint/bgp-openconfig-routing-policy-statement.xml b/bgp/openconfig-rp-statement/src/main/resources/OSGI-INF/blueprint/bgp-openconfig-routing-policy-statement.xml
index 46cfd77fb1b5bf9b2924de1b8e98e1d9e3144652..743aa62a42f6c6c364b32f09646c6f6a1eb3e49a 100644 (file)
--- a/bgp/openconfig-rp-statement/src/main/resources/OSGI-INF/blueprint/bgp-openconfig-routing-policy-statement.xml
+++ b/bgp/openconfig-rp-statement/src/main/resources/OSGI-INF/blueprint/bgp-openconfig-routing-policy-statement.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"/>
     <bean id="StatementActivator"
           class="org.opendaylight.protocol.bgp.openconfig.routing.policy.statement.StatementActivator">
         <argument ref="dataBroker"/>

diff --git a/bgp/openconfig-state/src/main/resources/OSGI-INF/blueprint/bgp-openconfig-state.xml b/bgp/openconfig-state/src/main/resources/OSGI-INF/blueprint/bgp-openconfig-state.xml
index 9c2de9c90c0d7184f8155e8658f71ef8243b6443..bf963a80982b798cded375b2833a6319711a41ca 100644 (file)
--- a/bgp/openconfig-state/src/main/resources/OSGI-INF/blueprint/bgp-openconfig-state.xml
+++ b/bgp/openconfig-state/src/main/resources/OSGI-INF/blueprint/bgp-openconfig-state.xml
@@ -9,7 +9,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"/>
     <reference id="bgpTableTypeRegistry" interface="org.opendaylight.protocol.bgp.openconfig.spi.BGPTableTypeRegistryConsumer"/>
     <reference id="bgpStateProvider" interface="org.opendaylight.protocol.bgp.rib.spi.state.BGPStateConsumer"/>
 

diff --git a/bgp/rib-impl/src/main/resources/OSGI-INF/blueprint/bgp-rib.xml b/bgp/rib-impl/src/main/resources/OSGI-INF/blueprint/bgp-rib.xml
index 3488dc35ea0a100c435247f8fe8111af29b4b143..629d5bef73b9a4dc5bf2d178291339cdb71aed70 100644 (file)
--- a/bgp/rib-impl/src/main/resources/OSGI-INF/blueprint/bgp-rib.xml
+++ b/bgp/rib-impl/src/main/resources/OSGI-INF/blueprint/bgp-rib.xml
@@ -17,8 +17,7 @@
   <bean id="BGPPeerRegistry" class="org.opendaylight.protocol.bgp.rib.impl.StrictBGPPeerRegistry"
           factory-method="instance" destroy-method="close"/>
 
-  <service ref="BGPPeerRegistry" interface="org.opendaylight.protocol.bgp.rib.impl.spi.BGPPeerRegistry"
-          odl:type="default"/>
+  <service ref="BGPPeerRegistry" interface="org.opendaylight.protocol.bgp.rib.impl.spi.BGPPeerRegistry"/>
 
   <bean id="BGPDispatcher" class="org.opendaylight.protocol.bgp.rib.impl.BGPDispatcherImpl"  destroy-method="close">
     <argument>
@@ -31,9 +30,9 @@
 
   <service ref="BGPDispatcher" interface="org.opendaylight.protocol.bgp.rib.impl.spi.BGPDispatcher"/>
 
-  <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="globalBgpExtensions" interface="org.opendaylight.protocol.bgp.rib.spi.RIBExtensionConsumerContext"/>
-  <reference id="domDataBroker" interface="org.opendaylight.mdsal.dom.api.DOMDataBroker" odl:type="default"/>
+  <reference id="domDataBroker" interface="org.opendaylight.mdsal.dom.api.DOMDataBroker"/>
   <reference id="bgpTableTypeRegistry" interface="org.opendaylight.protocol.bgp.openconfig.spi.BGPTableTypeRegistryConsumer"/>
   <reference id="rpcRegistry" interface="org.opendaylight.mdsal.binding.api.RpcProviderService"/>
 

diff --git a/bgp/topology-provider/src/main/resources/OSGI-INF/blueprint/bgp-topology-provider.xml b/bgp/topology-provider/src/main/resources/OSGI-INF/blueprint/bgp-topology-provider.xml
index 85a96dbc4ed56bf4f76b458c2831838cf9b7b24d..b0276c435caf86007300fc5f54fb6a36b54ed175 100644 (file)
--- a/bgp/topology-provider/src/main/resources/OSGI-INF/blueprint/bgp-topology-provider.xml
+++ b/bgp/topology-provider/src/main/resources/OSGI-INF/blueprint/bgp-topology-provider.xml
@@ -9,7 +9,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"/>
   <reference id="clusterSingletonServiceProvider" interface="org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider"/>
 
   <bean id="bgpTopologyDeployer" class="org.opendaylight.bgpcep.bgp.topology.provider.config.BgpTopologyDeployerImpl"

diff --git a/bmp/bmp-impl/src/main/resources/OSGI-INF/blueprint/bgp-bmp.xml b/bmp/bmp-impl/src/main/resources/OSGI-INF/blueprint/bgp-bmp.xml
index d7c05d6a3f47dd604a853ccea25ad36d17859a65..9850f95d878a18faa6ed981b7038eed4ca250ee5 100644 (file)
--- a/bmp/bmp-impl/src/main/resources/OSGI-INF/blueprint/bgp-bmp.xml
+++ b/bmp/bmp-impl/src/main/resources/OSGI-INF/blueprint/bgp-bmp.xml
@@ -25,8 +25,8 @@
 
   <service ref="bmpDispatcher" interface="org.opendaylight.protocol.bmp.api.BmpDispatcher"/>
 
-  <reference id="dataBroker" interface="org.opendaylight.mdsal.binding.api.DataBroker" odl:type="default"/>
-  <reference id="domDataBroker" interface="org.opendaylight.mdsal.dom.api.DOMDataBroker" odl:type="default"/>
+  <reference id="dataBroker" interface="org.opendaylight.mdsal.binding.api.DataBroker"/>
+  <reference id="domDataBroker" interface="org.opendaylight.mdsal.dom.api.DOMDataBroker"/>
   <reference id="globalBgpExtensions" interface="org.opendaylight.protocol.bgp.rib.spi.RIBExtensionConsumerContext"/>
   <reference id="codecTree" interface="org.opendaylight.mdsal.binding.dom.codec.api.BindingCodecTree"/>
   <reference id="clusterSingletonServiceProvider" interface="org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider"/>

diff --git a/config-loader/bmp-monitors-config-loader/src/main/resources/OSGI-INF/blueprint/bmp-config-loader.xml b/config-loader/bmp-monitors-config-loader/src/main/resources/OSGI-INF/blueprint/bmp-config-loader.xml
index 79b709b3748385d9e0c3055e95c6a06a4ecfe08c..752c2e9e45df796ad963769438f096a054504177 100644 (file)
--- a/config-loader/bmp-monitors-config-loader/src/main/resources/OSGI-INF/blueprint/bmp-config-loader.xml
+++ b/config-loader/bmp-monitors-config-loader/src/main/resources/OSGI-INF/blueprint/bmp-config-loader.xml
@@ -9,7 +9,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"/>
     <reference id="configLoader" interface="org.opendaylight.bgpcep.config.loader.spi.ConfigLoader"/>
 
     <bean id="bmpConfigFileProcessor"

diff --git a/config-loader/protocols-config-loader/src/main/resources/OSGI-INF/blueprint/protocols-config-loader.xml b/config-loader/protocols-config-loader/src/main/resources/OSGI-INF/blueprint/protocols-config-loader.xml
index 0ac83078436cfcd33d60d4a6a879ce86389300bd..59f328fbf1303a61cee0da11308973251305bc0e 100644 (file)
--- a/config-loader/protocols-config-loader/src/main/resources/OSGI-INF/blueprint/protocols-config-loader.xml
+++ b/config-loader/protocols-config-loader/src/main/resources/OSGI-INF/blueprint/protocols-config-loader.xml
@@ -10,7 +10,7 @@
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
            xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0">
     <reference id="configLoader" interface="org.opendaylight.bgpcep.config.loader.spi.ConfigLoader"/>
-    <reference id="dataBroker" interface="org.opendaylight.mdsal.binding.api.DataBroker" odl:type="default"/>
+    <reference id="dataBroker" interface="org.opendaylight.mdsal.binding.api.DataBroker"/>
 
     <bean id="protocolsConfigLoader"
           class="org.opendaylight.bgpcep.config.loader.protocols.ProtocolsConfigFileProcessor"

diff --git a/config-loader/routing-policy-config-loader/src/main/resources/OSGI-INF/blueprint/routing-policy-config-loader.xml b/config-loader/routing-policy-config-loader/src/main/resources/OSGI-INF/blueprint/routing-policy-config-loader.xml
index fa9d27d49c42891659aba6d3fed56c611af001c7..d1b26bac1e0360c22810e9e1295e35748835f629 100644 (file)
--- a/config-loader/routing-policy-config-loader/src/main/resources/OSGI-INF/blueprint/routing-policy-config-loader.xml
+++ b/config-loader/routing-policy-config-loader/src/main/resources/OSGI-INF/blueprint/routing-policy-config-loader.xml
@@ -9,7 +9,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"/>
     <reference id="configLoader" interface="org.opendaylight.bgpcep.config.loader.spi.ConfigLoader"/>
 
     <bean id="rpConfigFileProcessor"

diff --git a/config-loader/topology-config-loader/src/main/resources/OSGI-INF/blueprint/topology-config-loader.xml b/config-loader/topology-config-loader/src/main/resources/OSGI-INF/blueprint/topology-config-loader.xml
index 51d0e0a5586f34c3e1b54c96eaf03469adacc46f..3c863685b61d4ffa1e6aa21a95465ccdb5c1a937 100644 (file)
--- a/config-loader/topology-config-loader/src/main/resources/OSGI-INF/blueprint/topology-config-loader.xml
+++ b/config-loader/topology-config-loader/src/main/resources/OSGI-INF/blueprint/topology-config-loader.xml
@@ -9,7 +9,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"/>
     <reference id="configLoader" interface="org.opendaylight.bgpcep.config.loader.spi.ConfigLoader"/>
 
     <bean id="topologyConfigLoader"

diff --git a/data-change-counter/src/main/resources/OSGI-INF/blueprint/topology-data-change-counter.xml b/data-change-counter/src/main/resources/OSGI-INF/blueprint/topology-data-change-counter.xml
index 254f058b20dd7fceb2593931f635f1cbe08da56a..410ae91a9b8a8cd8d8e69ba58e73a0f8f4834007 100644 (file)
--- a/data-change-counter/src/main/resources/OSGI-INF/blueprint/topology-data-change-counter.xml
+++ b/data-change-counter/src/main/resources/OSGI-INF/blueprint/topology-data-change-counter.xml
@@ -7,7 +7,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"/>
     <bean id="data-change-counter-deployer" class="org.opendaylight.protocol.data.change.counter.TopologyDataChangeCounterDeployer"
           init-method="register"
           destroy-method="close">

diff --git a/graph/graph-impl/src/main/resources/OSGI-INF/blueprint/graph-server.xml b/graph/graph-impl/src/main/resources/OSGI-INF/blueprint/graph-server.xml
index beee762522d0b2350c331382a34b75cf90c3ad41..8153fceb21578e24806f6e1e64b6a862685f8915 100644 (file)
--- a/graph/graph-impl/src/main/resources/OSGI-INF/blueprint/graph-server.xml
+++ b/graph/graph-impl/src/main/resources/OSGI-INF/blueprint/graph-server.xml
@@ -9,7 +9,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" />
 
     <bean id="connectedGraphProvider"
           class="org.opendaylight.graph.impl.ConnectedGraphServer"

diff --git a/pcep/topology/topology-provider/src/main/resources/OSGI-INF/blueprint/pcep-topology.xml b/pcep/topology/topology-provider/src/main/resources/OSGI-INF/blueprint/pcep-topology.xml
index a70a99fc0156d8a2de21def595866baf7e1b5da1..9055be4d8668981403d7d25a727d6551db767ccf 100644 (file)
--- a/pcep/topology/topology-provider/src/main/resources/OSGI-INF/blueprint/pcep-topology.xml
+++ b/pcep/topology/topology-provider/src/main/resources/OSGI-INF/blueprint/pcep-topology.xml
@@ -14,8 +14,7 @@
     <service ref="PCEPTopologySessionListenerFactory"
              interface="org.opendaylight.bgpcep.pcep.topology.provider.TopologySessionListenerFactory"/>
 
-    <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="rpcProviderService" interface="org.opendaylight.mdsal.binding.api.RpcProviderService"/>
     <reference id="pcepDispatcher" interface="org.opendaylight.protocol.pcep.PCEPDispatcher"/>
     <reference id="clusterSingletonServiceProvider"

diff --git a/pcep/topology/topology-stats/src/main/resources/OSGI-INF/blueprint/pcep-stats.xml b/pcep/topology/topology-stats/src/main/resources/OSGI-INF/blueprint/pcep-stats.xml
index 60758796ecaf7e243b1097ba4d0bb39df78b76c7..f5ba87e966705aaedaff13c7d8746223f7933ec4 100644 (file)
--- a/pcep/topology/topology-stats/src/main/resources/OSGI-INF/blueprint/pcep-stats.xml
+++ b/pcep/topology/topology-stats/src/main/resources/OSGI-INF/blueprint/pcep-stats.xml
@@ -9,8 +9,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="pcepStatsConfig"
         binding-class="org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.odl.pcep.stats.provider.config.rev171113.PcepProvider"/>
 

diff --git a/pcep/tunnel/tunnel-provider/src/main/resources/OSGI-INF/blueprint/pcep-tunnel-provider.xml b/pcep/tunnel/tunnel-provider/src/main/resources/OSGI-INF/blueprint/pcep-tunnel-provider.xml
index 3e3d33780ee0636411ca72f92454e8d81fcd1a1d..26bb4b902c6416c82a93dd94e0742f7783134f7c 100644 (file)
--- a/pcep/tunnel/tunnel-provider/src/main/resources/OSGI-INF/blueprint/pcep-tunnel-provider.xml
+++ b/pcep/tunnel/tunnel-provider/src/main/resources/OSGI-INF/blueprint/pcep-tunnel-provider.xml
@@ -8,8 +8,7 @@
 -->
 <blueprint xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
            xmlns="http://www.osgi.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"/>
     <reference id="rpcProviderService" interface="org.opendaylight.mdsal.binding.api.RpcProviderService"/>
     <reference id="rpcConsumerRegistry" interface="org.opendaylight.mdsal.binding.api.RpcConsumerRegistry"/>
     <reference id="clusterSingletonServiceProvider"

diff --git a/programming/impl/src/main/resources/OSGI-INF/blueprint/programming.xml b/programming/impl/src/main/resources/OSGI-INF/blueprint/programming.xml
index 088cbfb405944dfcd70e071a7a328c9b71a00bdb..02c4edebc1c5a97abd2188b5a10dbe238d21233f 100644 (file)
--- a/programming/impl/src/main/resources/OSGI-INF/blueprint/programming.xml
+++ b/programming/impl/src/main/resources/OSGI-INF/blueprint/programming.xml
@@ -10,8 +10,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"/>
     <reference id="rpcRegistry" interface="org.opendaylight.mdsal.binding.api.RpcProviderService"/>
     <reference id="notificationService"
                interface="org.opendaylight.mdsal.binding.api.NotificationPublishService"/>
@@ -30,4 +29,4 @@
 
     <service ref="IntructionFactory"
              interface="org.opendaylight.bgpcep.programming.spi.InstructionSchedulerFactory"/>
-</blueprint>
\ No newline at end of file
+</blueprint>