From eedf26174659466f085421ecea24e8cf78b89c7d Mon Sep 17 00:00:00 2001 From: RehanRaza Date: Tue, 16 Jun 2020 17:41:14 +0200 Subject: [PATCH] Clean up A1 controller dependencies Change-Id: Ib9b9ed150495353812b750cab2e725af753f16c5 Issue-ID: NONRTRIC-250 Signed-off-by: RehanRaza --- .../features/sdnc-a1-northbound-all/pom.xml | 11 ------ .../features/sdnc-nonrt-ric-api/pom.xml | 14 ------- .../northbound/nonrt-ric-api/provider/pom.xml | 44 ---------------------- .../northbound/provider/NonrtRicApiProvider.java | 24 ------------ 4 files changed, 93 deletions(-) diff --git a/sdnc-a1-controller/northbound/features/sdnc-a1-northbound-all/pom.xml b/sdnc-a1-controller/northbound/features/sdnc-a1-northbound-all/pom.xml index 6365abe6..3a4d11ae 100644 --- a/sdnc-a1-controller/northbound/features/sdnc-a1-northbound-all/pom.xml +++ b/sdnc-a1-controller/northbound/features/sdnc-a1-northbound-all/pom.xml @@ -42,17 +42,6 @@ limitations under the License. feature sdnc-a1-northbound :: features :: ${project.artifactId} - - - - org.onap.ccsdk.sli.core - sli-core-artifacts - ${ccsdk.sli.core.version} - pom - import - - - diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/features/sdnc-nonrt-ric-api/pom.xml b/sdnc-a1-controller/northbound/nonrt-ric-api/features/sdnc-nonrt-ric-api/pom.xml index 83eb53ec..895766d0 100644 --- a/sdnc-a1-controller/northbound/nonrt-ric-api/features/sdnc-nonrt-ric-api/pom.xml +++ b/sdnc-a1-controller/northbound/nonrt-ric-api/features/sdnc-nonrt-ric-api/pom.xml @@ -36,19 +36,6 @@ sdnc-a1-northbound :: nonrt-ric-api :: ${project.artifactId} - - org.opendaylight.controller - odl-mdsal-broker - xml - features - - - org.onap.ccsdk.sli.core - ccsdk-sli - ${ccsdk.sli.core.version} - xml - features - ${project.groupId} nonrt-ric-api-model @@ -59,6 +46,5 @@ nonrt-ric-api-provider ${project.version} - diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/provider/pom.xml b/sdnc-a1-controller/northbound/nonrt-ric-api/provider/pom.xml index 7f38d5b5..8fa19ac0 100644 --- a/sdnc-a1-controller/northbound/nonrt-ric-api/provider/pom.xml +++ b/sdnc-a1-controller/northbound/nonrt-ric-api/provider/pom.xml @@ -80,27 +80,12 @@ - - - - org.onap.ccsdk.sli.core - sli-core-artifacts - ${ccsdk.sli.core.version} - pom - import - - - org.o-ran-sc.nonrtric.sdnc-a1.northbound nonrt-ric-api-model ${project.version} - - com.google.code.gson - gson - org.springframework spring-context @@ -111,39 +96,14 @@ spring-web provided - - org.apache.commons - commons-lang3 - org.apache.httpcomponents httpclient - - org.onap.ccsdk.sli.core - sli-common - - - org.onap.ccsdk.sli.core - sli-provider - - org.opendaylight.controller sal-binding-api - - - org.opendaylight.controller - sal-common-util - - - org.opendaylight.controller - sal-test-model - test - - - org.opendaylight.controller sal-binding-broker-impl @@ -173,9 +133,5 @@ 3.14.6 test - - org.json - json - diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/java/org/o_ran_sc/nonrtric/sdnc_a1/northbound/provider/NonrtRicApiProvider.java b/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/java/org/o_ran_sc/nonrtric/sdnc_a1/northbound/provider/NonrtRicApiProvider.java index 392b1d68..a432d0c4 100644 --- a/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/java/org/o_ran_sc/nonrtric/sdnc_a1/northbound/provider/NonrtRicApiProvider.java +++ b/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/java/org/o_ran_sc/nonrtric/sdnc_a1/northbound/provider/NonrtRicApiProvider.java @@ -31,8 +31,6 @@ import org.o_ran_sc.nonrtric.sdnc_a1.northbound.restadapter.RestAdapterImpl; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService; import org.opendaylight.controller.md.sal.binding.api.WriteTransaction; -import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; -import org.opendaylight.controller.sal.binding.api.BindingAwareBroker; import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry; import org.opendaylight.yang.gen.v1.org.o_ran_sc.nonrtric.sdnc_a1.northbound.a1.adapter.rev200122.A1ADAPTERAPIService; import org.opendaylight.yang.gen.v1.org.o_ran_sc.nonrtric.sdnc_a1.northbound.a1.adapter.rev200122.DeleteA1PolicyInput; @@ -86,7 +84,6 @@ public class NonrtRicApiProvider implements AutoCloseable, A1ADAPTERAPIService { protected DataBroker dataBroker; protected NotificationPublishService notificationService; protected RpcProviderRegistry rpcRegistry; - protected BindingAwareBroker.RpcRegistration rpcRegistration; private RestAdapter restAdapter; public NonrtRicApiProvider(DataBroker dataBroker, NotificationPublishService notificationPublishService, @@ -101,20 +98,14 @@ public class NonrtRicApiProvider implements AutoCloseable, A1ADAPTERAPIService { public void initialize() { log.info("Initializing provider for {}", APP_NAME); - createContainers(); restAdapter = new RestAdapterImpl(); log.info("Initialization complete for {}", APP_NAME); } - protected void initializeChild() { - // Override if you have custom initialization intelligence - } - @Override public void close() throws Exception { log.info("Closing provider for {}", APP_NAME); executor.shutdown(); - rpcRegistration.close(); log.info("Successfully closed provider for {}", APP_NAME); } @@ -139,21 +130,6 @@ public class NonrtRicApiProvider implements AutoCloseable, A1ADAPTERAPIService { } } - private void createContainers() { - - final WriteTransaction t = dataBroker.newReadWriteTransaction(); - - try { - CheckedFuture checkedFuture = t.submit(); - checkedFuture.get(); - log.info("Create containers succeeded!"); - - } catch (InterruptedException | ExecutionException e) { - log.error("Create containers failed: ", e); - Thread.currentThread().interrupt(); - } - } - @Override public ListenableFuture> putA1Policy(PutA1PolicyInput input) { log.info("Start of putPolicy"); -- 2.16.6