Fix: blueprint ref wrong odl service interface

The blueprint of alto-northbound-route is referring to the
wrong odl service interfaces. So the bundle cannot be
loaded. It will trigger the SingleFeaturesTest failure.

Change-Id: I21fe93fdfc33684a99cdf24d1dda582e2a24a3d0
Signed-off-by: jensenzhang <jingxuan.n.zhang@gmail.com>

diff --git a/alto-core/standard-northbound-routes/costmap/impl/src/main/java/org/opendaylight/alto/core/northbound/route/costmap/impl/AltoNorthboundRouteCostmap.java b/alto-core/standard-northbound-routes/costmap/impl/src/main/java/org/opendaylight/alto/core/northbound/route/costmap/impl/AltoNorthboundRouteCostmap.java
index 4e45ad76d3dbae1b5381444b38d365babc6522db..8f8009d804dd11bc99e9cc346912dc48635fef1e 100644 (file)
--- a/alto-core/standard-northbound-routes/costmap/impl/src/main/java/org/opendaylight/alto/core/northbound/route/costmap/impl/AltoNorthboundRouteCostmap.java
+++ b/alto-core/standard-northbound-routes/costmap/impl/src/main/java/org/opendaylight/alto/core/northbound/route/costmap/impl/AltoNorthboundRouteCostmap.java
@@ -25,8 +25,6 @@ import org.opendaylight.alto.core.northbound.api.utils.rfc7285.RFC7285VersionTag
 import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
 import org.opendaylight.controller.md.sal.binding.api.ReadTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext;
-import org.opendaylight.controller.sal.binding.api.BindingAwareProvider;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri;
 import org.opendaylight.yang.gen.v1.urn.alto.northbound.route.costmap.rev151021.Records;
 import org.opendaylight.yang.gen.v1.urn.alto.northbound.route.costmap.rev151021.records.Record;

diff --git a/alto-core/standard-northbound-routes/costmap/impl/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/alto-core/standard-northbound-routes/costmap/impl/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
index bfa17634ecb212a75f1988faef73e9d7ec740043..f77c0ada5e35e62f1afb1f03f5352c91a1d2dc93 100644 (file)
--- a/alto-core/standard-northbound-routes/costmap/impl/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
+++ b/alto-core/standard-northbound-routes/costmap/impl/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
@@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
   odl:use-default-for-reference-types="true">
   <odl:rpc-service id='altoModelCostmapService'
-    interface='org.opendaylight.alto.core.northbound.route.costmap.impl.AltoModelCostmapService' />
+    interface='org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.costmap.rev151021.AltoModelCostmapService' />
   <bean id="provider"
     class="org.opendaylight.alto.core.northbound.route.costmap.impl.AltoNorthboundRouteCostmap"
     init-method="init" destroy-method="close">

diff --git a/alto-core/standard-northbound-routes/costmap/impl/src/test/java/org/opendaylight/alto/core/northbound/route/costmap/impl/AltoNorthboundCostmapTest.java b/alto-core/standard-northbound-routes/costmap/impl/src/test/java/org/opendaylight/alto/core/northbound/route/costmap/impl/AltoNorthboundCostmapTest.java
index dd9b8f60da0babff62aef45df0c8b9c1fa759190..e176549124b0d0229c19ae4797073284632a7f48 100644 (file)
--- a/alto-core/standard-northbound-routes/costmap/impl/src/test/java/org/opendaylight/alto/core/northbound/route/costmap/impl/AltoNorthboundCostmapTest.java
+++ b/alto-core/standard-northbound-routes/costmap/impl/src/test/java/org/opendaylight/alto/core/northbound/route/costmap/impl/AltoNorthboundCostmapTest.java
@@ -23,7 +23,6 @@ import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.TransactionChainListener;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
 import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.resource.ContextTag;
 import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.CostMetric;
 import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.PidName;

diff --git a/alto-core/standard-northbound-routes/endpointcost/impl/src/main/java/org/opendaylight/alto/core/northbound/route/endpointcost/impl/AltoNorthboundRouteEndpointcost.java b/alto-core/standard-northbound-routes/endpointcost/impl/src/main/java/org/opendaylight/alto/core/northbound/route/endpointcost/impl/AltoNorthboundRouteEndpointcost.java
index 2fdb4282823ce77498bd4402cec4f0a6edfa0646..a8a432b3d516d2afab5c9a75e4c2f68dd447c44e 100644 (file)
--- a/alto-core/standard-northbound-routes/endpointcost/impl/src/main/java/org/opendaylight/alto/core/northbound/route/endpointcost/impl/AltoNorthboundRouteEndpointcost.java
+++ b/alto-core/standard-northbound-routes/endpointcost/impl/src/main/java/org/opendaylight/alto/core/northbound/route/endpointcost/impl/AltoNorthboundRouteEndpointcost.java
@@ -24,8 +24,6 @@ import org.opendaylight.alto.core.northbound.api.utils.rfc7285.RFC7285Endpoint;
 import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
 import org.opendaylight.controller.md.sal.binding.api.ReadTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext;
