Uplift from master and step versions 83/5483/3
authorelinuxhenrik <henrik.b.andersson@est.tech>
Wed, 20 Jan 2021 13:55:41 +0000 (14:55 +0100)
committerelinuxhenrik <henrik.b.andersson@est.tech>
Wed, 20 Jan 2021 15:37:17 +0000 (16:37 +0100)
commit586778c97325089286507cbcfe65532765af362e
treeda2eb646a120830216d162de653b3c85a9751f70
parent462e3d415602e44e79f39422702bce1af4589eea
Uplift from master and step versions

Step enrichment-coordinator-service to 1.1.1.
Step r-app-catalogue to 1.1.1.
Step policy-agent to 2.2.1.

This is squash of the following commits:

git cherry-pick 7a09fbb9eeb282cf89b88d5b38e75f483be15350
git cherry-pick ff5f78e7e6b14e37b3ac1620e38c8e6bf5a191b8
git cherry-pick d1702a33a3527cf46527c7cd61f435bd7ed08522
git cherry-pick 1da5c887797ae8cb715ad0b16b388aae18cda948
git cherry-pick a1db481e9f360a136081bdb7c7b5b3683d1cff91
git cherry-pick 89b64ab194785ec389c8353e4b90e3e7edd08662
git cherry-pick e1eebe59d712b5439b2813d69944a870be1e93ad
git cherry-pick bfe1c4049297589c4ade863b12e3d6a6cb7abc99
git cherry-pick 7851a89c67279990a6d1b063ca62d49fdcb5be87
git cherry-pick 81ba9036a53ea3fc0fb4699005d86c7794faf8d6
git cherry-pick c760c62129b21c31243a331cf3c8f1963a1058a3
git cherry-pick f2bfafab18e7fb197a7e351a4f6a89c2936cbb5c
git cherry-pick bc89f17bf07fc2aca8e8004b769c52eaafb117b8
git cherry-pick b61264738a459de5f1b9333ee4cb486df9f3b9f4
git cherry-pick e912ee4367d6a305ac038c86dec816b5ce71191b
git cherry-pick e0b665e3ff544bb78411bdc7f6b3ba2818fdeed4
git cherry-pick b7f412244f9b5e8698f57b7921b30dc86853434d
git cherry-pick f0019c8168b9d59f132ba47e939e8aa3ef324b7d
git cherry-pick 4f7f0cda2f07f62dcbb2e371fc09764b2337a8e9
git cherry-pick 10e254d9b7bc522bb2c25d590e6d203bf25a592d
git cherry-pick 2dbde318f013212c81c4a1f477d7638ec3367aa5
git cherry-pick beb7839bbfce438d984a6362fc02cb90257851d7
git cherry-pick 32180137b6aca9c3a4519ac00cb573cbae9dca83
git cherry-pick 132dcaf425bc2ce6f13b0725f11a9dd99a08eccb
git cherry-pick fed5fc967794cb3d9d9abf3d48283908eff36cc9
git cherry-pick 7f685c3b730ce857b32bbd4bdbb214795511ec62
git cherry-pick 1e539490bc37fed791895dd1f2f898caa3b0ca5c
git cherry-pick 27db02f21e9d2fce2bb57f64a17cf6f7044e0a4f
git cherry-pick d658528f47b628595d6f2355a411736b0e58691d
git cherry-pick 64cb483277e5162c1fbc943df043f44aff7f85f9
git cherry-pick 6296305fad90e21103fa92e05e0d21a3ba1356a2
git cherry-pick 28ea034c54771d3680743f3885c97d6bc9eb7f7b
git cherry-pick 7bef63e604a6391d6f9264c049a51e6d0680e07a
git cherry-pick 38c1f88849d9b529007ac07daeeca2ca0291793b

