From 348cb8528bdf879354de640b3249bc40db934505 Mon Sep 17 00:00:00 2001 From: RehanRaza Date: Mon, 27 Apr 2020 16:20:26 +0200 Subject: [PATCH] Rename artifacts in A1 controller Change-Id: I0aa592dd98a1f6c9a038aa3415e363d1263772d6 Issue-ID: NONRTRIC-201 Signed-off-by: RehanRaza --- sdnc-a1-controller/northbound/README.md | 2 +- .../pom.xml | 8 ++--- .../northbound/features/installer/pom.xml | 14 ++++---- sdnc-a1-controller/northbound/features/pom.xml | 8 ++--- .../pom.xml | 6 ++-- .../features/features-nonrt-ric-api/pom.xml | 4 +-- .../northbound/nonrt-ric-api/features/pom.xml | 4 +-- .../features/sdnc-nonrt-ric-api/pom.xml | 12 ++----- .../northbound/nonrt-ric-api/installer/pom.xml | 12 +++---- .../northbound/nonrt-ric-api/model/pom.xml | 6 ++-- .../model/src/main/yang/NONRT-RIC-API.yang | 2 +- .../northbound/nonrt-ric-api/pom.xml | 4 +-- .../northbound/nonrt-ric-api/provider/pom.xml | 6 ++-- .../northbound/provider/NonrtRicApiProvider.java | 40 ++++++++++----------- .../northbound/restadapter/RestAdapter.java | 2 +- .../northbound/restadapter/RestAdapterImpl.java | 2 +- .../OSGI-INF/blueprint/nonrt-ric-api-blueprint.xml | 2 +- .../blueprint/nonrt-ric-api-blueprint.xml | 2 +- .../northbound/NonrtRicApiProviderTest.java | 26 +++++++------- sdnc-a1-controller/northbound/pom.xml | 27 ++------------ sdnc-a1-controller/oam/README.md | 13 +------ .../oam/installation/TagVersion.groovy | 2 +- sdnc-a1-controller/oam/installation/pom.xml | 6 ++-- .../oam/installation/{sdnc => sdnc-a1}/pom.xml | 12 +++---- .../src/main/docker/standalone.Dockerfile | 6 ++-- .../src/main/resources/sdnctl.dump | 0 .../src/main/resources/truststoreONAPall.jks | Bin .../src/main/scripts/addSdncKeyStore.sh | 0 .../src/main/scripts/installCerts.py | 0 .../src/main/scripts/installSdncDb.sh | 0 .../{sdnc => sdnc-a1}/src/main/scripts/startODL.sh | 4 +-- .../oam/platform-logic/installer/pom.xml | 4 +-- sdnc-a1-controller/oam/platform-logic/pom.xml | 4 +-- .../oam/platform-logic/setup/pom.xml | 4 +-- sdnc-a1-controller/oam/pom.xml | 27 ++------------ sdnc-a1-controller/pom.xml | 6 ++-- 36 files changed, 107 insertions(+), 170 deletions(-) rename sdnc-a1-controller/northbound/features/{features-sdnc-northbound => features-sdnc-a1-northbound}/pom.xml (80%) rename sdnc-a1-controller/northbound/features/{sdnc-northbound-all => sdnc-a1-northbound-all}/pom.xml (88%) rename sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/java/org/{onap/sdnc => o_ran_sc/nonrtric/sdnc_a1}/northbound/provider/NonrtRicApiProvider.java (80%) rename sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/java/org/{onap/sdnc => o_ran_sc/nonrtric/sdnc_a1}/northbound/restadapter/RestAdapter.java (96%) rename sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/java/org/{onap/sdnc => o_ran_sc/nonrtric/sdnc_a1}/northbound/restadapter/RestAdapterImpl.java (97%) rename sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/test/java/org/{onap/sdnc => o_ran_sc/nonrtric/sdnc_a1}/northbound/NonrtRicApiProviderTest.java (82%) rename sdnc-a1-controller/oam/installation/{sdnc => sdnc-a1}/pom.xml (97%) rename sdnc-a1-controller/oam/installation/{sdnc => sdnc-a1}/src/main/docker/standalone.Dockerfile (88%) rename sdnc-a1-controller/oam/installation/{sdnc => sdnc-a1}/src/main/resources/sdnctl.dump (100%) rename sdnc-a1-controller/oam/installation/{sdnc => sdnc-a1}/src/main/resources/truststoreONAPall.jks (100%) rename sdnc-a1-controller/oam/installation/{sdnc => sdnc-a1}/src/main/scripts/addSdncKeyStore.sh (100%) rename sdnc-a1-controller/oam/installation/{sdnc => sdnc-a1}/src/main/scripts/installCerts.py (100%) rename sdnc-a1-controller/oam/installation/{sdnc => sdnc-a1}/src/main/scripts/installSdncDb.sh (100%) rename sdnc-a1-controller/oam/installation/{sdnc => sdnc-a1}/src/main/scripts/startODL.sh (96%) diff --git a/sdnc-a1-controller/northbound/README.md b/sdnc-a1-controller/northbound/README.md index f5ae1290..5b9fdfb8 100644 --- a/sdnc-a1-controller/northbound/README.md +++ b/sdnc-a1-controller/northbound/README.md @@ -1,4 +1,4 @@ -This source repository contains the code for the SDN Controller northbound interface adaptors. +This source repository contains the code for the SDN-A1 Controller northbound interface adaptors. To compile this code: 1. Make sure your local Maven settings file ($HOME/.m2/settings.xml) contains references to the OpenECOMP repositories and OpenDaylight repositories. See example-settings.xml for an example. diff --git a/sdnc-a1-controller/northbound/features/features-sdnc-northbound/pom.xml b/sdnc-a1-controller/northbound/features/features-sdnc-a1-northbound/pom.xml similarity index 80% rename from sdnc-a1-controller/northbound/features/features-sdnc-northbound/pom.xml rename to sdnc-a1-controller/northbound/features/features-sdnc-a1-northbound/pom.xml index 6ab5343f..49737bf6 100644 --- a/sdnc-a1-controller/northbound/features/features-sdnc-northbound/pom.xml +++ b/sdnc-a1-controller/northbound/features/features-sdnc-a1-northbound/pom.xml @@ -17,17 +17,17 @@ - org.onap.sdnc.northbound - features-sdnc-northbound + org.o-ran-sc.nonrtric.sdnc-a1.northbound + features-sdnc-a1-northbound 1.7.3-SNAPSHOT feature - sdnc-northbound :: features :: ${project.artifactId} + sdnc-a1-northbound :: features :: ${project.artifactId} ${project.groupId} - sdnc-northbound-all + sdnc-a1-northbound-all ${project.version} xml features diff --git a/sdnc-a1-controller/northbound/features/installer/pom.xml b/sdnc-a1-controller/northbound/features/installer/pom.xml index ea67490f..d2e7dcc4 100755 --- a/sdnc-a1-controller/northbound/features/installer/pom.xml +++ b/sdnc-a1-controller/northbound/features/installer/pom.xml @@ -9,24 +9,24 @@ - org.onap.sdnc.northbound - sdnc-northbound-features-installer + org.o-ran-sc.nonrtric.sdnc-a1.northbound + sdnc-a1-northbound-features-installer 1.7.3-SNAPSHOT pom - sdnc-northbound :: features :: ${project.artifactId} + sdnc-a1-northbound :: features :: ${project.artifactId} - sdnc-northbound-all + sdnc-a1-northbound-all ${application.name} - mvn:org.onap.sdnc.northbound/${features.boot}/${project.version}/xml/features + mvn:org.o-ran-sc.nonrtric.sdnc-a1.northbound/${features.boot}/${project.version}/xml/features false - org.onap.sdnc.northbound + org.o-ran-sc.nonrtric.sdnc-a1.northbound ${application.name} ${project.version} xml @@ -98,7 +98,7 @@ true false false - org.onap.sdnc.northbound + org.o-ran-sc.nonrtric.sdnc-a1.northbound provided diff --git a/sdnc-a1-controller/northbound/features/pom.xml b/sdnc-a1-controller/northbound/features/pom.xml index 37336a2b..43302a5e 100755 --- a/sdnc-a1-controller/northbound/features/pom.xml +++ b/sdnc-a1-controller/northbound/features/pom.xml @@ -9,16 +9,16 @@ - org.onap.sdnc.northbound + org.o-ran-sc.nonrtric.sdnc-a1.northbound sdnc-northbound-feature-aggregator 1.7.3-SNAPSHOT pom - sdnc-northbound :: features + sdnc-a1-northbound :: features - sdnc-northbound-all - features-sdnc-northbound + sdnc-a1-northbound-all + features-sdnc-a1-northbound installer diff --git a/sdnc-a1-controller/northbound/features/sdnc-northbound-all/pom.xml b/sdnc-a1-controller/northbound/features/sdnc-a1-northbound-all/pom.xml similarity index 88% rename from sdnc-a1-controller/northbound/features/sdnc-northbound-all/pom.xml rename to sdnc-a1-controller/northbound/features/sdnc-a1-northbound-all/pom.xml index 5c5c9cdd..b9a8332a 100644 --- a/sdnc-a1-controller/northbound/features/sdnc-northbound-all/pom.xml +++ b/sdnc-a1-controller/northbound/features/sdnc-a1-northbound-all/pom.xml @@ -17,12 +17,12 @@ - org.onap.sdnc.northbound - sdnc-northbound-all + org.o-ran-sc.nonrtric.sdnc-a1.northbound + sdnc-a1-northbound-all 1.7.3-SNAPSHOT feature - sdnc-northbound :: features :: ${project.artifactId} + sdnc-a1-northbound :: features :: ${project.artifactId} diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/features/features-nonrt-ric-api/pom.xml b/sdnc-a1-controller/northbound/nonrt-ric-api/features/features-nonrt-ric-api/pom.xml index 8a2a5160..10b5d43c 100644 --- a/sdnc-a1-controller/northbound/nonrt-ric-api/features/features-nonrt-ric-api/pom.xml +++ b/sdnc-a1-controller/northbound/nonrt-ric-api/features/features-nonrt-ric-api/pom.xml @@ -28,12 +28,12 @@ - org.onap.sdnc.northbound + org.o-ran-sc.nonrtric.sdnc-a1.northbound features-nonrt-ric-api 1.7.3-SNAPSHOT feature - sdnc-northbound :: nonrt-ric-api :: ${project.artifactId} + sdnc-a1-northbound :: nonrt-ric-api :: ${project.artifactId} diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/features/pom.xml b/sdnc-a1-controller/northbound/nonrt-ric-api/features/pom.xml index 6bc57cd5..a83de20a 100644 --- a/sdnc-a1-controller/northbound/nonrt-ric-api/features/pom.xml +++ b/sdnc-a1-controller/northbound/nonrt-ric-api/features/pom.xml @@ -28,12 +28,12 @@ - org.onap.sdnc.northbound + org.o-ran-sc.nonrtric.sdnc-a1.northbound nonrt-ric-api-features 1.7.3-SNAPSHOT pom - sdnc-northbound :: nonrt-ric-api :: ${project.artifactId} + sdnc-a1-northbound :: nonrt-ric-api :: ${project.artifactId} sdnc-nonrt-ric-api 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 d1080430..f39d9ca5 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 @@ -21,14 +21,6 @@ 4.0.0 - - - opendaylight-release - opendaylight-release - https://nexus.opendaylight.org/content/repositories/opendaylight.release/ - - - org.onap.ccsdk.parent single-feature-parent @@ -36,12 +28,12 @@ - org.onap.sdnc.northbound + org.o-ran-sc.nonrtric.sdnc-a1.northbound sdnc-nonrt-ric-api 1.7.3-SNAPSHOT feature - sdnc-northbound :: nonrt-ric-api :: ${project.artifactId} + sdnc-a1-northbound :: nonrt-ric-api :: ${project.artifactId} diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/installer/pom.xml b/sdnc-a1-controller/northbound/nonrt-ric-api/installer/pom.xml index 966686b7..2532d118 100755 --- a/sdnc-a1-controller/northbound/nonrt-ric-api/installer/pom.xml +++ b/sdnc-a1-controller/northbound/nonrt-ric-api/installer/pom.xml @@ -28,24 +28,24 @@ - org.onap.sdnc.northbound + org.o-ran-sc.nonrtric.sdnc-a1.northbound nonrt-ric-api-installer 1.7.3-SNAPSHOT pom - sdnc-northbound :: nonrt-ric-api :: ${project.artifactId} + sdnc-a1-northbound :: nonrt-ric-api :: ${project.artifactId} sdnc-nonrt-ric-api ${application.name} - mvn:org.onap.sdnc.northbound/${application.name}/${project.version}/xml/features + mvn:org.o-ran-sc.nonrtric.sdnc-a1.northbound/${application.name}/${project.version}/xml/features false - org.onap.sdnc.northbound + org.o-ran-sc.nonrtric.sdnc-a1.northbound ${application.name} ${project.version} xml @@ -59,7 +59,7 @@ - org.onap.sdnc.northbound + org.o-ran-sc.nonrtric.sdnc-a1.northbound nonrt-ric-api-provider ${project.version} @@ -123,7 +123,7 @@ true false false - org.onap.sdnc.northbound + org.o-ran-sc.nonrtric.sdnc-a1.northbound provided diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/model/pom.xml b/sdnc-a1-controller/northbound/nonrt-ric-api/model/pom.xml index ea5ed711..7d45eb50 100644 --- a/sdnc-a1-controller/northbound/nonrt-ric-api/model/pom.xml +++ b/sdnc-a1-controller/northbound/nonrt-ric-api/model/pom.xml @@ -36,20 +36,18 @@ - org.onap.sdnc.northbound + org.o-ran-sc.nonrtric.sdnc-a1.northbound nonrt-ric-api-model 1.7.3-SNAPSHOT bundle - sdnc-northbound :: nonrt-ric-api :: ${project.artifactId} + sdnc-a1-northbound :: nonrt-ric-api :: ${project.artifactId} org.opendaylight.mdsal.binding.model.ietf rfc6991 - - diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/model/src/main/yang/NONRT-RIC-API.yang b/sdnc-a1-controller/northbound/nonrt-ric-api/model/src/main/yang/NONRT-RIC-API.yang index 19336603..34c0a72d 100644 --- a/sdnc-a1-controller/northbound/nonrt-ric-api/model/src/main/yang/NONRT-RIC-API.yang +++ b/sdnc-a1-controller/northbound/nonrt-ric-api/model/src/main/yang/NONRT-RIC-API.yang @@ -19,7 +19,7 @@ // module A1-ADAPTER-API { - namespace "org:onap:sdnc:northbound:a1-adapter"; + namespace "org:o_ran_sc:nonrtric:sdnc_a1:northbound:a1-adapter"; prefix a1-adapter-api; diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/pom.xml b/sdnc-a1-controller/northbound/nonrt-ric-api/pom.xml index 44b02e23..2868a0c0 100644 --- a/sdnc-a1-controller/northbound/nonrt-ric-api/pom.xml +++ b/sdnc-a1-controller/northbound/nonrt-ric-api/pom.xml @@ -30,12 +30,12 @@ - org.onap.sdnc.northbound + org.o-ran-sc.nonrtric.sdnc-a1.northbound nonrt-ric-api 1.7.3-SNAPSHOT pom - sdnc-northbound :: nonrt-ric-api + sdnc-a1-northbound :: nonrt-ric-api 3.7.0.1746 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 e3c7ab95..da53f920 100644 --- a/sdnc-a1-controller/northbound/nonrt-ric-api/provider/pom.xml +++ b/sdnc-a1-controller/northbound/nonrt-ric-api/provider/pom.xml @@ -38,12 +38,12 @@ - org.onap.sdnc.northbound + org.o-ran-sc.nonrtric.sdnc-a1.northbound nonrt-ric-api-provider 1.7.3-SNAPSHOT bundle - sdnc-northbound :: nonrt-ric-api :: ${project.artifactId} + sdnc-a1-northbound :: nonrt-ric-api :: ${project.artifactId} @@ -93,7 +93,7 @@ - org.onap.sdnc.northbound + org.o-ran-sc.nonrtric.sdnc-a1.northbound nonrt-ric-api-model ${project.version} diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/java/org/onap/sdnc/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 similarity index 80% rename from sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/java/org/onap/sdnc/northbound/provider/NonrtRicApiProvider.java rename to sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/java/org/o_ran_sc/nonrtric/sdnc_a1/northbound/provider/NonrtRicApiProvider.java index 12704df6..ac9181bf 100644 --- a/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/java/org/onap/sdnc/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 @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.sdnc.northbound.provider; +package org.o_ran_sc.nonrtric.sdnc_a1.northbound.provider; import com.google.common.util.concurrent.CheckedFuture; import com.google.common.util.concurrent.Futures; @@ -26,31 +26,31 @@ import com.google.common.util.concurrent.ListenableFuture; import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import org.onap.sdnc.northbound.restadapter.RestAdapter; -import org.onap.sdnc.northbound.restadapter.RestAdapterImpl; +import org.o_ran_sc.nonrtric.sdnc_a1.northbound.restadapter.RestAdapter; +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.onap.sdnc.northbound.a1.adapter.rev200122.A1ADAPTERAPIService; -import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.DeleteA1PolicyInput; -import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.DeleteA1PolicyOutput; -import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.DeleteA1PolicyOutputBuilder; -import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.GetA1PolicyInput; -import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.GetA1PolicyInputBuilder; -import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.GetA1PolicyOutput; -import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.GetA1PolicyOutputBuilder; -import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.GetA1PolicyStatusInput; -import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.GetA1PolicyStatusOutput; -import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.GetA1PolicyStatusOutputBuilder; -import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.GetA1PolicyTypeInput; -import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.GetA1PolicyTypeOutput; -import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.GetA1PolicyTypeOutputBuilder; -import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.PutA1PolicyInput; -import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.PutA1PolicyOutput; -import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.PutA1PolicyOutputBuilder; +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; +import org.opendaylight.yang.gen.v1.org.o_ran_sc.nonrtric.sdnc_a1.northbound.a1.adapter.rev200122.DeleteA1PolicyOutput; +import org.opendaylight.yang.gen.v1.org.o_ran_sc.nonrtric.sdnc_a1.northbound.a1.adapter.rev200122.DeleteA1PolicyOutputBuilder; +import org.opendaylight.yang.gen.v1.org.o_ran_sc.nonrtric.sdnc_a1.northbound.a1.adapter.rev200122.GetA1PolicyInput; +import org.opendaylight.yang.gen.v1.org.o_ran_sc.nonrtric.sdnc_a1.northbound.a1.adapter.rev200122.GetA1PolicyInputBuilder; +import org.opendaylight.yang.gen.v1.org.o_ran_sc.nonrtric.sdnc_a1.northbound.a1.adapter.rev200122.GetA1PolicyOutput; +import org.opendaylight.yang.gen.v1.org.o_ran_sc.nonrtric.sdnc_a1.northbound.a1.adapter.rev200122.GetA1PolicyOutputBuilder; +import org.opendaylight.yang.gen.v1.org.o_ran_sc.nonrtric.sdnc_a1.northbound.a1.adapter.rev200122.GetA1PolicyStatusInput; +import org.opendaylight.yang.gen.v1.org.o_ran_sc.nonrtric.sdnc_a1.northbound.a1.adapter.rev200122.GetA1PolicyStatusOutput; +import org.opendaylight.yang.gen.v1.org.o_ran_sc.nonrtric.sdnc_a1.northbound.a1.adapter.rev200122.GetA1PolicyStatusOutputBuilder; +import org.opendaylight.yang.gen.v1.org.o_ran_sc.nonrtric.sdnc_a1.northbound.a1.adapter.rev200122.GetA1PolicyTypeInput; +import org.opendaylight.yang.gen.v1.org.o_ran_sc.nonrtric.sdnc_a1.northbound.a1.adapter.rev200122.GetA1PolicyTypeOutput; +import org.opendaylight.yang.gen.v1.org.o_ran_sc.nonrtric.sdnc_a1.northbound.a1.adapter.rev200122.GetA1PolicyTypeOutputBuilder; +import org.opendaylight.yang.gen.v1.org.o_ran_sc.nonrtric.sdnc_a1.northbound.a1.adapter.rev200122.PutA1PolicyInput; +import org.opendaylight.yang.gen.v1.org.o_ran_sc.nonrtric.sdnc_a1.northbound.a1.adapter.rev200122.PutA1PolicyOutput; +import org.opendaylight.yang.gen.v1.org.o_ran_sc.nonrtric.sdnc_a1.northbound.a1.adapter.rev200122.PutA1PolicyOutputBuilder; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/java/org/onap/sdnc/northbound/restadapter/RestAdapter.java b/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/java/org/o_ran_sc/nonrtric/sdnc_a1/northbound/restadapter/RestAdapter.java similarity index 96% rename from sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/java/org/onap/sdnc/northbound/restadapter/RestAdapter.java rename to sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/java/org/o_ran_sc/nonrtric/sdnc_a1/northbound/restadapter/RestAdapter.java index a99edceb..9cd40af0 100644 --- a/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/java/org/onap/sdnc/northbound/restadapter/RestAdapter.java +++ b/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/java/org/o_ran_sc/nonrtric/sdnc_a1/northbound/restadapter/RestAdapter.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.sdnc.northbound.restadapter; +package org.o_ran_sc.nonrtric.sdnc_a1.northbound.restadapter; import org.springframework.http.ResponseEntity; diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/java/org/onap/sdnc/northbound/restadapter/RestAdapterImpl.java b/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/java/org/o_ran_sc/nonrtric/sdnc_a1/northbound/restadapter/RestAdapterImpl.java similarity index 97% rename from sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/java/org/onap/sdnc/northbound/restadapter/RestAdapterImpl.java rename to sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/java/org/o_ran_sc/nonrtric/sdnc_a1/northbound/restadapter/RestAdapterImpl.java index 9e9d28a0..65809836 100644 --- a/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/java/org/onap/sdnc/northbound/restadapter/RestAdapterImpl.java +++ b/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/java/org/o_ran_sc/nonrtric/sdnc_a1/northbound/restadapter/RestAdapterImpl.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.sdnc.northbound.restadapter; +package org.o_ran_sc.nonrtric.sdnc_a1.northbound.restadapter; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/resources/OSGI-INF/blueprint/nonrt-ric-api-blueprint.xml b/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/resources/OSGI-INF/blueprint/nonrt-ric-api-blueprint.xml index 3f732ab3..53c15096 100644 --- a/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/resources/OSGI-INF/blueprint/nonrt-ric-api-blueprint.xml +++ b/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/resources/OSGI-INF/blueprint/nonrt-ric-api-blueprint.xml @@ -34,7 +34,7 @@ interface="org.opendaylight.controller.sal.binding.api.RpcProviderRegistry" odl:type="default" /> - + diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/resources/org/opendaylight/blueprint/nonrt-ric-api-blueprint.xml b/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/resources/org/opendaylight/blueprint/nonrt-ric-api-blueprint.xml index 3f732ab3..53c15096 100644 --- a/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/resources/org/opendaylight/blueprint/nonrt-ric-api-blueprint.xml +++ b/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/resources/org/opendaylight/blueprint/nonrt-ric-api-blueprint.xml @@ -34,7 +34,7 @@ interface="org.opendaylight.controller.sal.binding.api.RpcProviderRegistry" odl:type="default" /> - + diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/test/java/org/onap/sdnc/northbound/NonrtRicApiProviderTest.java b/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/test/java/org/o_ran_sc/nonrtric/sdnc_a1/northbound/NonrtRicApiProviderTest.java similarity index 82% rename from sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/test/java/org/onap/sdnc/northbound/NonrtRicApiProviderTest.java rename to sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/test/java/org/o_ran_sc/nonrtric/sdnc_a1/northbound/NonrtRicApiProviderTest.java index 94b2f923..dd76a077 100644 --- a/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/test/java/org/onap/sdnc/northbound/NonrtRicApiProviderTest.java +++ b/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/test/java/org/o_ran_sc/nonrtric/sdnc_a1/northbound/NonrtRicApiProviderTest.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.sdnc.northbound; +package org.o_ran_sc.nonrtric.sdnc_a1.northbound; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.when; @@ -32,22 +32,22 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.internal.util.reflection.Whitebox; import org.mockito.runners.MockitoJUnitRunner; -import org.onap.sdnc.northbound.provider.NonrtRicApiProvider; -import org.onap.sdnc.northbound.restadapter.RestAdapter; +import org.o_ran_sc.nonrtric.sdnc_a1.northbound.provider.NonrtRicApiProvider; +import org.o_ran_sc.nonrtric.sdnc_a1.northbound.restadapter.RestAdapter; 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.test.AbstractConcurrentDataBrokerTest; import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry; -import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.DeleteA1PolicyInputBuilder; -import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.DeleteA1PolicyOutput; -import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.GetA1PolicyInputBuilder; -import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.GetA1PolicyOutput; -import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.GetA1PolicyStatusInputBuilder; -import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.GetA1PolicyStatusOutput; -import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.GetA1PolicyTypeInputBuilder; -import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.GetA1PolicyTypeOutput; -import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.PutA1PolicyInputBuilder; -import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.a1.adapter.rev200122.PutA1PolicyOutput; +import org.opendaylight.yang.gen.v1.org.o_ran_sc.nonrtric.sdnc_a1.northbound.a1.adapter.rev200122.DeleteA1PolicyInputBuilder; +import org.opendaylight.yang.gen.v1.org.o_ran_sc.nonrtric.sdnc_a1.northbound.a1.adapter.rev200122.DeleteA1PolicyOutput; +import org.opendaylight.yang.gen.v1.org.o_ran_sc.nonrtric.sdnc_a1.northbound.a1.adapter.rev200122.GetA1PolicyInputBuilder; +import org.opendaylight.yang.gen.v1.org.o_ran_sc.nonrtric.sdnc_a1.northbound.a1.adapter.rev200122.GetA1PolicyOutput; +import org.opendaylight.yang.gen.v1.org.o_ran_sc.nonrtric.sdnc_a1.northbound.a1.adapter.rev200122.GetA1PolicyStatusInputBuilder; +import org.opendaylight.yang.gen.v1.org.o_ran_sc.nonrtric.sdnc_a1.northbound.a1.adapter.rev200122.GetA1PolicyStatusOutput; +import org.opendaylight.yang.gen.v1.org.o_ran_sc.nonrtric.sdnc_a1.northbound.a1.adapter.rev200122.GetA1PolicyTypeInputBuilder; +import org.opendaylight.yang.gen.v1.org.o_ran_sc.nonrtric.sdnc_a1.northbound.a1.adapter.rev200122.GetA1PolicyTypeOutput; +import org.opendaylight.yang.gen.v1.org.o_ran_sc.nonrtric.sdnc_a1.northbound.a1.adapter.rev200122.PutA1PolicyInputBuilder; +import org.opendaylight.yang.gen.v1.org.o_ran_sc.nonrtric.sdnc_a1.northbound.a1.adapter.rev200122.PutA1PolicyOutput; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sdnc-a1-controller/northbound/pom.xml b/sdnc-a1-controller/northbound/pom.xml index 162a4233..6e0878c8 100644 --- a/sdnc-a1-controller/northbound/pom.xml +++ b/sdnc-a1-controller/northbound/pom.xml @@ -36,8 +36,8 @@ - org.onap.sdnc.northbound - sdnc-northbound + org.o-ran-sc.nonrtric.sdnc-a1.northbound + sdnc-a1-northbound 1.7.3-SNAPSHOT pom @@ -45,7 +45,7 @@ 3.7.0.1746 - sdnc-northbound + sdnc-a1-northbound The SDN-C Northbound APIs repo contains code for northbound API adaptors, typically MD-SAL applications https://wiki.onap.org @@ -57,27 +57,6 @@ nonrt-ric-api - - scm:git:ssh://git@${onap.git.host}/sdnc-northbound.git - - scm:git:ssh://${onap.git.host}:${onap.git.port}/${onap.git.project}/sdnc-northbound.git - ${onap.git.protocol}://${onap.git.host}/projects/${onap.git.project}/repos/sdnc-northbound/browse - - - JIRA - https://jira.onap.org/ - - - Jenkins - https://jenkins.onap.org/ - - - - sdnc-javadoc - dav:https://${onap.nexus.host}:${onap.nexus.port}/repository/sdn-c-javadoc/${project.artifactId}/${project.version} - - - diff --git a/sdnc-a1-controller/oam/README.md b/sdnc-a1-controller/oam/README.md index 2cabf6bd..7f74ef74 100644 --- a/sdnc-a1-controller/oam/README.md +++ b/sdnc-a1-controller/oam/README.md @@ -1,15 +1,4 @@ -This source repository contains the code for SDN Controller operations, administration and maintenance utilities. This code depends on the following, which should be downloaded and compiled first: - -1. org.openecomp.sdnc/sdnc-core -2. org.openecomp.sdnc/sdnc-adaptors -3. org.openecomp.sdnc/sdnc-northbound -4. org.openecomp.sdnc/sdnc-plugins - -To compile this code: - -1. Make sure your local Maven settings file ($HOME/.m2/settings.xml) contains references to the OpenECOMP repositories and OpenDaylight repositories. See example-settings.xml for an example. - -2. To compile, run "mvn clean install". +This source repository contains the code for SDN-A1 Controller operations, administration and maintenance utilities. To compile, run "mvn clean install". ## License diff --git a/sdnc-a1-controller/oam/installation/TagVersion.groovy b/sdnc-a1-controller/oam/installation/TagVersion.groovy index 9daac313..551eb70e 100644 --- a/sdnc-a1-controller/oam/installation/TagVersion.groovy +++ b/sdnc-a1-controller/oam/installation/TagVersion.groovy @@ -21,7 +21,7 @@ * */ -package org.onap.sdnc.oam +package org.o_ran_sc.nonrtric.sdnc_a1.oam def versionArray; diff --git a/sdnc-a1-controller/oam/installation/pom.xml b/sdnc-a1-controller/oam/installation/pom.xml index 76ff884e..0b64bca4 100644 --- a/sdnc-a1-controller/oam/installation/pom.xml +++ b/sdnc-a1-controller/oam/installation/pom.xml @@ -28,14 +28,14 @@ 4.0.0 pom - org.onap.sdnc.oam + org.o-ran-sc.nonrtric.sdnc-a1.oam installation 1.7.3-SNAPSHOT - sdnc-oam :: installation + sdnc-a1-oam :: installation Installs SDN-C on local file system - sdnc + sdnc-a1 diff --git a/sdnc-a1-controller/oam/installation/sdnc/pom.xml b/sdnc-a1-controller/oam/installation/sdnc-a1/pom.xml similarity index 97% rename from sdnc-a1-controller/oam/installation/sdnc/pom.xml rename to sdnc-a1-controller/oam/installation/sdnc-a1/pom.xml index 8525571b..bf8bfe31 100644 --- a/sdnc-a1-controller/oam/installation/sdnc/pom.xml +++ b/sdnc-a1-controller/oam/installation/sdnc-a1/pom.xml @@ -28,11 +28,11 @@ 4.0.0 pom - org.onap.sdnc.oam - installation-sdnc + org.o-ran-sc.nonrtric.sdnc-a1.oam + installation-sdnc-a1 1.7.3-SNAPSHOT - sdnc-oam :: installation :: ${project.artifactId} + sdnc-a1-oam :: installation :: ${project.artifactId} Creates SDN Controller Docker container @@ -50,15 +50,15 @@ - org.onap.sdnc.northbound + org.o-ran-sc.nonrtric.sdnc-a1.northbound nonrt-ric-api-installer ${sdnc.northbound.version} repo zip - org.onap.sdnc.northbound - sdnc-northbound-features-installer + org.o-ran-sc.nonrtric.sdnc-a1.northbound + sdnc-a1-northbound-features-installer ${sdnc.northbound.version} repo zip diff --git a/sdnc-a1-controller/oam/installation/sdnc/src/main/docker/standalone.Dockerfile b/sdnc-a1-controller/oam/installation/sdnc-a1/src/main/docker/standalone.Dockerfile similarity index 88% rename from sdnc-a1-controller/oam/installation/sdnc/src/main/docker/standalone.Dockerfile rename to sdnc-a1-controller/oam/installation/sdnc-a1/src/main/docker/standalone.Dockerfile index 629732c5..3077ee5a 100755 --- a/sdnc-a1-controller/oam/installation/sdnc/src/main/docker/standalone.Dockerfile +++ b/sdnc-a1-controller/oam/installation/sdnc-a1/src/main/docker/standalone.Dockerfile @@ -20,7 +20,7 @@ RUN rsync -a /tmp/system $ODL_HOME FROM nexus3.onap.org:10001/onap/ccsdk-odlsli-alpine-image:${ccsdk.docker.version} -MAINTAINER SDN-C Team (sdnc@lists.onap.org) +MAINTAINER O-RAN-SC NONRTRIC Team ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk ENV ODL_HOME /opt/opendaylight @@ -28,7 +28,7 @@ ENV SDNC_CONFIG_DIR /opt/onap/sdnc/data/properties ENV SDNC_STORE_DIR /opt/onap/sdnc/data/stores ENV SSL_CERTS_DIR /etc/ssl/certs ENV JAVA_SECURITY_DIR $SSL_CERTS_DIR/java -ENV SDNC_NORTHBOUND_REPO mvn:org.onap.sdnc.northbound/sdnc-northbound-all/${sdnc.northbound.version}/xml/features +ENV SDNC_NORTHBOUND_REPO mvn:org.o-ran-sc.nonrtric.sdnc-a1.northbound/sdnc-a1-northbound-all/${sdnc.northbound.version}/xml/features ENV SDNC_KEYSTORE ${sdnc.keystore} ENV SDNC_KEYPASS ${sdnc.keypass} ENV SDNC_SECUREPORT ${sdnc.secureport} @@ -40,7 +40,7 @@ COPY --from=stage0 --chown=odl:odl /opt /opt # Add SDNC repositories to boot repositories RUN cp $ODL_HOME/etc/org.apache.karaf.features.cfg $ODL_HOME/etc/org.apache.karaf.features.cfg.orig RUN sed -i -e "\|featuresRepositories|s|$|,${SDNC_NORTHBOUND_REPO}|" $ODL_HOME/etc/org.apache.karaf.features.cfg -RUN sed -i -e "\|featuresBoot[^a-zA-Z]|s|$|,sdnc-northbound-all|" $ODL_HOME/etc/org.apache.karaf.features.cfg +RUN sed -i -e "\|featuresBoot[^a-zA-Z]|s|$|,sdnc-a1-northbound-all|" $ODL_HOME/etc/org.apache.karaf.features.cfg RUN sed -i "s/odl-restconf-all/odl-restconf-all,odl-netconf-topology/g" $ODL_HOME/etc/org.apache.karaf.features.cfg # Install ssl and java certificates diff --git a/sdnc-a1-controller/oam/installation/sdnc/src/main/resources/sdnctl.dump b/sdnc-a1-controller/oam/installation/sdnc-a1/src/main/resources/sdnctl.dump similarity index 100% rename from sdnc-a1-controller/oam/installation/sdnc/src/main/resources/sdnctl.dump rename to sdnc-a1-controller/oam/installation/sdnc-a1/src/main/resources/sdnctl.dump diff --git a/sdnc-a1-controller/oam/installation/sdnc/src/main/resources/truststoreONAPall.jks b/sdnc-a1-controller/oam/installation/sdnc-a1/src/main/resources/truststoreONAPall.jks similarity index 100% rename from sdnc-a1-controller/oam/installation/sdnc/src/main/resources/truststoreONAPall.jks rename to sdnc-a1-controller/oam/installation/sdnc-a1/src/main/resources/truststoreONAPall.jks diff --git a/sdnc-a1-controller/oam/installation/sdnc/src/main/scripts/addSdncKeyStore.sh b/sdnc-a1-controller/oam/installation/sdnc-a1/src/main/scripts/addSdncKeyStore.sh similarity index 100% rename from sdnc-a1-controller/oam/installation/sdnc/src/main/scripts/addSdncKeyStore.sh rename to sdnc-a1-controller/oam/installation/sdnc-a1/src/main/scripts/addSdncKeyStore.sh diff --git a/sdnc-a1-controller/oam/installation/sdnc/src/main/scripts/installCerts.py b/sdnc-a1-controller/oam/installation/sdnc-a1/src/main/scripts/installCerts.py similarity index 100% rename from sdnc-a1-controller/oam/installation/sdnc/src/main/scripts/installCerts.py rename to sdnc-a1-controller/oam/installation/sdnc-a1/src/main/scripts/installCerts.py diff --git a/sdnc-a1-controller/oam/installation/sdnc/src/main/scripts/installSdncDb.sh b/sdnc-a1-controller/oam/installation/sdnc-a1/src/main/scripts/installSdncDb.sh similarity index 100% rename from sdnc-a1-controller/oam/installation/sdnc/src/main/scripts/installSdncDb.sh rename to sdnc-a1-controller/oam/installation/sdnc-a1/src/main/scripts/installSdncDb.sh diff --git a/sdnc-a1-controller/oam/installation/sdnc/src/main/scripts/startODL.sh b/sdnc-a1-controller/oam/installation/sdnc-a1/src/main/scripts/startODL.sh similarity index 96% rename from sdnc-a1-controller/oam/installation/sdnc/src/main/scripts/startODL.sh rename to sdnc-a1-controller/oam/installation/sdnc-a1/src/main/scripts/startODL.sh index 9418984b..1b8f5192 100755 --- a/sdnc-a1-controller/oam/installation/sdnc/src/main/scripts/startODL.sh +++ b/sdnc-a1-controller/oam/installation/sdnc-a1/src/main/scripts/startODL.sh @@ -51,9 +51,9 @@ fi if [ ! -f ${INSTALLED_DIR}/.installed ] then - echo "Installing SDN-C database" + echo "Installing SDNC-A1 database" ${SDNC_HOME}/bin/installSdncDb.sh - echo "Installing SDN-C keyStore" + echo "Installing SDNC-A1 keyStore" ${SDNC_HOME}/bin/addSdncKeyStore.sh if [ -x ${SDNC_HOME}/svclogic/bin/install.sh ] diff --git a/sdnc-a1-controller/oam/platform-logic/installer/pom.xml b/sdnc-a1-controller/oam/platform-logic/installer/pom.xml index 668c5b02..77fb72c6 100644 --- a/sdnc-a1-controller/oam/platform-logic/installer/pom.xml +++ b/sdnc-a1-controller/oam/platform-logic/installer/pom.xml @@ -28,12 +28,12 @@ - org.onap.sdnc.oam + org.o-ran-sc.nonrtric.sdnc-a1.oam platform-logic-installer 1.7.3-SNAPSHOT pom - sdnc-oam :: platform-logic :: ${project.artifactId} + sdnc-a1-oam :: platform-logic :: ${project.artifactId} Contains platform-level service logic installer diff --git a/sdnc-a1-controller/oam/platform-logic/pom.xml b/sdnc-a1-controller/oam/platform-logic/pom.xml index 2644861d..c4f3e8fe 100644 --- a/sdnc-a1-controller/oam/platform-logic/pom.xml +++ b/sdnc-a1-controller/oam/platform-logic/pom.xml @@ -28,12 +28,12 @@ - org.onap.sdnc.oam + org.o-ran-sc.nonrtric.sdnc-a1.oam platform-logic 1.7.3-SNAPSHOT pom - sdnc-oam :: platform-logic + sdnc-a1-oam :: platform-logic Contains platform-level service logic ONAP diff --git a/sdnc-a1-controller/oam/platform-logic/setup/pom.xml b/sdnc-a1-controller/oam/platform-logic/setup/pom.xml index 68e506ce..4b8b3543 100644 --- a/sdnc-a1-controller/oam/platform-logic/setup/pom.xml +++ b/sdnc-a1-controller/oam/platform-logic/setup/pom.xml @@ -28,12 +28,12 @@ - org.onap.sdnc.oam + org.o-ran-sc.nonrtric.sdnc-a1.oam platform-logic-setup 1.7.3-SNAPSHOT pom - sdnc-oam :: platform-logic :: ${project.artifactId} + sdnc-a1-oam :: platform-logic :: ${project.artifactId} Copies base ONAP platform-logic diff --git a/sdnc-a1-controller/oam/pom.xml b/sdnc-a1-controller/oam/pom.xml index 6ac9f907..8cc1cabc 100755 --- a/sdnc-a1-controller/oam/pom.xml +++ b/sdnc-a1-controller/oam/pom.xml @@ -27,12 +27,12 @@ 1.4.3 - org.onap.sdnc.oam - sdnc-oam + org.o-ran-sc.nonrtric.sdnc-a1.oam + sdnc-a1-oam 1.7.3-SNAPSHOT pom - sdnc-oam + sdnc-a1-oam The SDN-C OAM component contains the components needed to operate, administer and maintain the SDN-C platform. https://wiki.onap.org @@ -43,27 +43,6 @@ platform-logic - - scm:git:ssh://git@${onap.git.host}/sdnc-oam.git - scm:git:ssh://${onap.git.host}:${onap.git.port}/${onap.git.project}/sdnc-oam.git - ${onap.git.protocol}://${onap.git.host}/projects/${onap.git.project}/repos/sdnc-oam/browse - HEAD - - - JIRA - https://jira.onap.org/ - - - Jenkins - https://jenkins.onap.org/ - - - - sdnc-javadoc - dav:https://${onap.nexus.host}:${onap.nexus.port}/repository/sdn-c-javadoc/${project.artifactId}/${project.version} - - - diff --git a/sdnc-a1-controller/pom.xml b/sdnc-a1-controller/pom.xml index f2decfd9..96ca1a5d 100644 --- a/sdnc-a1-controller/pom.xml +++ b/sdnc-a1-controller/pom.xml @@ -23,12 +23,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.onap.sdnc - sdnc + org.o-ran-sc.nonrtric.sdnc-a1 + sdnc-a1 1.7.4-SNAPSHOT pom - sdnc + sdnc-a1 3.7.0.1746 -- 2.16.6