diff options
| author |   Dan Timoney <dtimoney@att.com> | 2021-02-04 10:30:40 -0500 |
|---|---|---|
| committer | Dan Timoney <dtimoney@att.com> | 2021-02-04 10:30:40 -0500 |
| commit | 2e63f133b29f1bb7fccaf6e35d11488f042a5855 (patch) | |
| tree | 8f95c37abe39ba61b21fb8b6bafe1cb4780580d0 /generic-resource-api/provider/src/main/resources | |
| parent | 20ca6ead983ca534e1ce93abbeaa23a2e4aac0f1 (diff) | |
Upgrade to ODL Aluminum
Updated code to conform to OpenDaylight Aluminum release.
Change-Id: I3ef7daebc689a5d2e344fc7b96ce885bda77a7f8
Issue-ID: SDNC-1474
Signed-off-by: Dan Timoney <dtimoney@att.com>
Diffstat (limited to 'generic-resource-api/provider/src/main/resources')
2 files changed, 3 insertions, 40 deletions
diff --git a/generic-resource-api/provider/src/main/resources/OSGI-INF/blueprint/generic-resource-api-blueprint.xml b/generic-resource-api/provider/src/main/resources/OSGI-INF/blueprint/generic-resource-api-blueprint.xml deleted file mode 100644 index 80d35574..00000000 --- a/generic-resource-api/provider/src/main/resources/OSGI-INF/blueprint/generic-resource-api-blueprint.xml +++ /dev/null @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<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="svcLogicService" - interface="org.onap.ccsdk.sli.core.sli.provider.SvcLogicService" /> - - <bean id="client" class="org.onap.sdnc.northbound.GenericResourceApiSvcLogicServiceClient"> - <argument ref="svcLogicService" /> - </bean> - - <reference id="dataBroker" - interface="org.opendaylight.controller.md.sal.binding.api.DataBroker" - odl:type="default" /> - - <reference id="notificationService" - interface="org.opendaylight.controller.md.sal.binding.api.NotificationPublishService" - odl:type="default" /> - - <reference id="rpcRegistry" - interface="org.opendaylight.controller.sal.binding.api.RpcProviderRegistry" - odl:type="default" /> - - <bean id="provider" class="org.onap.sdnc.northbound.GenericResourceApiProvider"> - <argument ref="dataBroker" /> - <argument ref="notificationService" /> - <argument ref="rpcRegistry" /> - <argument ref="client" /> - </bean> - - <odl:rpc-implementation ref="provider"/> - -</blueprint>
\ No newline at end of file diff --git a/generic-resource-api/provider/src/main/resources/org/opendaylight/blueprint/generic-resource-api-blueprint.xml b/generic-resource-api/provider/src/main/resources/org/opendaylight/blueprint/generic-resource-api-blueprint.xml index 80d35574..aee0acb2 100644 --- a/generic-resource-api/provider/src/main/resources/org/opendaylight/blueprint/generic-resource-api-blueprint.xml +++ b/generic-resource-api/provider/src/main/resources/org/opendaylight/blueprint/generic-resource-api-blueprint.xml @@ -11,16 +11,13 @@ </bean> <reference id="dataBroker" - interface="org.opendaylight.controller.md.sal.binding.api.DataBroker" - odl:type="default" /> + interface="org.opendaylight.mdsal.binding.api.DataBroker" /> <reference id="notificationService" - interface="org.opendaylight.controller.md.sal.binding.api.NotificationPublishService" - odl:type="default" /> + interface="org.opendaylight.mdsal.binding.api.NotificationPublishService" /> <reference id="rpcRegistry" - interface="org.opendaylight.controller.sal.binding.api.RpcProviderRegistry" - odl:type="default" /> + interface="org.opendaylight.mdsal.binding.api.RpcProviderService" /> <bean id="provider" class="org.onap.sdnc.northbound.GenericResourceApiProvider"> <argument ref="dataBroker" /> |