Signed-off-by: elinuxhenrik <henrik.b.andersson@est.tech>
Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
Issue-ID: NONRTRIC-385
Change-Id: Ia3ad7f4a3f058e9d180aa51d34f7c2b7ccf17f33
165 files changed:
.gitignore
docker-compose/README.md
docker-compose/a1-sim/docker-compose.yaml [moved from docker-compose/nosdnc/docker-compose.yml with 57% similarity]
docker-compose/control-panel/config/nginx.conf [new file with mode: 0644]
docker-compose/control-panel/docker-compose.yaml [new file with mode: 0644]
docker-compose/docker-compose.yaml [new file with mode: 0644]
docker-compose/ecs/docker-compose.yaml [moved from docker-compose/ecs/docker-compose.yml with 83% similarity]
docker-compose/mr/MsgRtrApi.properties [moved from docker-compose/withDmaap_nosdnc/mr/MsgRtrApi.properties with 100% similarity]
docker-compose/mr/cadi.properties [moved from docker-compose/withDmaap_nosdnc/mr/cadi.properties with 100% similarity]
docker-compose/mr/docker-compose.yml
docker-compose/mr/logback.xml [moved from docker-compose/withDmaap_nosdnc/mr/logback.xml with 100% similarity]
docker-compose/mr/zk_client_jaas.conf [moved from docker-compose/withDmaap_nosdnc/kafka/zk_client_jaas.conf with 100% similarity]
docker-compose/mr/zk_server_jaas.conf [moved from docker-compose/withDmaap_nosdnc/zk/zk_server_jaas.conf with 100% similarity]
docker-compose/policy-service/config/application-policyagent.yaml [moved from docker-compose/nosdnc/config/application-policyagent.yaml with 100% similarity]
docker-compose/policy-service/config/application_configuration.controller.json [moved from docker-compose/sdnc/config/application_configuration.json with 80% similarity]
docker-compose/policy-service/config/application_configuration.nocontroller.json [moved from docker-compose/nosdnc/config/application_configuration.json with 100% similarity]
docker-compose/policy-service/docker-compose.yaml [new file with mode: 0644]
docker-compose/rapp/docker-compose.yaml [moved from docker-compose/rapp/docker-compose.yml with 95% similarity]
docker-compose/sdnc/config/application-policyagent.yaml [deleted file]
docker-compose/sdnc/docker-compose.yml
docker-compose/withDmaap_nosdnc/pms/application-policyagent.yaml [deleted file]
docker-compose/withDmaap_nosdnc/pms/application_configuration.json [deleted file]
docs/api-docs.rst
docs/conf.py
enrichment-coordinator-service/api/ecs-api.json [moved from docs/offeredapis/swagger/ecs-api.json with 82% similarity]
enrichment-coordinator-service/api/ecs-api.yaml [new file with mode: 0644]
enrichment-coordinator-service/config/application.yaml
enrichment-coordinator-service/pom.xml
enrichment-coordinator-service/src/main/java/org/oransc/enrichment/BeanFactory.java
enrichment-coordinator-service/src/main/java/org/oransc/enrichment/clients/AsyncRestClient.java
enrichment-coordinator-service/src/main/java/org/oransc/enrichment/clients/AsyncRestClientFactory.java
enrichment-coordinator-service/src/main/java/org/oransc/enrichment/configuration/ApplicationConfig.java
enrichment-coordinator-service/src/main/java/org/oransc/enrichment/configuration/WebClientConfig.java
enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/VoidResponse.java
enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/consumer/ConsumerCallbacks.java
enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/consumer/ConsumerController.java
enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/producer/ProducerCallbacks.java
enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/producer/ProducerConsts.java
enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/producer/ProducerController.java
enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/producer/ProducerEiTypeInfo.java
enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/producer/ProducerJobInfo.java
enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/producer/ProducerRegistrationInfo.java
enrichment-coordinator-service/src/main/java/org/oransc/enrichment/repository/EiJob.java
enrichment-coordinator-service/src/main/java/org/oransc/enrichment/repository/EiJobs.java
enrichment-coordinator-service/src/main/java/org/oransc/enrichment/repository/EiProducer.java
enrichment-coordinator-service/src/main/java/org/oransc/enrichment/repository/EiProducers.java
enrichment-coordinator-service/src/main/java/org/oransc/enrichment/repository/EiType.java
enrichment-coordinator-service/src/main/java/org/oransc/enrichment/repository/EiTypes.java
enrichment-coordinator-service/src/main/java/org/oransc/enrichment/repository/MultiMap.java
enrichment-coordinator-service/src/main/java/org/oransc/enrichment/tasks/ProducerSupervision.java
enrichment-coordinator-service/src/test/java/org/oransc/enrichment/ApplicationTest.java
enrichment-coordinator-service/src/test/java/org/oransc/enrichment/clients/AsyncRestClientTest.java
enrichment-coordinator-service/src/test/java/org/oransc/enrichment/controller/ConsumerSimulatorController.java
enrichment-coordinator-service/src/test/java/org/oransc/enrichment/controller/ProducerSimulatorController.java
onap/oran
policy-agent/.gitignore
policy-agent/README.md
policy-agent/pom.xml
pom.xml
r-app-catalogue/Dockerfile
r-app-catalogue/config/application.yaml
r-app-catalogue/config/r-app-catalogue-keystore.jks [new file with mode: 0644]
r-app-catalogue/eclipse-formatter.xml [new file with mode: 0644]
r-app-catalogue/pom.xml
r-app-catalogue/src/main/java/org/oransc/rappcatalogue/api/GeneralRappCatalogueControllerAdvisor.java
r-app-catalogue/src/main/java/org/oransc/rappcatalogue/api/ServicesApiDelegateImpl.java
r-app-catalogue/src/main/java/org/oransc/rappcatalogue/configuration/TomcatConfig.java [new file with mode: 0644]
r-app-catalogue/src/main/java/org/oransc/rappcatalogue/exception/HeaderException.java
r-app-catalogue/src/main/java/org/oransc/rappcatalogue/exception/InvalidServiceException.java
r-app-catalogue/src/main/java/org/oransc/rappcatalogue/exception/ServiceNotFoundException.java
r-app-catalogue/src/test/java/org/oransc/rappcatalogue/HttpsRequestTest.java [new file with mode: 0644]
r-app-catalogue/src/test/java/org/oransc/rappcatalogue/api/ServicesApiDelegateImplTest.java
test/auto-test/.gitignore
test/auto-test/FTC1.sh
test/auto-test/FTC10.sh
test/auto-test/FTC100.sh
test/auto-test/FTC110.sh
test/auto-test/FTC1100.sh
test/auto-test/FTC150.sh
test/auto-test/FTC1800.sh
test/auto-test/FTC300.sh
test/auto-test/FTC310.sh
test/auto-test/FTC350.sh
test/auto-test/FTC800.sh
test/auto-test/FTC810.sh
test/auto-test/FTC850.sh
test/auto-test/FTC900.sh
test/auto-test/FTC_HELM-RECEPIE.sh [new file with mode: 0755]
test/auto-test/PM_DEMO.sh
test/auto-test/PM_EI_DEMO.sh
test/auto-test/README.md
test/common/.gitignore [new file with mode: 0644]
test/common/README.md
test/common/agent_api_functions.sh
test/common/api_curl.sh
test/common/clean_kube.sh [new file with mode: 0755]
test/common/consul_cbs_functions.sh [new file with mode: 0644]
test/common/control_panel_api_functions.sh [new file with mode: 0644]
test/common/controller_api_functions.sh
test/common/cr_api_functions.sh
test/common/ecs_api_functions.sh
test/common/http_proxy_api_functions.sh [new file with mode: 0644]
test/common/mr_api_functions.sh [new file with mode: 0644]
test/common/prodstub_api_functions.sh
test/common/rapp_catalogue_api_functions.sh
test/common/ricsimulator_api_functions.sh
test/common/test_env-onap-guilin.sh
test/common/test_env-onap-honolulu.sh [new file with mode: 0644]
test/common/test_env-onap-master.sh [deleted file]
test/common/test_env-oran-cherry.sh
test/common/test_env-oran-dawn.sh [new file with mode: 0755]
test/common/test_env.sh [deleted file]
test/common/testcase_common.sh
test/mrstub/app/main.py
test/mrstub/app/nginx.conf
test/mrstub/app/requirements.txt
test/mrstub/basic_test.sh
test/mrstub/mrstub-build-start.sh
test/simulator-group/control_panel/app.yaml [new file with mode: 0644]
test/simulator-group/control_panel/application.properties [new file with mode: 0644]
test/simulator-group/control_panel/docker-compose.yml
test/simulator-group/control_panel/svc.yaml [new file with mode: 0644]
test/simulator-group/cr/app.yaml [new file with mode: 0644]
test/simulator-group/cr/svc.yaml [new file with mode: 0644]
test/simulator-group/dmaapmr/app.yaml [new file with mode: 0644]
test/simulator-group/dmaapmr/docker-compose.yaml [moved from docker-compose/withDmaap_nosdnc/docker-compose.yml with 51% similarity]
test/simulator-group/dmaapmr/mnt/kafka/zk_client_jaas.conf [new file with mode: 0644]
test/simulator-group/dmaapmr/mnt/mr/KUBE-MsgRtrApi.properties [new file with mode: 0644]
test/simulator-group/dmaapmr/mnt/mr/MsgRtrApi.properties [new file with mode: 0644]
test/simulator-group/dmaapmr/mnt/mr/cadi.properties [new file with mode: 0644]
test/simulator-group/dmaapmr/mnt/mr/logback.xml [new file with mode: 0644]
test/simulator-group/dmaapmr/mnt/zk/zk_server_jaas.conf [new file with mode: 0644]
test/simulator-group/dmaapmr/svc.yaml [new file with mode: 0644]
test/simulator-group/ecs/app.yaml [new file with mode: 0644]
test/simulator-group/ecs/application.yaml [new file with mode: 0644]
test/simulator-group/ecs/pvc.yaml [new file with mode: 0644]
test/simulator-group/ecs/svc.yaml [new file with mode: 0644]
test/simulator-group/httpproxy/.gitignore [new file with mode: 0644]
test/simulator-group/httpproxy/app.yaml [new file with mode: 0644]
test/simulator-group/httpproxy/docker-compose.yaml [moved from test/simulator-group/mr/docker-compose.yml with 79% similarity]
test/simulator-group/httpproxy/svc.yaml [new file with mode: 0644]
test/simulator-group/mrstub/.gitignore [moved from test/simulator-group/mr/.gitignore with 100% similarity]
test/simulator-group/mrstub/app.yaml [new file with mode: 0644]
test/simulator-group/mrstub/cert/cert.crt [moved from test/simulator-group/mr/cert/cert.crt with 100% similarity]
test/simulator-group/mrstub/cert/key.crt [moved from test/simulator-group/mr/cert/key.crt with 100% similarity]
test/simulator-group/mrstub/cert/pass [moved from test/simulator-group/mr/cert/pass with 100% similarity]
test/simulator-group/mrstub/docker-compose.yml [moved from test/simulator-group/consul_cbs/consul/cbs_localhost_config.hcl with 63% similarity]
test/simulator-group/mrstub/svc.yaml [new file with mode: 0644]
test/simulator-group/policy_agent/app.yaml [new file with mode: 0644]
test/simulator-group/policy_agent/application.yaml [new file with mode: 0644]
test/simulator-group/policy_agent/docker-compose.yml
test/simulator-group/policy_agent/mnt/.gitignore [new file with mode: 0644]
test/simulator-group/policy_agent/mnt/application.yaml [new file with mode: 0644]
test/simulator-group/policy_agent/svc.yaml [new file with mode: 0644]
test/simulator-group/prodstub/app.yaml [new file with mode: 0644]
test/simulator-group/prodstub/svc.yaml [new file with mode: 0644]
test/simulator-group/rapp_catalogue/app.yaml [new file with mode: 0644]
test/simulator-group/rapp_catalogue/docker-compose.yml
test/simulator-group/rapp_catalogue/svc.yaml [new file with mode: 0644]
test/simulator-group/ric/app.yaml [new file with mode: 0644]
test/simulator-group/ric/svc.yaml [new file with mode: 0644]
test/simulator-group/sdnc/app.yaml [new file with mode: 0644]
test/simulator-group/sdnc/docker-compose.yml
test/simulator-group/sdnc/svc.yaml [new file with mode: 0644]
test/simulator-group/sim-monitor.js