-import org.opendaylight.controller.sal.binding.api.BindingAwareProvider;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri;

diff --git a/alto-core/standard-northbound-routes/endpointcost/impl/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/alto-core/standard-northbound-routes/endpointcost/impl/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
index 0dafeb6f7630c1f8c2f403e3e6a1b844c59d21d5..19b750d418cebc44d214d8529d57f1fb474d6d9f 100644 (file)
--- a/alto-core/standard-northbound-routes/endpointcost/impl/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
+++ b/alto-core/standard-northbound-routes/endpointcost/impl/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
@@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
   odl:use-default-for-reference-types="true">
   <odl:rpc-service id='altoModelEndpointcostService'
-    interface='org.opendaylight.alto.core.northbound.route.endpointcost.impl.AltoModelEndpointcostService' />
+    interface='org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rev151021.AltoModelEndpointcostService' />
   <bean id="provider"
     class="org.opendaylight.alto.core.northbound.route.endpointcost.impl.AltoNorthboundRouteEndpointcost"
     init-method="init" destroy-method="close">

diff --git a/alto-core/standard-northbound-routes/endpointcost/impl/src/test/java/org/opendaylight/alto/core/northbound/route/endpointcost/impl/AltoNorthboundEndpointcostTest.java b/alto-core/standard-northbound-routes/endpointcost/impl/src/test/java/org/opendaylight/alto/core/northbound/route/endpointcost/impl/AltoNorthboundEndpointcostTest.java
index da5f16fea6fee5e93f75b07099730a3906ddf2bb..b2ac322cb38c9ac8665a166659c4b79af20d8c86 100644 (file)
--- a/alto-core/standard-northbound-routes/endpointcost/impl/src/test/java/org/opendaylight/alto/core/northbound/route/endpointcost/impl/AltoNorthboundEndpointcostTest.java
+++ b/alto-core/standard-northbound-routes/endpointcost/impl/src/test/java/org/opendaylight/alto/core/northbound/route/endpointcost/impl/AltoNorthboundEndpointcostTest.java
@@ -22,7 +22,6 @@ import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.TransactionChainListener;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
 import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.resource.ContextTag;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rev151021.AltoModelEndpointcostService;

diff --git a/alto-core/standard-northbound-routes/endpointproperty/impl/src/main/java/org/opendaylight/alto/core/northbound/route/endpointproperty/impl/AltoNorthboundRouteEndpointproperty.java b/alto-core/standard-northbound-routes/endpointproperty/impl/src/main/java/org/opendaylight/alto/core/northbound/route/endpointproperty/impl/AltoNorthboundRouteEndpointproperty.java
index 007264a79daf0d8723cfccbef41c307a5fe3ec1b..89cf80624af50dd25613e4ee35e654ba71a8839c 100644 (file)
--- a/alto-core/standard-northbound-routes/endpointproperty/impl/src/main/java/org/opendaylight/alto/core/northbound/route/endpointproperty/impl/AltoNorthboundRouteEndpointproperty.java
+++ b/alto-core/standard-northbound-routes/endpointproperty/impl/src/main/java/org/opendaylight/alto/core/northbound/route/endpointproperty/impl/AltoNorthboundRouteEndpointproperty.java
@@ -21,9 +21,7 @@ import org.opendaylight.alto.core.northbound.api.utils.rfc7285.RFC7285VersionTag
 
 import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.controller.sal.binding.api.BindingAwareProvider;
 import org.opendaylight.alto.core.northbound.api.AltoNorthboundRoute;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext;
 import org.opendaylight.alto.core.northbound.api.AltoNorthboundRouter;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address;

diff --git a/alto-core/standard-northbound-routes/endpointproperty/impl/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/alto-core/standard-northbound-routes/endpointproperty/impl/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
index 307b267f67a93df074671cdf20f08ecb0e0d6f09..1fe21e5f07f7fc021e5098b42b66d6360876c51b 100644 (file)
--- a/alto-core/standard-northbound-routes/endpointproperty/impl/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
+++ b/alto-core/standard-northbound-routes/endpointproperty/impl/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
@@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
   odl:use-default-for-reference-types="true">
   <odl:rpc-service id='altoModelEndpointpropertyService'
