From: elinuxhenrik Date: Mon, 4 Apr 2022 11:29:45 +0000 (+0200) Subject: Remove A1 Policy Management Service X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=01d51618a2ea93784eb52cc259bf8f5e78308979;p=nonrtric.git Remove A1 Policy Management Service Issue-ID: NONRTRIC-712 Signed-off-by: elinuxhenrik Change-Id: I16dc188f147db1a238f188f04e51c3f0f8c72462 --- diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 50564194..00000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "onap/oran"] - path = onap/oran - url = https://gerrit.onap.org/r/ccsdk/oran diff --git a/a1-policy-management-service/.gitignore b/a1-policy-management-service/.gitignore deleted file mode 100644 index 7daab979..00000000 --- a/a1-policy-management-service/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -#Eclipse -.project -.classpath -.settings -target -.checkstyle -policy-agent.iml -config -/bin/ diff --git a/a1-policy-management-service/Dockerfile b/a1-policy-management-service/Dockerfile deleted file mode 100644 index 6f8387eb..00000000 --- a/a1-policy-management-service/Dockerfile +++ /dev/null @@ -1,48 +0,0 @@ -# -# ============LICENSE_START======================================================= -# 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. -# -# SPDX-License-Identifier: Apache-2.0 -# ============LICENSE_END========================================================= -# -FROM openjdk:11-jre-slim - -ARG JAR - -EXPOSE 8081 8433 - - -WORKDIR /opt/app/policy-agent -RUN mkdir -p /var/log/policy-agent -RUN mkdir -p /opt/app/policy-agent/etc/cert/ -EXPOSE 8081 8433 - -ADD /config/application.yaml /opt/app/policy-agent/config/application.yaml -ADD /config/application_configuration.json /opt/app/policy-agent/data/application_configuration.json_example -ADD /config/keystore.jks /opt/app/policy-agent/etc/cert/keystore.jks -ADD /config/truststore.jks /opt/app/policy-agent/etc/cert/truststore.jks - -ARG user=nonrtric -ARG group=nonrtric - -RUN groupadd $user && \ - useradd -r -g $group $user -RUN chown -R $user:$group /opt/app/policy-agent -RUN chown -R $user:$group /var/log/policy-agent - -USER ${user} - -ADD target/${JAR} /opt/app/policy-agent/policy-agent.jar -CMD ["java", "-jar", "/opt/app/policy-agent/policy-agent.jar"] \ No newline at end of file diff --git a/a1-policy-management-service/README.md b/a1-policy-management-service/README.md deleted file mode 100644 index d660df91..00000000 --- a/a1-policy-management-service/README.md +++ /dev/null @@ -1,93 +0,0 @@ -# O-RAN-SC Non-RT RIC Policy Agent - -The O-RAN Non-RT RIC PolicyAgent provides a REST API for management of policices. -It provides support for: - -Supervision of clients (R-APPs) to eliminate stray policies in case of failure - -Consistency monitoring of the SMO view of policies and the actual situation in the RICs - -Consistency monitoring of RIC capabilities (policy types) - -Policy configuration. This includes: - -One REST API towards all RICs in the network - -Query functions that can find all policies in a RIC, all policies owned by a service (R-APP), - all policies of a type etc. - -Maps O1 resources (ManagedElement) as defined in O1 to the controlling RIC - -The Policy Agent uses the default keystore and truststore that are built into the container. The paths and passwords for these stores are located in a yaml file: -nonrtric/policy-agent/config/application.yaml - -The default truststore includes a1simulator cert as a trusted cert which is located here: -https://gerrit.o-ran-sc.org/r/gitweb?p=sim/a1-interface.git;a=tree;f=near-rt-ric-simulator/certificate;h=172c1e5aacd52d760e4416288dc5648a5817ce65;hb=HEAD - -The default truststore also includes a1controller cert as a trusted cert which is located here (keystore.jks file): -https://gerrit.o-ran-sc.org/r/gitweb?p=nonrtric.git;a=tree;f=sdnc-a1-controller/oam/installation/sdnc-a1/src/main/resources;h=17fdf6cecc7a866c5ce10a35672b742a9f0c4acf;hb=HEAD - -There is also Policy Agent's own cert in the default truststore for mocking purposes and unit-testing (ApplicationTest.java). - -The default keystore, truststore, and application.yaml files can be overridden by mounting new files using the "volumes" field of docker-compose or docker run command. - -Assuming that the keystore, truststore, and application.yaml files are located in the same directory as docker-compose, the volumes field should have these entries: - -volumes: - - ./new_keystore.jks:/opt/app/policy-agent/etc/cert/keystore.jks:ro - - ./new_truststore.jks:/opt/app/policy-agent/etc/cert/truststore.jks:ro - - ./new_application.yaml:/opt/app/policy-agent/config/application.yaml:ro - -The target paths in the container should not be modified. - -Example docker run command for mounting new files (assuming they are located in the current directory): -docker run -p 8081:8081 -p 8433:8433 --name=policy-agent-container --network=nonrtric-docker-net --volume "$PWD/new_keystore.jks:/opt/app/policy-agent/etc/cert/keystore.jks" --volume "$PWD/new_truststore.jks:/opt/app/policy-agent/etc/cert/truststore.jks" --volume "$PWD/new_application.yaml:/opt/app/policy-agent/config/application.yaml" o-ran-sc/nonrtric-policy-agent:2.2.0-SNAPSHOT - - -To Run Policy Agent in Local: -In the folder /opt/app/policy-agent/config/, create a soft link with below command, -ln -s application_configuration.json - -To Run Policy Agent in Local with the DMaaP polling turned on: -In the folder /opt/app/policy-agent/config/, create a soft link with below command, -ln -s application_configuration.json - -The agent can be run stand alone in a simulated test mode. Then it simulates RICs. -The REST API is published on port 8081 and it is started by command: -mvn -Dtest=MockPolicyAgent test - -The backend server publishes live API documentation at the -URL `http://your-host-name-here:8081/swagger-ui.html` - -PolicyAgent uses A1-POLICY-AGENT-READ & A1-POLICY-AGENT-WRITE topic for subscribe & Publish to the DMaap. -Sample Request Message to DMaaP: -{ - "type": "request", - "target": "policy-agent", - "timestamp": "2019-05-14T11:44:51.36Z", - "operation": "GET", - "correlationId": "c09ac7d1-de62-0016-2000-e63701125557-201", - "apiVersion": "1.0", - "originatorId": "849e6c6b420", - "requestId": "23343221", - "url": "/policies?type=type1&ric=ric1&service=service1" -} - -Sample Response Message to DMaaP: -{ - "type": "response", - "timestamp": "2019-05-14T11:44:51.36Z", - "correlationId": "c09ac7d1-de62-0016-2000-e63701125557-201", - "originatorId": "849e6c6b420", - "requestId": "23343221", - "status": "200 OK", - "message": [] -} - -## License - -Copyright (C) 2019 Nordix Foundation. All rights reserved. -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. diff --git a/a1-policy-management-service/dpo/blueprints/k8s-policy-agent.yaml b/a1-policy-management-service/dpo/blueprints/k8s-policy-agent.yaml deleted file mode 100644 index aa09ff36..00000000 --- a/a1-policy-management-service/dpo/blueprints/k8s-policy-agent.yaml +++ /dev/null @@ -1,111 +0,0 @@ - -#description: Docker application of Policy Agent managing policies -#blueprint_version: 1.0.0 ---- -tosca_definitions_version: cloudify_dsl_1_3 -description: Docker application to collect log file from PNF -imports: - - http://www.getcloudify.org/spec/cloudify/4.3.1/types.yaml - - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R5/k8splugin/1.6.0/k8splugin_types.yaml - - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.ccsdk.platform.plugins/type_files/dmaap/dmaap.yaml -inputs: - policy-agent_cpu_limit: - type: string - default: "250m" - policy-agent_cpu_request: - type: string - default: "250m" - policy-agent_memory_limit: - type: string - default: "256Mi" - policy-agent_memory_request: - type: string - default: "256Mi" - envs: - default: {} - external_port: - type: string - default: ":0" - publish_topic_name: - type: string - default: "A1-POLICY-AGENT-WRITE" - subscribe_topic_name: - type: string - default: "A1-POLICY-AGENT-READ" - consumer_group: - type: string - default: "users" - consumer_id: - type: string - default: "policy-agent" - log_directory: - type: string - default: "/var/log/policy-agent" - replicas: - type: integer - description: number of instances - default: 1 - tag_version: - type: string - default: "nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-policy-agent:1.0.0" -node_templates: - policy-agent: - type: dcae.nodes.ContainerizedServiceComponentUsingDmaap - interfaces: - cloudify.interfaces.lifecycle: - start: - inputs: - envs: - get_input: envs - properties: - application_config: - streams_publishes: - dmaap_publisher: - dmaap_info: - topic_url: { concat: ['https://message-router:3905/events/',{ get_input: publish_topic_name }] } - type: message_router - streams_subscribes: - dmaap_subscriber: - dmaap_info: - topic_url: { concat: ['https://message-router:3905/events/',{ get_input: subscribe_topic_name }, '/', { get_input: consumer_group }, "/", { get_input: consumer_id }, "?timeout=15000&limit=100"] } - type: message_router - ric: - - name: ric1 - baseUrl: http://localhost:8083/ - managedElementIds: - - kista_1 - - kista_2 - - name: ric2 - baseUrl: http://localhost:8085/ - managedElementIds: - - kista_3 - - kista_4 - docker_config: - healthcheck: - interval: 15s - timeout: 1s - type: http - endpoint: /status - ports: - - concat: ["8081", {get_input: external_port}] - image: - get_input: tag_version - service_component_type: policy-agent - log_info: - log_directory: - get_input: log_directory - replicas: - get_input: replicas - resource_config: - limits: - cpu: - get_input: policy-agent_cpu_limit - memory: - get_input: policy-agent_memory_limit - requests: - cpu: - get_input: policy-agent_cpu_request - memory: - get_input: policy-agent_memory_request - - diff --git a/a1-policy-management-service/eclipse-formatter.xml b/a1-policy-management-service/eclipse-formatter.xml deleted file mode 100644 index c8cca2ee..00000000 --- a/a1-policy-management-service/eclipse-formatter.xml +++ /dev/null @@ -1,314 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/a1-policy-management-service/pom.xml b/a1-policy-management-service/pom.xml deleted file mode 100644 index 41b30ac3..00000000 --- a/a1-policy-management-service/pom.xml +++ /dev/null @@ -1,403 +0,0 @@ - - - - 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 2.6.6 - - - org.o-ran-sc.nonrtric - a1-policy-management-service - 2.4.0-SNAPSHOT - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - - - - - onap-releases - onap-releases - https://nexus.onap.org/content/repositories/releases/ - - - - 11 - 3.0.0 - 2.8.2 - 2.1.13 - 20211205 - 3.8.0 - 2.12.2 - 1.18.0 - 0.30.0 - 2.1.1 - 3.7.0.1746 - 0.8.5 - 3.0.0 - - - - commons-io - commons-io - 2.11.0 - - - com.google.guava - guava - 31.0.1-jre - - - org.springdoc - springdoc-openapi-ui - 1.6.6 - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-thymeleaf - - - org.springframework.boot - spring-boot-starter-webflux - - - org.springframework.boot - spring-boot-starter-aop - - - org.springframework.boot - spring-boot-devtools - true - - - org.springframework - spring-webflux - - - io.swagger.core.v3 - swagger-jaxrs2 - ${swagger.version} - - - io.swagger.core.v3 - swagger-jaxrs2-servlet-initializer - ${swagger.version} - - - javax.xml.bind - jaxb-api - - - org.immutables - value - ${immutable.version} - provided - - - org.immutables - gson - ${immutable.version} - - - org.json - json - ${json.version} - - - org.springframework.boot - spring-boot-configuration-processor - true - - - org.projectlombok - lombok - provided - - - javax.ws.rs - javax.ws.rs-api - ${javax.ws.rs-api.version} - - - org.glassfish.jersey.inject - jersey-hk2 - - - - org.springframework.boot - spring-boot-starter-actuator - - - - io.springfox - springfox-swagger2 - ${springfox.version} - - - io.springfox - springfox-swagger-ui - ${springfox.version} - - - - org.springframework.boot - spring-boot-starter-test - test - - - org.awaitility - awaitility - test - - - io.projectreactor - reactor-test - test - - - org.junit.jupiter - junit-jupiter-engine - test - - - org.mockito - mockito-junit-jupiter - test - - - org.mockito - mockito-core - test - - - com.squareup.okhttp3 - mockwebserver - test - - - - com.github.erosb - everit-json-schema - 1.13.0 - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - net.revelc.code.formatter - formatter-maven-plugin - ${formatter-maven-plugin.version} - - ${project.basedir}/eclipse-formatter.xml - - - - - com.diffplug.spotless - spotless-maven-plugin - ${spotless-maven-plugin.version} - - - - - com,java,javax,org - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - false - - - - maven-failsafe-plugin - - - org.codehaus.mojo - build-helper-maven-plugin - - - add-source - generate-sources - - add-source - - - - ${project.build.directory}/generated-sources/annotations/ - - - - - - - org.jacoco - jacoco-maven-plugin - ${jacoco-maven-plugin.version} - - - default-prepare-agent - - prepare-agent - - - - default-report - prepare-package - - report - - - - - - io.fabric8 - docker-maven-plugin - ${docker-maven-plugin} - false - - - generate-a1-policy-management-service-image - package - - build - - - ${env.CONTAINER_PULL_REGISTRY} - - - o-ran-sc/nonrtric-a1-policy-management-service:${project.version} - - try - ${basedir} - Dockerfile - - ${project.build.finalName}.jar - - - ${project.version} - - - - - - - - push-a1-policy-management-service-image - - build - push - - - ${env.CONTAINER_PULL_REGISTRY} - ${env.CONTAINER_PUSH_REGISTRY} - - - o-ran-sc/nonrtric-a1-policy-management-service:${project.version} - - ${basedir} - Dockerfile - - ${project.build.finalName}.jar - - - ${project.version} - latest - - - - - - - - - - - org.sonarsource.scanner.maven - sonar-maven-plugin - ${sonar-maven-plugin.version} - - - org.codehaus.mojo - exec-maven-plugin - ${exec-maven-plugin.version} - - - git submodule update - initialize - - git - - submodule - update - --init - --recursive - - - - exec - - - - copy configuration - initialize - - cp - - -r - ../onap/oran/a1-policy-management/config - . - - - - exec - - - - - - - - JIRA - https://jira.o-ran-sc.org/ - - diff --git a/a1-policy-management-service/src b/a1-policy-management-service/src deleted file mode 120000 index a737975d..00000000 --- a/a1-policy-management-service/src +++ /dev/null @@ -1 +0,0 @@ -../onap/oran/a1-policy-management/src \ No newline at end of file diff --git a/docs/api-docs.rst b/docs/api-docs.rst index 27cd338e..198418f4 100644 --- a/docs/api-docs.rst +++ b/docs/api-docs.rst @@ -19,15 +19,9 @@ Here we describe the APIs to access the Non-RT RIC functions. The core Non-RT RIC consists of several parts, with available APIs described in the sections below: -* The A1 Policy Management Service * The Information Coordinator Service * K8S Helm Chart LCM Manager (Initial) **** -A1 Policy Management Service -============================ - -For information about the A1 Policy Management Service that is implemented in ONAP, see `ONAP docs `_ and `wiki `_. - Information Coordinator Service =============================== diff --git a/docs/developer-guide.rst b/docs/developer-guide.rst index f61a8671..82862f86 100644 --- a/docs/developer-guide.rst +++ b/docs/developer-guide.rst @@ -9,12 +9,6 @@ This document provides a quickstart for developers of the Non-RT RIC parts. Additional developer guides are available on the `O-RAN SC NONRTRIC Developer wiki `_. -A1 Policy Management Service & SDNC/A1 Controller & A1 Adapter --------------------------------------------------------------- - -The A1 Policy Management Service is implemented in ONAP. For documentation see `ONAP CCSDK documentation `_. -and `wiki `_. - Information Coordinator Service ------------------------------- The Information Coordinator Service is a Java 11 web application built using the Spring Framework. Using Spring Boot @@ -69,7 +63,7 @@ Helm Manager See the page in Wiki: `Release E `_. Kubernetes deployment -===================== +--------------------- Non-RT RIC can be also deployed in a Kubernetes cluster, `it/dep repository `_. hosts deployment and integration artifacts. Instructions and helm charts to deploy the Non-RT-RIC functions in the diff --git a/docs/offeredapis/swagger/pms-api.json b/docs/offeredapis/swagger/pms-api.json deleted file mode 120000 index 18346f59..00000000 --- a/docs/offeredapis/swagger/pms-api.json +++ /dev/null @@ -1 +0,0 @@ -../../../onap/oran/docs/offeredapis/swagger/pms-api.json \ No newline at end of file diff --git a/docs/release-notes.rst b/docs/release-notes.rst index 223bf4de..94200b8f 100644 --- a/docs/release-notes.rst +++ b/docs/release-notes.rst @@ -14,44 +14,6 @@ This document provides the release notes for the release of the different parts :local: -Version history A1 Policy Management Service (A1 Policy Agent) -============================================================== - -+------------+----------+------------------+--------------------+ -| **Date** | **Ver.** | **Author** | **Comment** | -| | | | | -+------------+----------+------------------+--------------------+ -| 2020-02-03 | 1.0.0 | Henrik Andersson | First version | -| | | | Amber Maintenance | -| | | | Release | -+------------+----------+------------------+--------------------+ -| 2020-06-18 | 2.0.0 | Henrik Andersson | Bronze Release | -| | | | | -+------------+----------+------------------+--------------------+ -| 2020-07-29 | 2.0.1 | Henrik Andersson | Bronze Maintenance | -| | | | Release | -| | | | | -+------------+----------+------------------+--------------------+ -| 2020-12-03 | 2.1.0 | Henrik Andersson | Cherry Release | -| | | | | -+------------+----------+------------------+--------------------+ -| 2021-06-23 | 2.2.0 | Henrik Andersson | D Release | -| | | | | -+------------+----------+------------------+--------------------+ -| 2021-08-10 | 2.2.1 | Henrik Andersson | D Maintenance | -| | | | Release | -| | | | | -+------------+----------+------------------+--------------------+ -| 2021-12-13 | 2.3.0 | Henrik Andersson | E Release | -| | | | Renamed and minor | -| | | | improvements | -+------------+----------+------------------+--------------------+ -| 2022-02-07 | 2.3.1 | Henrik Andersson | E Maintenance | -| | | | Release | -| | | | Non root user in | -| | | | Docker | -+------------+----------+------------------+--------------------+ - Version history Information Coordinator Service =============================================== diff --git a/onap/oran b/onap/oran deleted file mode 160000 index 1db30d5d..00000000 --- a/onap/oran +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1db30d5d54156fd373bc386030016a49aeee03b5 diff --git a/pom.xml b/pom.xml index 469b04e8..8f675c88 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,6 @@ 3.7.0.1746 - a1-policy-management-service information-coordinator-service helm-manager