From 7b76725b56304435b01c5b97c3424da0605119ee Mon Sep 17 00:00:00 2001 From: Matej Perina Date: Wed, 3 Apr 2019 14:38:29 +0200 Subject: Proposal to remove OSGi dependencies from the CCSDK project Dependencies on the OSGi frameworks and libraries are removed by integrating the CCSDK project with the lighty.io. It's a toolkit that allows to use ODL services (in this case core services and the Restconf) without the dependency on the Karaf framework and the Blueprint DI. In this change are created the lighty.io modules which initialize and expose same services as the Blueprint DI in the blueprint.xml files. More info about the lighty.io - https://lighty.io Change-Id: Ieb512990e191bbb5a9403f05cdce0b79640ce474 Signed-off-by: Matej Perina Signed-off-by: Samuel Kontris --- lcm/lighty/pom.xml | 47 ++++++++++++++++ .../ccsdk/sli/northbound/lcm/lighty/LcmModule.java | 64 ++++++++++++++++++++++ lcm/pom.xml | 1 + 3 files changed, 112 insertions(+) create mode 100755 lcm/lighty/pom.xml create mode 100644 lcm/lighty/src/main/java/org/onap/ccsdk/sli/northbound/lcm/lighty/LcmModule.java (limited to 'lcm') diff --git a/lcm/lighty/pom.xml b/lcm/lighty/pom.xml new file mode 100755 index 00000000..90c07323 --- /dev/null +++ b/lcm/lighty/pom.xml @@ -0,0 +1,47 @@ + + + 4.0.0 + + + org.onap.ccsdk.parent + binding-parent + 1.4.0-SNAPSHOT + + + + org.onap.ccsdk.sli.northbound + lcm-lighty + 0.6.0-SNAPSHOT + jar + + ccsdk-sli-northbound :: lcm :: ${project.artifactId} + http://maven.apache.org + + + UTF-8 + + + + + + org.onap.ccsdk.sli.core + ccsdk-lighty-dependency-versions + ${project.version} + pom + import + + + + + + + io.lighty.core + lighty-controller + + + org.onap.ccsdk.sli.northbound + lcm-provider + ${project.version} + + + diff --git a/lcm/lighty/src/main/java/org/onap/ccsdk/sli/northbound/lcm/lighty/LcmModule.java b/lcm/lighty/src/main/java/org/onap/ccsdk/sli/northbound/lcm/lighty/LcmModule.java new file mode 100644 index 00000000..cbbf9fb2 --- /dev/null +++ b/lcm/lighty/src/main/java/org/onap/ccsdk/sli/northbound/lcm/lighty/LcmModule.java @@ -0,0 +1,64 @@ +/* + * ============LICENSE_START========================================== + * Copyright (c) 2019 PANTHEON.tech s.r.o. + * =================================================================== + * 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============================================ + * + */ +package org.onap.ccsdk.sli.northbound.lcm.lighty; + +import io.lighty.core.controller.api.AbstractLightyModule; +import io.lighty.core.controller.api.LightyModule; +import org.onap.ccsdk.sli.core.sli.provider.SvcLogicService; +import org.onap.ccsdk.sli.northbound.LcmProvider; +import org.onap.ccsdk.sli.northbound.LcmSliClient; +import org.opendaylight.controller.md.sal.binding.api.DataBroker; +import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService; +import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry; + +/** + * The implementation of the {@link io.lighty.core.controller.api.LightyModule} that manages and provides services from + * the lcm-provider artifact. + */ +public class LcmModule extends AbstractLightyModule implements LightyModule { + + private final SvcLogicService svcLogicService; + private final DataBroker dataBroker; + private final NotificationPublishService publishService; + private final RpcProviderRegistry rpcRegistry; + + private LcmSliClient lcmSliClient; + private LcmProvider lcmProvider; + + public LcmModule(final SvcLogicService svcLogicService, + final DataBroker dataBroker, + final NotificationPublishService publishService, + final RpcProviderRegistry rpcRegistry) { + this.svcLogicService = svcLogicService; + this.dataBroker = dataBroker; + this.publishService = publishService; + this.rpcRegistry = rpcRegistry; + } + + @Override + protected boolean initProcedure() { + this.lcmSliClient = new LcmSliClient(svcLogicService); + this.lcmProvider = new LcmProvider(dataBroker, publishService, rpcRegistry, lcmSliClient); + return true; + } + + @Override + protected boolean stopProcedure() { + return true; + } + +} diff --git a/lcm/pom.xml b/lcm/pom.xml index d2299d15..3baeb96b 100755 --- a/lcm/pom.xml +++ b/lcm/pom.xml @@ -21,6 +21,7 @@ features provider installer + lighty -- cgit 1.2.3-korg