diff options
author | 2022-03-03 12:45:38 +0000 | |
---|---|---|
committer | 2022-03-07 16:17:26 +0000 | |
commit | 81043465b2a5332d21ac5b806f785ee69d6f62bf (patch) | |
tree | d1c39bd953c644fde791a2a06fedd8fa6b841d8e /sdnr/northbound/addCMHandle/provider/src/main/resources | |
parent | 1e35ebef46e712a989a50171517f96fa75191490 (diff) |
Optimize cm-handle registration with CPS-DMI Plugin to upload yang model
Issue-ID: CCSDK-3597
Signed-off-by: Niranjana <niranjana.y60@wipro.com>
Change-Id: I1d9b0434c72650af164acf9d03a1ed1806668b38
Diffstat (limited to 'sdnr/northbound/addCMHandle/provider/src/main/resources')
3 files changed, 34 insertions, 65 deletions
diff --git a/sdnr/northbound/addCMHandle/provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml b/sdnr/northbound/addCMHandle/provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml deleted file mode 100644 index 8e543d458..000000000 --- a/sdnr/northbound/addCMHandle/provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml +++ /dev/null @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ~ ============LICENSE_START======================================================= - ~ ONAP : ccsdk features - ~ ================================================================================ - ~ Copyright (C) 2021 Wipro Limited. - ~ ================================================================================ - ~ Licensed under the Apache License, Version 2.0 (the "License"); - ~ you may not use this file except in compliance with the License. - ~ You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License. - ~ ============LICENSE_END======================================================= - ~ - --> - -<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="dataBroker" - interface="org.opendaylight.controller.md.sal.binding.api.DataBroker" - odl:type="default"/> - - <bean id="provider" - class="org.onap.sdnc.northbound.sdnr.impl.AddCMHandleProvider" - init-method="init" destroy-method="close"> - <argument ref="dataBroker"/> - </bean> - -</blueprint> diff --git a/sdnr/northbound/addCMHandle/provider/src/main/resources/cm-handle.properties b/sdnr/northbound/addCMHandle/provider/src/main/resources/cm-handle.properties index f027f5939..57742cc7e 100644 --- a/sdnr/northbound/addCMHandle/provider/src/main/resources/cm-handle.properties +++ b/sdnr/northbound/addCMHandle/provider/src/main/resources/cm-handle.properties @@ -2,7 +2,7 @@ # ============LICENSE_START======================================================= # ONAP : ccsdk features # ================================================================================ -# Copyright (C) 2021 Wipro Limited. +# Copyright (C) 2021-2022 Wipro Limited. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -20,8 +20,10 @@ # -url = https://dmaap-message-router/events/CM_HANDLE -user = user -password = password -authentication = basic -dmi-service-name = dmi-service-name +cpsUrl = http://cps:8783/dmi/v1/inventory/cmHandles +user = ${CPS_USER:-cpsuser} +password = ${CPS_PASSWORD:-cpspassword} +dmaapUrl = http://message-router:3094/events/CM-HANDLE +client = CPS +dmiServiceName = dmi-service-name +timerThreshold = 60000 diff --git a/sdnr/northbound/addCMHandle/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/sdnr/northbound/addCMHandle/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml index 9cc6c39ca..149be7d16 100644 --- a/sdnr/northbound/addCMHandle/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml +++ b/sdnr/northbound/addCMHandle/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml @@ -3,7 +3,7 @@ ~ ============LICENSE_START======================================================= ~ ONAP : ccsdk features ~ ================================================================================ - ~ Copyright (C) 2021 Wipro Limited. + ~ Copyright (C) 2021-2022 Wipro Limited. ~ ================================================================================ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. @@ -23,34 +23,38 @@ <blueprint xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0" xmlns="http://www.osgi.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"/> + <reference id="dataBroker" interface="org.opendaylight.mdsal.binding.api.DataBroker"/> - <bean id="client" class="org.onap.ccsdk.features.sdnr.northbound.ranSlice.RANSliceClient"> - <argument ref="svcLogicService"/> - </bean> - - <reference id="dataBroker" - interface="org.opendaylight.mdsal.binding.api.DataBroker"/> + <reference id="notificationPublishService" + interface="org.opendaylight.mdsal.binding.api.NotificationPublishService"/> - <reference id="domDataBroker" - interface="org.opendaylight.mdsal.dom.api.DOMDataBroker"/> + <reference id="mountPointService" + interface="org.opendaylight.mdsal.binding.api.MountPointService"/> - <reference id="notificationPublishService" - interface="org.opendaylight.mdsal.binding.api.NotificationPublishService" /> + <reference id="domMountPointService" + interface="org.opendaylight.mdsal.dom.api.DOMMountPointService"/> <reference id="rpcProviderRegistry" - interface="org.opendaylight.mdsal.binding.api.RpcProviderService" /> + interface="org.opendaylight.mdsal.binding.api.RpcProviderService"/> + + <reference id="clusterSingletonService" + interface="org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider"/> - <bean id="provider" class="org.onap.ccsdk.features.sdnr.northbound.ranSlice.RANSliceProvider" - init-method="init" destroy-method="close"> - <property name="dataBroker" ref="dataBroker"/> - <property name="domDataBroker" ref="domDataBroker"/> + <reference id="yangParserFactory" + interface="org.opendaylight.yangtools.yang.model.parser.api.YangParserFactory"/> + + <reference id="bindingNormalizedNodeSerializer" + interface="org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer"/> + + <bean id="addCMHandleProvider" class="org.onap.ccsdk.features.sdnr.northbound.addCMHandle.AddCMHandleProvider" init-method="init" destroy-method="close" scope="singleton"> + <property name="dataBroker" ref="dataBroker"/> <property name="rpcProviderRegistry" ref="rpcProviderRegistry"/> <property name="notificationPublishService" ref="notificationPublishService"/> - <property name="client" ref="client"/> - </bean> - - <odl:rpc-implementation ref="provider"/> + <property name="mountPointService" ref="mountPointService"/> + <property name="domMountPointService" ref="domMountPointService"/> + <property name="clusterSingletonService" ref="clusterSingletonService"/> + <property name="yangParserFactory" ref="yangParserFactory"/> + <property name="bindingNormalizedNodeSerializer" ref="bindingNormalizedNodeSerializer"/> + </bean> </blueprint> |