-    interface='org.opendaylight.alto.core.northbound.route.endpointproperty.impl.AltoModelEndpointpropertyService' />
+    interface='org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointproperty.rev151021.AltoModelEndpointpropertyService' />
   <bean id="provider"
     class="org.opendaylight.alto.core.northbound.route.endpointproperty.impl.AltoNorthboundRouteEndpointproperty"
     init-method="init" destroy-method="close">

diff --git a/alto-core/standard-northbound-routes/endpointproperty/impl/src/test/java/org/opendaylight/alto/core/northbound/route/endpointproperty/impl/AltoNorthboundRouteEndpointpropertyTest.java b/alto-core/standard-northbound-routes/endpointproperty/impl/src/test/java/org/opendaylight/alto/core/northbound/route/endpointproperty/impl/AltoNorthboundRouteEndpointpropertyTest.java
index 9a4916ebb4e1d4171a170994d1ac674a39787ffc..5e5e20dca011a5ea7e97e7f5c930e2432ad85a0a 100644 (file)
--- a/alto-core/standard-northbound-routes/endpointproperty/impl/src/test/java/org/opendaylight/alto/core/northbound/route/endpointproperty/impl/AltoNorthboundRouteEndpointpropertyTest.java
+++ b/alto-core/standard-northbound-routes/endpointproperty/impl/src/test/java/org/opendaylight/alto/core/northbound/route/endpointproperty/impl/AltoNorthboundRouteEndpointpropertyTest.java
@@ -22,7 +22,6 @@ import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.TransactionChainListener;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
 import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.resource.ContextTag;
 import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.GlobalEndpointProperty;

diff --git a/alto-core/standard-northbound-routes/networkmap/impl/src/main/java/org/opendaylight/alto/core/northbound/route/networkmap/impl/AltoNorthboundRouteNetworkmap.java b/alto-core/standard-northbound-routes/networkmap/impl/src/main/java/org/opendaylight/alto/core/northbound/route/networkmap/impl/AltoNorthboundRouteNetworkmap.java
index 5bda889a0c1b539a3c1e81929adf6786e37e5f6c..040388bf6a5576ffe2d855c9f956dc8b5729808b 100644 (file)
--- a/alto-core/standard-northbound-routes/networkmap/impl/src/main/java/org/opendaylight/alto/core/northbound/route/networkmap/impl/AltoNorthboundRouteNetworkmap.java
+++ b/alto-core/standard-northbound-routes/networkmap/impl/src/main/java/org/opendaylight/alto/core/northbound/route/networkmap/impl/AltoNorthboundRouteNetworkmap.java
@@ -46,9 +46,6 @@ import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
 import org.opendaylight.controller.md.sal.binding.api.ReadTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext;
-import org.opendaylight.controller.sal.binding.api.BindingAwareProvider;
-
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri;

diff --git a/alto-core/standard-northbound-routes/networkmap/impl/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/alto-core/standard-northbound-routes/networkmap/impl/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
index c5f45f85a2d052eb3794c25b488beabe5257960b..f274612614d7f0605095af7cdc34bea8358e7860 100644 (file)
--- a/alto-core/standard-northbound-routes/networkmap/impl/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
+++ b/alto-core/standard-northbound-routes/networkmap/impl/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
@@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
   odl:use-default-for-reference-types="true">
   <odl:rpc-service id='altoModelNetworkmapService'
-    interface='org.opendaylight.alto.core.northbound.route.networkmap.impl.AltoModelNetworkmapService' />
+    interface='org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.networkmap.rev151021.AltoModelNetworkmapService' />
   <bean id="provider"
     class="org.opendaylight.alto.core.northbound.route.networkmap.impl.AltoNorthboundRouteNetworkmap"
     init-method="init" destroy-method="close">

diff --git a/utils/migrate_blueprint.sh b/utils/migrate_blueprint.sh
index 2182159131f329fd6142355b95017359ceed1e89..5eb26d3b346a75c0bebc9dc77e4685708ecd83fe 100755 (executable)
--- a/utils/migrate_blueprint.sh
+++ b/utils/migrate_blueprint.sh
@@ -93,7 +93,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     for rpc in $RPC_CONSUME_LIST; do
         SERV_NAME=$(echo $rpc | sed 's/^.*,//')
         SERV_CLASS=$(grep "^import .*\.$SERV_NAME;" $PROVIDER | sed 's/^import \(.*\);$/\1/')
-        if [[ $SERV_CLASS ]]; then
+        if [[ ! $SERV_CLASS ]]; then
             SERV_CLASS="$PACKAGE.$SERV_NAME"
         fi
         SERV_ID=$(echo ${SERV_NAME:0:1} | tr '[:upper:]' '[:lower:]')${SERV_NAME:1}