From 49a8fd46e851049849cc1535ecce01ced9c8a4bd Mon Sep 17 00:00:00 2001 From: RehanRaza Date: Mon, 11 Nov 2019 18:02:32 +0100 Subject: [PATCH] Add parent POM file for nonrtric Change-Id: If78816a9aac0ff12c68dc6f4094fc063a7c80aa7 Issue-ID: NONRTRIC-70 Signed-off-by: RehanRaza --- dashboard/a1-controller-client/.gitignore | 1 + dashboard/webapp-backend/.gitignore | 2 +- near-rt-ric-simulator/.gitignore | 31 + near-rt-ric-simulator/README.md | 3 +- .../{nearric-simulator => }/a1-med-api/.gitignore | 0 .../{nearric-simulator => }/a1-med-api/pom.xml | 0 .../src/main/resources/a1_mediator_0.11.0.yaml | 0 .../nearric-service/.gitignore | 0 near-rt-ric-simulator/nearric-service/Dockerfile | 10 + .../nearric-service/container-tag.yaml | 0 .../nearric-service/pom.xml | 8 +- .../simulator/config/ApplicationConfig.java | 0 .../simulator/config/NearRicApplication.java | 0 .../simulator/config/SwaggerConfiguration.java | 0 .../onap/nearric/simulator/controller/A1PApi.java | 0 .../simulator/controller/A1PApiController.java | 0 .../nearric/simulator/model/PolicyInstance.java | 0 .../onap/nearric/simulator/model/PolicyType.java | 0 .../nearric/simulator/service/A1PApiService.java | 0 .../simulator/service/A1PApiServiceImpl.java | 0 .../src/main/resources/application.properties | 0 .../nearric-service/test/.gitignore | 0 .../nearric-service/test/pi-template.json | 0 .../nearric-service/test/populate.sh | 0 .../nearric-service/test/pt-template.json | 0 .../nearric-service/test/test-api.sh | 0 near-rt-ric-simulator/nearric-simulator/.classpath | 6 - near-rt-ric-simulator/nearric-simulator/.project | 18 - .../.settings/org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.m2e.core.prefs | 4 - near-rt-ric-simulator/nearric-simulator/README.md | 25 - .../nearric-simulator/a1-med-api/.classpath | 32 - .../nearric-simulator/a1-med-api/.project | 23 - .../.settings/org.eclipse.core.resources.prefs | 3 - .../.settings/org.eclipse.jdt.core.prefs | 9 - .../.settings/org.eclipse.m2e.core.prefs | 4 - .../nearric-simulator/a1-med-api/a1-med-api.iml | 969 --------------------- .../nearric-simulator/a1-med-api/a1-med-api.ipr | 107 --- .../nearric-simulator/a1-med-api/a1-med-api.iws | 418 --------- .../nearric-simulator/nearric-service/.classpath | 33 - .../nearric-simulator/nearric-service/.project | 23 - .../.settings/org.eclipse.core.resources.prefs | 5 - .../.settings/org.eclipse.jdt.core.prefs | 16 - .../.settings/org.eclipse.m2e.core.prefs | 4 - .../nearric-simulator/nearric-service/Dockerfile | 10 - .../{nearric-simulator => }/pom.xml | 5 + pom.xml | 37 + sdnc-a1-controller/.gitignore | 31 + .../features/features-sdnc-northbound/pom.xml | 8 + .../features/sdnc-northbound-all/pom.xml | 8 + .../northbound/nonrt-ric-api/model/pom.xml | 15 + .../northbound/nonrt-ric-api/provider/pom.xml | 25 + sdnc-a1-controller/northbound/pom.xml | 8 + sdnc-a1-controller/oam/pom.xml | 3 + sdnc-a1-controller/pom.xml | 36 + 55 files changed, 228 insertions(+), 1714 deletions(-) create mode 100755 near-rt-ric-simulator/.gitignore rename near-rt-ric-simulator/{nearric-simulator => }/a1-med-api/.gitignore (100%) rename near-rt-ric-simulator/{nearric-simulator => }/a1-med-api/pom.xml (100%) rename near-rt-ric-simulator/{nearric-simulator => }/a1-med-api/src/main/resources/a1_mediator_0.11.0.yaml (100%) rename near-rt-ric-simulator/{nearric-simulator => }/nearric-service/.gitignore (100%) create mode 100644 near-rt-ric-simulator/nearric-service/Dockerfile rename near-rt-ric-simulator/{nearric-simulator => }/nearric-service/container-tag.yaml (100%) rename near-rt-ric-simulator/{nearric-simulator => }/nearric-service/pom.xml (94%) rename near-rt-ric-simulator/{nearric-simulator => }/nearric-service/src/main/java/org/onap/nearric/simulator/config/ApplicationConfig.java (100%) rename near-rt-ric-simulator/{nearric-simulator => }/nearric-service/src/main/java/org/onap/nearric/simulator/config/NearRicApplication.java (100%) rename near-rt-ric-simulator/{nearric-simulator => }/nearric-service/src/main/java/org/onap/nearric/simulator/config/SwaggerConfiguration.java (100%) rename near-rt-ric-simulator/{nearric-simulator => }/nearric-service/src/main/java/org/onap/nearric/simulator/controller/A1PApi.java (100%) rename near-rt-ric-simulator/{nearric-simulator => }/nearric-service/src/main/java/org/onap/nearric/simulator/controller/A1PApiController.java (100%) rename near-rt-ric-simulator/{nearric-simulator => }/nearric-service/src/main/java/org/onap/nearric/simulator/model/PolicyInstance.java (100%) rename near-rt-ric-simulator/{nearric-simulator => }/nearric-service/src/main/java/org/onap/nearric/simulator/model/PolicyType.java (100%) rename near-rt-ric-simulator/{nearric-simulator => }/nearric-service/src/main/java/org/onap/nearric/simulator/service/A1PApiService.java (100%) rename near-rt-ric-simulator/{nearric-simulator => }/nearric-service/src/main/java/org/onap/nearric/simulator/service/A1PApiServiceImpl.java (100%) rename near-rt-ric-simulator/{nearric-simulator => }/nearric-service/src/main/resources/application.properties (100%) rename near-rt-ric-simulator/{nearric-simulator => }/nearric-service/test/.gitignore (100%) rename near-rt-ric-simulator/{nearric-simulator => }/nearric-service/test/pi-template.json (100%) rename near-rt-ric-simulator/{nearric-simulator => }/nearric-service/test/populate.sh (100%) rename near-rt-ric-simulator/{nearric-simulator => }/nearric-service/test/pt-template.json (100%) rename near-rt-ric-simulator/{nearric-simulator => }/nearric-service/test/test-api.sh (100%) delete mode 100644 near-rt-ric-simulator/nearric-simulator/.classpath delete mode 100644 near-rt-ric-simulator/nearric-simulator/.project delete mode 100644 near-rt-ric-simulator/nearric-simulator/.settings/org.eclipse.core.resources.prefs delete mode 100644 near-rt-ric-simulator/nearric-simulator/.settings/org.eclipse.m2e.core.prefs delete mode 100644 near-rt-ric-simulator/nearric-simulator/README.md delete mode 100644 near-rt-ric-simulator/nearric-simulator/a1-med-api/.classpath delete mode 100644 near-rt-ric-simulator/nearric-simulator/a1-med-api/.project delete mode 100644 near-rt-ric-simulator/nearric-simulator/a1-med-api/.settings/org.eclipse.core.resources.prefs delete mode 100644 near-rt-ric-simulator/nearric-simulator/a1-med-api/.settings/org.eclipse.jdt.core.prefs delete mode 100644 near-rt-ric-simulator/nearric-simulator/a1-med-api/.settings/org.eclipse.m2e.core.prefs delete mode 100644 near-rt-ric-simulator/nearric-simulator/a1-med-api/a1-med-api.iml delete mode 100644 near-rt-ric-simulator/nearric-simulator/a1-med-api/a1-med-api.ipr delete mode 100644 near-rt-ric-simulator/nearric-simulator/a1-med-api/a1-med-api.iws delete mode 100644 near-rt-ric-simulator/nearric-simulator/nearric-service/.classpath delete mode 100644 near-rt-ric-simulator/nearric-simulator/nearric-service/.project delete mode 100644 near-rt-ric-simulator/nearric-simulator/nearric-service/.settings/org.eclipse.core.resources.prefs delete mode 100644 near-rt-ric-simulator/nearric-simulator/nearric-service/.settings/org.eclipse.jdt.core.prefs delete mode 100644 near-rt-ric-simulator/nearric-simulator/nearric-service/.settings/org.eclipse.m2e.core.prefs delete mode 100644 near-rt-ric-simulator/nearric-simulator/nearric-service/Dockerfile rename near-rt-ric-simulator/{nearric-simulator => }/pom.xml (87%) create mode 100644 pom.xml create mode 100755 sdnc-a1-controller/.gitignore create mode 100644 sdnc-a1-controller/pom.xml diff --git a/dashboard/a1-controller-client/.gitignore b/dashboard/a1-controller-client/.gitignore index 27fd4617..212de161 100644 --- a/dashboard/a1-controller-client/.gitignore +++ b/dashboard/a1-controller-client/.gitignore @@ -21,3 +21,4 @@ target build logs/ +bin/ diff --git a/dashboard/webapp-backend/.gitignore b/dashboard/webapp-backend/.gitignore index 02dbd440..e3d7171b 100644 --- a/dashboard/webapp-backend/.gitignore +++ b/dashboard/webapp-backend/.gitignore @@ -4,7 +4,7 @@ /target/ /logs/ /.mvn/wrapper/maven-wrapper.jar -/logs/ +bin/ ### STS ### .apt_generated diff --git a/near-rt-ric-simulator/.gitignore b/near-rt-ric-simulator/.gitignore new file mode 100755 index 00000000..264db967 --- /dev/null +++ b/near-rt-ric-simulator/.gitignore @@ -0,0 +1,31 @@ +#####standard .git ignore entries##### + +## IDE Specific Files ## +org.eclipse.core.resources.prefs +.classpath +.project +.settings +.idea +.externalToolBuilders +.checkstyle +maven-eclipse.xml +workspace + +## Compilation Files ## +*.class +**/target +target +target-ide +MANIFEST.MF + +## Misc Ignores (OS specific etc) ## +bin/ +dist +*~ +*.ipr +*.iml +*.iws +classes +out/ +.DS_STORE +.metadata diff --git a/near-rt-ric-simulator/README.md b/near-rt-ric-simulator/README.md index 88f309b4..298b9882 100644 --- a/near-rt-ric-simulator/README.md +++ b/near-rt-ric-simulator/README.md @@ -4,7 +4,8 @@ The O-RAN SC Near-RealTime RIC simulates the A1 as an generic REST API which can Please see the documentation in the docs/ folder -For more information about the NONRTRIC project please see the [project website](https://wiki.o-ran-sc.org/display/RICNR "O-RAN-SC NONRTRIC project") +The backend server publishes live API documentation at the +URL `http://your-host-name-here:8080/swagger-ui.html` ## License diff --git a/near-rt-ric-simulator/nearric-simulator/a1-med-api/.gitignore b/near-rt-ric-simulator/a1-med-api/.gitignore similarity index 100% rename from near-rt-ric-simulator/nearric-simulator/a1-med-api/.gitignore rename to near-rt-ric-simulator/a1-med-api/.gitignore diff --git a/near-rt-ric-simulator/nearric-simulator/a1-med-api/pom.xml b/near-rt-ric-simulator/a1-med-api/pom.xml similarity index 100% rename from near-rt-ric-simulator/nearric-simulator/a1-med-api/pom.xml rename to near-rt-ric-simulator/a1-med-api/pom.xml diff --git a/near-rt-ric-simulator/nearric-simulator/a1-med-api/src/main/resources/a1_mediator_0.11.0.yaml b/near-rt-ric-simulator/a1-med-api/src/main/resources/a1_mediator_0.11.0.yaml similarity index 100% rename from near-rt-ric-simulator/nearric-simulator/a1-med-api/src/main/resources/a1_mediator_0.11.0.yaml rename to near-rt-ric-simulator/a1-med-api/src/main/resources/a1_mediator_0.11.0.yaml diff --git a/near-rt-ric-simulator/nearric-simulator/nearric-service/.gitignore b/near-rt-ric-simulator/nearric-service/.gitignore similarity index 100% rename from near-rt-ric-simulator/nearric-simulator/nearric-service/.gitignore rename to near-rt-ric-simulator/nearric-service/.gitignore diff --git a/near-rt-ric-simulator/nearric-service/Dockerfile b/near-rt-ric-simulator/nearric-service/Dockerfile new file mode 100644 index 00000000..a56687ad --- /dev/null +++ b/near-rt-ric-simulator/nearric-service/Dockerfile @@ -0,0 +1,10 @@ + +FROM openjdk:11-jre-slim + +ARG JAR_FILE + +WORKDIR /opt/app/nearricsimulator + +COPY ${JAR_FILE} nearric-simulator.jar + +ENTRYPOINT ["java", "-jar", "/opt/app/nearricsimulator/nearric-simulator.jar"] \ No newline at end of file diff --git a/near-rt-ric-simulator/nearric-simulator/nearric-service/container-tag.yaml b/near-rt-ric-simulator/nearric-service/container-tag.yaml similarity index 100% rename from near-rt-ric-simulator/nearric-simulator/nearric-service/container-tag.yaml rename to near-rt-ric-simulator/nearric-service/container-tag.yaml diff --git a/near-rt-ric-simulator/nearric-simulator/nearric-service/pom.xml b/near-rt-ric-simulator/nearric-service/pom.xml similarity index 94% rename from near-rt-ric-simulator/nearric-simulator/nearric-service/pom.xml rename to near-rt-ric-simulator/nearric-service/pom.xml index e35337c2..fcd5f86e 100644 --- a/near-rt-ric-simulator/nearric-simulator/nearric-service/pom.xml +++ b/near-rt-ric-simulator/nearric-service/pom.xml @@ -12,7 +12,6 @@ UTF-8 - 1.8 2.7.5 2.8.1 1.4.2 @@ -165,6 +164,13 @@ target/${project.build.finalName}.jar + + + javax.activation + activation + 1.1.1 + + diff --git a/near-rt-ric-simulator/nearric-simulator/nearric-service/src/main/java/org/onap/nearric/simulator/config/ApplicationConfig.java b/near-rt-ric-simulator/nearric-service/src/main/java/org/onap/nearric/simulator/config/ApplicationConfig.java similarity index 100% rename from near-rt-ric-simulator/nearric-simulator/nearric-service/src/main/java/org/onap/nearric/simulator/config/ApplicationConfig.java rename to near-rt-ric-simulator/nearric-service/src/main/java/org/onap/nearric/simulator/config/ApplicationConfig.java diff --git a/near-rt-ric-simulator/nearric-simulator/nearric-service/src/main/java/org/onap/nearric/simulator/config/NearRicApplication.java b/near-rt-ric-simulator/nearric-service/src/main/java/org/onap/nearric/simulator/config/NearRicApplication.java similarity index 100% rename from near-rt-ric-simulator/nearric-simulator/nearric-service/src/main/java/org/onap/nearric/simulator/config/NearRicApplication.java rename to near-rt-ric-simulator/nearric-service/src/main/java/org/onap/nearric/simulator/config/NearRicApplication.java diff --git a/near-rt-ric-simulator/nearric-simulator/nearric-service/src/main/java/org/onap/nearric/simulator/config/SwaggerConfiguration.java b/near-rt-ric-simulator/nearric-service/src/main/java/org/onap/nearric/simulator/config/SwaggerConfiguration.java similarity index 100% rename from near-rt-ric-simulator/nearric-simulator/nearric-service/src/main/java/org/onap/nearric/simulator/config/SwaggerConfiguration.java rename to near-rt-ric-simulator/nearric-service/src/main/java/org/onap/nearric/simulator/config/SwaggerConfiguration.java diff --git a/near-rt-ric-simulator/nearric-simulator/nearric-service/src/main/java/org/onap/nearric/simulator/controller/A1PApi.java b/near-rt-ric-simulator/nearric-service/src/main/java/org/onap/nearric/simulator/controller/A1PApi.java similarity index 100% rename from near-rt-ric-simulator/nearric-simulator/nearric-service/src/main/java/org/onap/nearric/simulator/controller/A1PApi.java rename to near-rt-ric-simulator/nearric-service/src/main/java/org/onap/nearric/simulator/controller/A1PApi.java diff --git a/near-rt-ric-simulator/nearric-simulator/nearric-service/src/main/java/org/onap/nearric/simulator/controller/A1PApiController.java b/near-rt-ric-simulator/nearric-service/src/main/java/org/onap/nearric/simulator/controller/A1PApiController.java similarity index 100% rename from near-rt-ric-simulator/nearric-simulator/nearric-service/src/main/java/org/onap/nearric/simulator/controller/A1PApiController.java rename to near-rt-ric-simulator/nearric-service/src/main/java/org/onap/nearric/simulator/controller/A1PApiController.java diff --git a/near-rt-ric-simulator/nearric-simulator/nearric-service/src/main/java/org/onap/nearric/simulator/model/PolicyInstance.java b/near-rt-ric-simulator/nearric-service/src/main/java/org/onap/nearric/simulator/model/PolicyInstance.java similarity index 100% rename from near-rt-ric-simulator/nearric-simulator/nearric-service/src/main/java/org/onap/nearric/simulator/model/PolicyInstance.java rename to near-rt-ric-simulator/nearric-service/src/main/java/org/onap/nearric/simulator/model/PolicyInstance.java diff --git a/near-rt-ric-simulator/nearric-simulator/nearric-service/src/main/java/org/onap/nearric/simulator/model/PolicyType.java b/near-rt-ric-simulator/nearric-service/src/main/java/org/onap/nearric/simulator/model/PolicyType.java similarity index 100% rename from near-rt-ric-simulator/nearric-simulator/nearric-service/src/main/java/org/onap/nearric/simulator/model/PolicyType.java rename to near-rt-ric-simulator/nearric-service/src/main/java/org/onap/nearric/simulator/model/PolicyType.java diff --git a/near-rt-ric-simulator/nearric-simulator/nearric-service/src/main/java/org/onap/nearric/simulator/service/A1PApiService.java b/near-rt-ric-simulator/nearric-service/src/main/java/org/onap/nearric/simulator/service/A1PApiService.java similarity index 100% rename from near-rt-ric-simulator/nearric-simulator/nearric-service/src/main/java/org/onap/nearric/simulator/service/A1PApiService.java rename to near-rt-ric-simulator/nearric-service/src/main/java/org/onap/nearric/simulator/service/A1PApiService.java diff --git a/near-rt-ric-simulator/nearric-simulator/nearric-service/src/main/java/org/onap/nearric/simulator/service/A1PApiServiceImpl.java b/near-rt-ric-simulator/nearric-service/src/main/java/org/onap/nearric/simulator/service/A1PApiServiceImpl.java similarity index 100% rename from near-rt-ric-simulator/nearric-simulator/nearric-service/src/main/java/org/onap/nearric/simulator/service/A1PApiServiceImpl.java rename to near-rt-ric-simulator/nearric-service/src/main/java/org/onap/nearric/simulator/service/A1PApiServiceImpl.java diff --git a/near-rt-ric-simulator/nearric-simulator/nearric-service/src/main/resources/application.properties b/near-rt-ric-simulator/nearric-service/src/main/resources/application.properties similarity index 100% rename from near-rt-ric-simulator/nearric-simulator/nearric-service/src/main/resources/application.properties rename to near-rt-ric-simulator/nearric-service/src/main/resources/application.properties diff --git a/near-rt-ric-simulator/nearric-simulator/nearric-service/test/.gitignore b/near-rt-ric-simulator/nearric-service/test/.gitignore similarity index 100% rename from near-rt-ric-simulator/nearric-simulator/nearric-service/test/.gitignore rename to near-rt-ric-simulator/nearric-service/test/.gitignore diff --git a/near-rt-ric-simulator/nearric-simulator/nearric-service/test/pi-template.json b/near-rt-ric-simulator/nearric-service/test/pi-template.json similarity index 100% rename from near-rt-ric-simulator/nearric-simulator/nearric-service/test/pi-template.json rename to near-rt-ric-simulator/nearric-service/test/pi-template.json diff --git a/near-rt-ric-simulator/nearric-simulator/nearric-service/test/populate.sh b/near-rt-ric-simulator/nearric-service/test/populate.sh similarity index 100% rename from near-rt-ric-simulator/nearric-simulator/nearric-service/test/populate.sh rename to near-rt-ric-simulator/nearric-service/test/populate.sh diff --git a/near-rt-ric-simulator/nearric-simulator/nearric-service/test/pt-template.json b/near-rt-ric-simulator/nearric-service/test/pt-template.json similarity index 100% rename from near-rt-ric-simulator/nearric-simulator/nearric-service/test/pt-template.json rename to near-rt-ric-simulator/nearric-service/test/pt-template.json diff --git a/near-rt-ric-simulator/nearric-simulator/nearric-service/test/test-api.sh b/near-rt-ric-simulator/nearric-service/test/test-api.sh similarity index 100% rename from near-rt-ric-simulator/nearric-simulator/nearric-service/test/test-api.sh rename to near-rt-ric-simulator/nearric-service/test/test-api.sh diff --git a/near-rt-ric-simulator/nearric-simulator/.classpath b/near-rt-ric-simulator/nearric-simulator/.classpath deleted file mode 100644 index 315bd1e1..00000000 --- a/near-rt-ric-simulator/nearric-simulator/.classpath +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/near-rt-ric-simulator/nearric-simulator/.project b/near-rt-ric-simulator/nearric-simulator/.project deleted file mode 100644 index ea2f3747..00000000 --- a/near-rt-ric-simulator/nearric-simulator/.project +++ /dev/null @@ -1,18 +0,0 @@ - - - NearRic-simulator - - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - org.eclipse.jdt.core.javanature - - diff --git a/near-rt-ric-simulator/nearric-simulator/.settings/org.eclipse.core.resources.prefs b/near-rt-ric-simulator/nearric-simulator/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c02..00000000 --- a/near-rt-ric-simulator/nearric-simulator/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/near-rt-ric-simulator/nearric-simulator/.settings/org.eclipse.m2e.core.prefs b/near-rt-ric-simulator/nearric-simulator/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1..00000000 --- a/near-rt-ric-simulator/nearric-simulator/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/near-rt-ric-simulator/nearric-simulator/README.md b/near-rt-ric-simulator/nearric-simulator/README.md deleted file mode 100644 index 298b9882..00000000 --- a/near-rt-ric-simulator/nearric-simulator/README.md +++ /dev/null @@ -1,25 +0,0 @@ -# O-RAN-SC Near-RealTime RIC Simulator - -The O-RAN SC Near-RealTime RIC simulates the A1 as an generic REST API which can receive and send northbound messages. The simulator validates the payload and applies policy. - -Please see the documentation in the docs/ folder - -The backend server publishes live API documentation at the -URL `http://your-host-name-here:8080/swagger-ui.html` - -## License - -Copyright (C) 2019 Nordix Foundation. -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. - -For more information about license please see the [LICENSE](LICENSE.txt) file for details. diff --git a/near-rt-ric-simulator/nearric-simulator/a1-med-api/.classpath b/near-rt-ric-simulator/nearric-simulator/a1-med-api/.classpath deleted file mode 100644 index a5d95095..00000000 --- a/near-rt-ric-simulator/nearric-simulator/a1-med-api/.classpath +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/near-rt-ric-simulator/nearric-simulator/a1-med-api/.project b/near-rt-ric-simulator/nearric-simulator/a1-med-api/.project deleted file mode 100644 index cdf3219c..00000000 --- a/near-rt-ric-simulator/nearric-simulator/a1-med-api/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - a1-med-api - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - - diff --git a/near-rt-ric-simulator/nearric-simulator/a1-med-api/.settings/org.eclipse.core.resources.prefs b/near-rt-ric-simulator/nearric-simulator/a1-med-api/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index db326978..00000000 --- a/near-rt-ric-simulator/nearric-simulator/a1-med-api/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,3 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/main/resources=UTF-8 -encoding/=UTF-8 diff --git a/near-rt-ric-simulator/nearric-simulator/a1-med-api/.settings/org.eclipse.jdt.core.prefs b/near-rt-ric-simulator/nearric-simulator/a1-med-api/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 71df5229..00000000 --- a/near-rt-ric-simulator/nearric-simulator/a1-med-api/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,9 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.methodParameters=generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore -org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/near-rt-ric-simulator/nearric-simulator/a1-med-api/.settings/org.eclipse.m2e.core.prefs b/near-rt-ric-simulator/nearric-simulator/a1-med-api/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1..00000000 --- a/near-rt-ric-simulator/nearric-simulator/a1-med-api/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/near-rt-ric-simulator/nearric-simulator/a1-med-api/a1-med-api.iml b/near-rt-ric-simulator/nearric-simulator/a1-med-api/a1-med-api.iml deleted file mode 100644 index 89d40eea..00000000 --- a/near-rt-ric-simulator/nearric-simulator/a1-med-api/a1-med-api.iml +++ /dev/null @@ -1,969 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/near-rt-ric-simulator/nearric-simulator/a1-med-api/a1-med-api.ipr b/near-rt-ric-simulator/nearric-simulator/a1-med-api/a1-med-api.ipr deleted file mode 100644 index 49d99c05..00000000 --- a/near-rt-ric-simulator/nearric-simulator/a1-med-api/a1-med-api.ipr +++ /dev/null @@ -1,107 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/near-rt-ric-simulator/nearric-simulator/a1-med-api/a1-med-api.iws b/near-rt-ric-simulator/nearric-simulator/a1-med-api/a1-med-api.iws deleted file mode 100644 index 03c854e9..00000000 --- a/near-rt-ric-simulator/nearric-simulator/a1-med-api/a1-med-api.iws +++ /dev/null @@ -1,418 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/near-rt-ric-simulator/nearric-simulator/nearric-service/.classpath b/near-rt-ric-simulator/nearric-simulator/nearric-service/.classpath deleted file mode 100644 index 91d1e295..00000000 --- a/near-rt-ric-simulator/nearric-simulator/nearric-service/.classpath +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/near-rt-ric-simulator/nearric-simulator/nearric-service/.project b/near-rt-ric-simulator/nearric-simulator/nearric-service/.project deleted file mode 100644 index 6fac18ca..00000000 --- a/near-rt-ric-simulator/nearric-simulator/nearric-service/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - nearric-service - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - - diff --git a/near-rt-ric-simulator/nearric-simulator/nearric-service/.settings/org.eclipse.core.resources.prefs b/near-rt-ric-simulator/nearric-simulator/nearric-service/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 839d647e..00000000 --- a/near-rt-ric-simulator/nearric-simulator/nearric-service/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding//src/main/resources=UTF-8 -encoding//src/test/java=UTF-8 -encoding/=UTF-8 diff --git a/near-rt-ric-simulator/nearric-simulator/nearric-service/.settings/org.eclipse.jdt.core.prefs b/near-rt-ric-simulator/nearric-simulator/nearric-service/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index ebb47b74..00000000 --- a/near-rt-ric-simulator/nearric-simulator/nearric-service/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,16 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore -org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/near-rt-ric-simulator/nearric-simulator/nearric-service/.settings/org.eclipse.m2e.core.prefs b/near-rt-ric-simulator/nearric-simulator/nearric-service/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1..00000000 --- a/near-rt-ric-simulator/nearric-simulator/nearric-service/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/near-rt-ric-simulator/nearric-simulator/nearric-service/Dockerfile b/near-rt-ric-simulator/nearric-simulator/nearric-service/Dockerfile deleted file mode 100644 index 4a85d000..00000000 --- a/near-rt-ric-simulator/nearric-simulator/nearric-service/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ - -FROM openjdk:8-jre-alpine - -ARG JAR_FILE - -WORKDIR /opt/app/nearricsimulator - -COPY ${JAR_FILE} nearric-simulator.jar - -ENTRYPOINT ["/usr/bin/java", "-jar", "/opt/app/nearricsimulator/nearric-simulator.jar"] \ No newline at end of file diff --git a/near-rt-ric-simulator/nearric-simulator/pom.xml b/near-rt-ric-simulator/pom.xml similarity index 87% rename from near-rt-ric-simulator/nearric-simulator/pom.xml rename to near-rt-ric-simulator/pom.xml index e57caef7..b8752c69 100644 --- a/near-rt-ric-simulator/nearric-simulator/pom.xml +++ b/near-rt-ric-simulator/pom.xml @@ -17,6 +17,7 @@ 2.1.9.RELEASE + 11 @@ -46,6 +47,10 @@ org.apache.maven.plugins maven-compiler-plugin + 3.8.1 + + ${java.version} + diff --git a/pom.xml b/pom.xml new file mode 100644 index 00000000..c80c558b --- /dev/null +++ b/pom.xml @@ -0,0 +1,37 @@ + + + + 4.0.0 + + org.oransc + nonrtric + 1.0.0-SNAPSHOT + pom + + nonrtric + + dashboard + sdnc-a1-controller + near-rt-ric-simulator + + diff --git a/sdnc-a1-controller/.gitignore b/sdnc-a1-controller/.gitignore new file mode 100755 index 00000000..264db967 --- /dev/null +++ b/sdnc-a1-controller/.gitignore @@ -0,0 +1,31 @@ +#####standard .git ignore entries##### + +## IDE Specific Files ## +org.eclipse.core.resources.prefs +.classpath +.project +.settings +.idea +.externalToolBuilders +.checkstyle +maven-eclipse.xml +workspace + +## Compilation Files ## +*.class +**/target +target +target-ide +MANIFEST.MF + +## Misc Ignores (OS specific etc) ## +bin/ +dist +*~ +*.ipr +*.iml +*.iws +classes +out/ +.DS_STORE +.metadata diff --git a/sdnc-a1-controller/northbound/features/features-sdnc-northbound/pom.xml b/sdnc-a1-controller/northbound/features/features-sdnc-northbound/pom.xml index 96028b47..6ab5343f 100644 --- a/sdnc-a1-controller/northbound/features/features-sdnc-northbound/pom.xml +++ b/sdnc-a1-controller/northbound/features/features-sdnc-northbound/pom.xml @@ -2,6 +2,14 @@ 4.0.0 + + + onap-releases + onap-releases + https://nexus.onap.org/content/repositories/releases/ + + + org.onap.ccsdk.parent feature-repo-parent diff --git a/sdnc-a1-controller/northbound/features/sdnc-northbound-all/pom.xml b/sdnc-a1-controller/northbound/features/sdnc-northbound-all/pom.xml index b561e443..5c5c9cdd 100644 --- a/sdnc-a1-controller/northbound/features/sdnc-northbound-all/pom.xml +++ b/sdnc-a1-controller/northbound/features/sdnc-northbound-all/pom.xml @@ -2,6 +2,14 @@ 4.0.0 + + + onap-releases + onap-releases + https://nexus.onap.org/content/repositories/releases/ + + + org.onap.ccsdk.parent single-feature-parent 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 8bef79ec..9dfabed8 100644 --- a/sdnc-a1-controller/northbound/nonrt-ric-api/model/pom.xml +++ b/sdnc-a1-controller/northbound/nonrt-ric-api/model/pom.xml @@ -21,6 +21,14 @@ 4.0.0 + + + onap-releases + onap-releases + https://nexus.onap.org/content/repositories/releases/ + + + org.onap.ccsdk.parent binding-parent @@ -68,6 +76,13 @@ + + org.apache.maven.plugins + maven-javadoc-plugin + + 8 + + 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 250c0160..1bf22742 100644 --- a/sdnc-a1-controller/northbound/nonrt-ric-api/provider/pom.xml +++ b/sdnc-a1-controller/northbound/nonrt-ric-api/provider/pom.xml @@ -23,6 +23,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + + + onap-releases + onap-releases + https://nexus.onap.org/content/repositories/releases/ + + + org.onap.ccsdk.parent binding-parent @@ -37,6 +45,23 @@ sdnc-northbound :: nonrt-ric-api :: ${project.artifactId} + + + + org.jacoco + jacoco-maven-plugin + 0.8.2 + + + org.apache.maven.plugins + maven-javadoc-plugin + + 8 + + + + + diff --git a/sdnc-a1-controller/northbound/pom.xml b/sdnc-a1-controller/northbound/pom.xml index 19a714d2..40c43843 100644 --- a/sdnc-a1-controller/northbound/pom.xml +++ b/sdnc-a1-controller/northbound/pom.xml @@ -2,6 +2,14 @@ 4.0.0 + + + onap-releases + onap-releases + https://nexus.onap.org/content/repositories/releases/ + + + org.onap.ccsdk.parent odlparent-lite diff --git a/sdnc-a1-controller/oam/pom.xml b/sdnc-a1-controller/oam/pom.xml index dfeef932..218546c4 100755 --- a/sdnc-a1-controller/oam/pom.xml +++ b/sdnc-a1-controller/oam/pom.xml @@ -91,6 +91,9 @@ docker + + true + installation diff --git a/sdnc-a1-controller/pom.xml b/sdnc-a1-controller/pom.xml new file mode 100644 index 00000000..349041dc --- /dev/null +++ b/sdnc-a1-controller/pom.xml @@ -0,0 +1,36 @@ + + + + 4.0.0 + + org.onap.sdnc + sdnc + 1.7.3-SNAPSHOT + pom + + sdnc + + northbound + oam + + -- 2.16.6