From: JohnKeeney Date: Fri, 9 Aug 2024 17:16:06 +0000 (+0100) Subject: Manually reset versions for newdelhi branch - avoid conflict X-Git-Tag: 1.7.1~3 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=8458aa547f5bc3415b4f337935410a5ff19299e8;p=ccsdk%2Foran.git Manually reset versions for newdelhi branch - avoid conflict Keeps most changes since New Delhi Release - easier than rebase & cherry pick Also update Docs for New Delhi Issue-ID: CCSDK-4020 Change-Id: Id04a61c0ba1bdb69fa8752446eadb110ebf69f19 Signed-off-by: JohnKeeney --- diff --git a/a1-adapter/a1-adapter-api/feature/pom.xml b/a1-adapter/a1-adapter-api/feature/pom.xml index 13a2c694..292f8abd 100644 --- a/a1-adapter/a1-adapter-api/feature/pom.xml +++ b/a1-adapter/a1-adapter-api/feature/pom.xml @@ -32,7 +32,7 @@ org.onap.ccsdk.oran a1-adapter-feature - 1.8.0-SNAPSHOT + 1.7.1-SNAPSHOT feature ccsdk-oran :: ${project.artifactId} diff --git a/a1-adapter/a1-adapter-api/installer/pom.xml b/a1-adapter/a1-adapter-api/installer/pom.xml index 44c1db03..a17f5255 100644 --- a/a1-adapter/a1-adapter-api/installer/pom.xml +++ b/a1-adapter/a1-adapter-api/installer/pom.xml @@ -32,7 +32,7 @@ org.onap.ccsdk.oran a1-adapter-installer - 1.8.0-SNAPSHOT + 1.7.1-SNAPSHOT pom ccsdk-oran :: ${project.artifactId} diff --git a/a1-adapter/a1-adapter-api/model/pom.xml b/a1-adapter/a1-adapter-api/model/pom.xml index 13a94d63..0a479d7d 100644 --- a/a1-adapter/a1-adapter-api/model/pom.xml +++ b/a1-adapter/a1-adapter-api/model/pom.xml @@ -32,7 +32,7 @@ org.onap.ccsdk.oran a1-adapter-model - 1.8.0-SNAPSHOT + 1.7.1-SNAPSHOT bundle ccsdk-oran :: ${project.artifactId} diff --git a/a1-adapter/a1-adapter-api/pom.xml b/a1-adapter/a1-adapter-api/pom.xml index 2b3d321d..50bdac84 100644 --- a/a1-adapter/a1-adapter-api/pom.xml +++ b/a1-adapter/a1-adapter-api/pom.xml @@ -31,7 +31,7 @@ org.onap.ccsdk.oran a1-adapter-api - 1.8.0-SNAPSHOT + 1.7.1-SNAPSHOT pom ccsdk-oran :: ${project.artifactId} diff --git a/a1-adapter/a1-adapter-api/provider/pom.xml b/a1-adapter/a1-adapter-api/provider/pom.xml index a8655cc2..da908d3b 100644 --- a/a1-adapter/a1-adapter-api/provider/pom.xml +++ b/a1-adapter/a1-adapter-api/provider/pom.xml @@ -32,7 +32,7 @@ org.onap.ccsdk.oran a1-adapter-provider - 1.8.0-SNAPSHOT + 1.7.1-SNAPSHOT bundle ccsdk-oran :: ${project.artifactId} diff --git a/a1-adapter/features/a1-adapter-northbound/pom.xml b/a1-adapter/features/a1-adapter-northbound/pom.xml index 8f735551..6271cccd 100644 --- a/a1-adapter/features/a1-adapter-northbound/pom.xml +++ b/a1-adapter/features/a1-adapter-northbound/pom.xml @@ -31,7 +31,7 @@ org.onap.ccsdk.oran a1-adapter-northbound - 1.8.0-SNAPSHOT + 1.7.1-SNAPSHOT feature ccsdk-oran :: ${project.artifactId} diff --git a/a1-adapter/features/installer/pom.xml b/a1-adapter/features/installer/pom.xml index a123a6c1..e79e2fac 100644 --- a/a1-adapter/features/installer/pom.xml +++ b/a1-adapter/features/installer/pom.xml @@ -32,7 +32,7 @@ org.onap.ccsdk.oran a1-adapter-northbound-installer - 1.8.0-SNAPSHOT + 1.7.1-SNAPSHOT pom ccsdk-oran :: ${project.artifactId} diff --git a/a1-adapter/features/pom.xml b/a1-adapter/features/pom.xml index 554275ba..a993b8a1 100644 --- a/a1-adapter/features/pom.xml +++ b/a1-adapter/features/pom.xml @@ -32,7 +32,7 @@ org.onap.ccsdk.oran ccsdk-a1-adapter-feature-aggregator - 1.8.0-SNAPSHOT + 1.7.1-SNAPSHOT pom ccsdk-oran :: ${project.artifactId} diff --git a/a1-adapter/pom.xml b/a1-adapter/pom.xml index b69e1da9..b7f6807c 100644 --- a/a1-adapter/pom.xml +++ b/a1-adapter/pom.xml @@ -32,7 +32,7 @@ org.onap.ccsdk.oran ccsdk-a1-adapter - 1.8.0-SNAPSHOT + 1.7.1-SNAPSHOT pom ccsdk-oran :: ${project.artifactId} diff --git a/a1-policy-management/pom.xml b/a1-policy-management/pom.xml index 46e0ec35..2c13d392 100644 --- a/a1-policy-management/pom.xml +++ b/a1-policy-management/pom.xml @@ -30,7 +30,7 @@ org.onap.ccsdk.oran a1-policy-management-service - 1.8.0-SNAPSHOT + 1.7.1-SNAPSHOT ccsdk-oran :: ${project.artifactId} 17 diff --git a/csit/scripts/healthcheck/.env b/csit/scripts/healthcheck/.env index c9b3561d..9545a7e5 100644 --- a/csit/scripts/healthcheck/.env +++ b/csit/scripts/healthcheck/.env @@ -18,7 +18,7 @@ #PMS PMS_IMAGE_BASE="onap/ccsdk-oran-a1policymanagementservice" -PMS_IMAGE_TAG="1.8.0-SNAPSHOT-latest" +PMS_IMAGE_TAG="1.7.1-SNAPSHOT-latest" #A1_SIM A1_SIM_IMAGE_BASE="nexus3.o-ran-sc.org:10002/o-ran-sc/a1-simulator" diff --git a/csit/scripts/healthcheck/test/pms_a1sim_sdnc.sh b/csit/scripts/healthcheck/test/pms_a1sim_sdnc.sh index 79c08b63..7b8aca7a 100755 --- a/csit/scripts/healthcheck/test/pms_a1sim_sdnc.sh +++ b/csit/scripts/healthcheck/test/pms_a1sim_sdnc.sh @@ -1,7 +1,8 @@ #!/bin/bash # ============LICENSE_START=============================================== -# Copyright (C) 2021 Nordix Foundation. All rights reserved. +# Copyright (C) 2021-2023 Nordix Foundation. All rights reserved. +# Copyright (C) 2024 OpenInfra Foundation Europe. 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. @@ -46,7 +47,7 @@ checkStatus(){ done echo -e "$i sec: $4 is NOT alive!\n" echo "Capturing docker logs (before exiting) ..." - docker-compose --env-file .env -f docker-compose.yml -f sdnc/docker-compose.yml logs + docker-compose --env-file .env -f docker-compose.yml -f sdnc/docker-compose.yml logs exit -1 } diff --git a/docs/conf.py b/docs/conf.py index 07f9c67c..52b34016 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -17,11 +17,11 @@ # project = "onap" -release = "master" -version = "master" +release = "newdelhi" +version = "newdelhi" # Map to 'latest' if this file is used in 'latest' (master) 'doc' branch. # Change to {releasename} after you have created the new 'doc' branch. -branch = 'latest' +branch = 'newdelhi' author = "Open Network Automation Platform" diff --git a/docs/guide/developer-guide.rst b/docs/guide/developer-guide.rst index bb737441..d6896872 100644 --- a/docs/guide/developer-guide.rst +++ b/docs/guide/developer-guide.rst @@ -10,7 +10,7 @@ Developer Guide This document provides a quickstart for developers of the CCSDK functions for O-RAN A1 Policies. -.. image:: ../media/ONAP-A1ControllerArchitecture-Montreal.png +.. image:: ../media/ONAP-A1ControllerArchitecture-NewDelhi.png :width: 500pt Source tree diff --git a/docs/humaninterfaces/humaninterfaces.rst b/docs/humaninterfaces/humaninterfaces.rst index a68962b8..780f8208 100644 --- a/docs/humaninterfaces/humaninterfaces.rst +++ b/docs/humaninterfaces/humaninterfaces.rst @@ -7,6 +7,6 @@ Human Interfaces ================ The NON-RT RIC Control Panel in O-RAN-SC can be used to interact with the Policy Management Service. -See `NON-RT RIC Control Panel repo `_ from the `O-RAN-SC NONRTRIC Project `_. +See `NON-RT RIC Control Panel repo `_ from the `O-RAN-SC NONRTRIC Project `_. Any "REST Client" application may be used (Postman, ...) to interact with the Policy Management Service application via the :ref:`pms_api` diff --git a/docs/media/ONAP-A1ControllerArchitecture-NewDelhi.png b/docs/media/ONAP-A1ControllerArchitecture-NewDelhi.png new file mode 100644 index 00000000..15580c87 Binary files /dev/null and b/docs/media/ONAP-A1ControllerArchitecture-NewDelhi.png differ diff --git a/pom.xml b/pom.xml index c2cd2235..7dcafa3e 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ org.onap.ccsdk.oran ccsdk-oran - 1.8.0-SNAPSHOT + 1.7.1-SNAPSHOT pom @@ -52,7 +52,7 @@ org.sonarsource.scanner.maven sonar-maven-plugin ${sonar-maven-plugin.version} - + diff --git a/version.properties b/version.properties index 553bda22..1f394778 100644 --- a/version.properties +++ b/version.properties @@ -5,8 +5,8 @@ release_name=1 -sprint_number=8 -feature_revision=0 +sprint_number=7 +feature_revision=1 base_version=${release_name}.${sprint_number}.${feature_revision}