aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--a1-adapter/a1-adapter-api/feature/pom.xml2
-rw-r--r--a1-adapter/a1-adapter-api/installer/pom.xml2
-rw-r--r--a1-adapter/a1-adapter-api/model/pom.xml2
-rw-r--r--a1-adapter/a1-adapter-api/pom.xml2
-rw-r--r--a1-adapter/a1-adapter-api/provider/pom.xml2
-rw-r--r--a1-adapter/features/a1-adapter-northbound/pom.xml2
-rw-r--r--a1-adapter/features/installer/pom.xml2
-rw-r--r--a1-adapter/features/pom.xml2
-rw-r--r--a1-adapter/pom.xml2
-rw-r--r--a1-policy-management/pom.xml14
-rw-r--r--a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/clients/OscA1Client.java27
-rw-r--r--a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/clients/CcsdkA1AdapterClientTest.java12
-rw-r--r--a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/clients/OscA1ClientTest.java2
-rw-r--r--csit/scripts/healthcheck/.env2
-rw-r--r--docs/releasenotes/release-notes.rst50
-rw-r--r--pom.xml2
-rw-r--r--version.properties4
17 files changed, 102 insertions, 29 deletions
diff --git a/a1-adapter/a1-adapter-api/feature/pom.xml b/a1-adapter/a1-adapter-api/feature/pom.xml
index cbe19308..467cd6fd 100644
--- a/a1-adapter/a1-adapter-api/feature/pom.xml
+++ b/a1-adapter/a1-adapter-api/feature/pom.xml
@@ -31,7 +31,7 @@
<groupId>org.onap.ccsdk.oran</groupId>
<artifactId>a1-adapter-feature</artifactId>
- <version>1.5.1-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
<packaging>feature</packaging>
<name>ccsdk-oran :: ${project.artifactId}</name>
diff --git a/a1-adapter/a1-adapter-api/installer/pom.xml b/a1-adapter/a1-adapter-api/installer/pom.xml
index a79033a3..c00ed5a3 100644
--- a/a1-adapter/a1-adapter-api/installer/pom.xml
+++ b/a1-adapter/a1-adapter-api/installer/pom.xml
@@ -31,7 +31,7 @@
<groupId>org.onap.ccsdk.oran</groupId>
<artifactId>a1-adapter-installer</artifactId>
- <version>1.5.1-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-oran :: ${project.artifactId}</name>
diff --git a/a1-adapter/a1-adapter-api/model/pom.xml b/a1-adapter/a1-adapter-api/model/pom.xml
index 974038b0..373e7e1c 100644
--- a/a1-adapter/a1-adapter-api/model/pom.xml
+++ b/a1-adapter/a1-adapter-api/model/pom.xml
@@ -31,7 +31,7 @@
<groupId>org.onap.ccsdk.oran</groupId>
<artifactId>a1-adapter-model</artifactId>
- <version>1.5.1-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ccsdk-oran :: ${project.artifactId}</name>
diff --git a/a1-adapter/a1-adapter-api/pom.xml b/a1-adapter/a1-adapter-api/pom.xml
index 03a20d39..dcc740bf 100644
--- a/a1-adapter/a1-adapter-api/pom.xml
+++ b/a1-adapter/a1-adapter-api/pom.xml
@@ -30,7 +30,7 @@
<groupId>org.onap.ccsdk.oran</groupId>
<artifactId>a1-adapter-api</artifactId>
- <version>1.5.1-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-oran :: ${project.artifactId}</name>
diff --git a/a1-adapter/a1-adapter-api/provider/pom.xml b/a1-adapter/a1-adapter-api/provider/pom.xml
index d9b8ffc6..7873b0b1 100644
--- a/a1-adapter/a1-adapter-api/provider/pom.xml
+++ b/a1-adapter/a1-adapter-api/provider/pom.xml
@@ -31,7 +31,7 @@
<groupId>org.onap.ccsdk.oran</groupId>
<artifactId>a1-adapter-provider</artifactId>
- <version>1.5.1-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ccsdk-oran :: ${project.artifactId}</name>
diff --git a/a1-adapter/features/a1-adapter-northbound/pom.xml b/a1-adapter/features/a1-adapter-northbound/pom.xml
index d19b7c7b..5b61a25a 100644
--- a/a1-adapter/features/a1-adapter-northbound/pom.xml
+++ b/a1-adapter/features/a1-adapter-northbound/pom.xml
@@ -30,7 +30,7 @@
<groupId>org.onap.ccsdk.oran</groupId>
<artifactId>a1-adapter-northbound</artifactId>
- <version>1.5.1-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
<packaging>feature</packaging>
<name>ccsdk-oran :: ${project.artifactId}</name>
diff --git a/a1-adapter/features/installer/pom.xml b/a1-adapter/features/installer/pom.xml
index 2118502a..524cdd79 100644
--- a/a1-adapter/features/installer/pom.xml
+++ b/a1-adapter/features/installer/pom.xml
@@ -31,7 +31,7 @@
<groupId>org.onap.ccsdk.oran</groupId>
<artifactId>a1-adapter-northbound-installer</artifactId>
- <version>1.5.1-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-oran :: ${project.artifactId}</name>
diff --git a/a1-adapter/features/pom.xml b/a1-adapter/features/pom.xml
index a1d52e1b..8ce3ccd3 100644
--- a/a1-adapter/features/pom.xml
+++ b/a1-adapter/features/pom.xml
@@ -31,7 +31,7 @@
<groupId>org.onap.ccsdk.oran</groupId>
<artifactId>ccsdk-a1-adapter-feature-aggregator</artifactId>
- <version>1.5.1-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-oran :: ${project.artifactId}</name>
diff --git a/a1-adapter/pom.xml b/a1-adapter/pom.xml
index 73d84ad6..4c5851d4 100644
--- a/a1-adapter/pom.xml
+++ b/a1-adapter/pom.xml
@@ -31,7 +31,7 @@
<groupId>org.onap.ccsdk.oran</groupId>
<artifactId>ccsdk-a1-adapter</artifactId>
- <version>1.5.1-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-oran :: ${project.artifactId}</name>
diff --git a/a1-policy-management/pom.xml b/a1-policy-management/pom.xml
index d1bf04f3..338477b6 100644
--- a/a1-policy-management/pom.xml
+++ b/a1-policy-management/pom.xml
@@ -31,7 +31,7 @@
</parent>
<groupId>org.onap.ccsdk.oran</groupId>
<artifactId>a1-policy-management-service</artifactId>
- <version>1.5.1-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
<name>ccsdk-oran :: ${project.artifactId}</name>
<properties>
<java.version.source>17</java.version.source>
@@ -213,6 +213,16 @@
<artifactId>everit-json-schema</artifactId>
<version>1.14.0</version>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.httpcache4j.uribuilder</groupId>
+ <artifactId>uribuilder</artifactId>
+ <version>2.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.5.13</version>
+ </dependency>
</dependencies>
<build>
<plugins>
@@ -492,4 +502,4 @@
</plugin>
</plugins>
</reporting>
-</project> \ No newline at end of file
+</project>
diff --git a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/clients/OscA1Client.java b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/clients/OscA1Client.java
index 62115b5a..f2a79cd8 100644
--- a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/clients/OscA1Client.java
+++ b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/clients/OscA1Client.java
@@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
-
+import org.apache.http.client.utils.URIBuilder;
/**
* Client for accessing OSC A1 REST API
*/
@@ -49,7 +49,7 @@ public class OscA1Client implements A1Client {
@Override
public String createPutPolicyUri(String type, String policyId, String notificationDestinationUri) {
- return createPolicyUri(type, policyId);
+ return createPolicyUri(type, policyId, notificationDestinationUri);
}
/**
@@ -62,7 +62,7 @@ public class OscA1Client implements A1Client {
@Override
public String createDeleteUri(String type, String policyId) {
- return createPolicyUri(type, policyId);
+ return createPolicyUri(type, policyId, null);
}
/**
@@ -70,7 +70,7 @@ public class OscA1Client implements A1Client {
*/
@Override
public String createGetPolicyStatusUri(String type, String policyId) {
- return createPolicyUri(type, policyId) + "/status";
+ return createPolicyUri(type, policyId, null) + "/status";
}
/**
@@ -99,9 +99,22 @@ public class OscA1Client implements A1Client {
/**
* ​/a1-p​/policytypes​/{policy_type_id}​/policies​/{policy_instance_id}
*/
- private String createPolicyUri(String type, String id) {
- return createPolicyTypeUri(type) + "/policies/" + id;
- }
+ private String createPolicyUri(String type, String id, String notificationDestination) {
+ String url = "";
+ URIBuilder ub = null;
+ try {
+ ub = new URIBuilder(createPolicyTypeUri(type) + "/policies/" + id);
+ if(notificationDestination != null) {
+ ub.addParameter("notificationDestination", notificationDestination);
+ }
+ url = ub.toString();
+ }
+ catch(Exception e) {
+ String exceptionString = e.toString();
+ logger.error("Unexpected error in policy URI creation for policy type: {}, exception: {}", type, exceptionString);
+ }
+ return url;
+ }
/**
* /a1-p/policytypes/{policy_type_id}
diff --git a/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/clients/CcsdkA1AdapterClientTest.java b/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/clients/CcsdkA1AdapterClientTest.java
index e6c8dfe8..753b8d42 100644
--- a/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/clients/CcsdkA1AdapterClientTest.java
+++ b/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/clients/CcsdkA1AdapterClientTest.java
@@ -264,18 +264,18 @@ class CcsdkA1AdapterClientTest {
.block();
assertEquals("OK", returned);
- AdapterRequest expectedInputParams = new AdapterRequest(expUrl, POLICY_JSON_VALID);
+ AdapterRequest expectedInputParams = new AdapterRequest(expUrl , POLICY_JSON_VALID);
String expInput = A1AdapterJsonHelper.createInputJsonString(expectedInputParams);
- verify(asyncRestClientMock).postWithAuthHeader(PUT_A1_URL, expInput, CONTROLLER_USERNAME, CONTROLLER_PASSWORD);
+ verify(asyncRestClientMock).postWithAuthHeader(PUT_A1_URL , expInput, CONTROLLER_USERNAME, CONTROLLER_PASSWORD);
}
@Test
@DisplayName("test put Policy OSC")
void putPolicy_OSC() {
- String expUrl = RIC_1_URL + "/a1-p/policytypes/type1/policies/policy1";
- putPolicy(A1ProtocolType.CCSDK_A1_ADAPTER_OSC_V1, expUrl);
+ String expUrl = RIC_1_URL + "/a1-p/policytypes/type1/policies/policy1?notificationDestination\u003dhttps%3A%2F%2Ftest.com";
+ putPolicy(A1ProtocolType.CCSDK_A1_ADAPTER_OSC_V1, expUrl);
}
@Test
@@ -307,7 +307,7 @@ class CcsdkA1AdapterClientTest {
whenAsyncPostThenReturn(Mono.just(resp));
Mono<String> returnedMono = clientUnderTest
- .putPolicy(A1ClientHelper.createPolicy(RIC_1_URL, POLICY_1_ID, policyJson, POLICY_TYPE_1_ID));
+ .putPolicy(A1ClientHelper.createPolicy(RIC_1_URL + "?notificationDestination=https%3A%2F%2Ftest.com", POLICY_1_ID, policyJson, POLICY_TYPE_1_ID));
StepVerifier.create(returnedMono) //
.expectSubscription() //
.expectErrorMatches(t -> t instanceof WebClientResponseException) //
@@ -377,7 +377,7 @@ class CcsdkA1AdapterClientTest {
asyncRestClientMock);
whenPostReturnOkResponse();
- Policy policy = A1ClientHelper.createPolicy(RIC_1_URL, POLICY_1_ID, POLICY_JSON_VALID, POLICY_TYPE_1_ID);
+ Policy policy = A1ClientHelper.createPolicy(RIC_1_URL + "?notificationDestination=https%3A%2F%2Ftest.com", POLICY_1_ID, POLICY_JSON_VALID, POLICY_TYPE_1_ID);
String response = clientUnderTest.getPolicyStatus(policy).block();
assertEquals("OK", response);
diff --git a/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/clients/OscA1ClientTest.java b/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/clients/OscA1ClientTest.java
index 2f2cce02..68214fc5 100644
--- a/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/clients/OscA1ClientTest.java
+++ b/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/clients/OscA1ClientTest.java
@@ -150,7 +150,7 @@ class OscA1ClientTest {
clientUnderTest
.putPolicy(A1ClientHelper.createPolicy(RIC_URL, POLICY_1_ID, POLICY_JSON_VALID, POLICY_TYPE_1_ID))
.block();
- verify(asyncRestClientMock).put(POLICYTYPES_URL + POLICY_TYPE_1_ID + POLICIES + "/" + POLICY_1_ID,
+ verify(asyncRestClientMock).put(POLICYTYPES_URL + POLICY_TYPE_1_ID + POLICIES + "/" + POLICY_1_ID + "?notificationDestination=https%3A%2F%2Ftest.com",
POLICY_JSON_VALID);
}
diff --git a/csit/scripts/healthcheck/.env b/csit/scripts/healthcheck/.env
index c6f4c98a..b0200219 100644
--- a/csit/scripts/healthcheck/.env
+++ b/csit/scripts/healthcheck/.env
@@ -17,7 +17,7 @@
#PMS
PMS_IMAGE_BASE="onap/ccsdk-oran-a1policymanagementservice"
-PMS_IMAGE_TAG="1.5.1-SNAPSHOT-latest"
+PMS_IMAGE_TAG="1.6.0-SNAPSHOT-latest"
#A1_SIM
A1_SIM_IMAGE_BASE="nexus3.o-ran-sc.org:10002/o-ran-sc/a1-simulator"
diff --git a/docs/releasenotes/release-notes.rst b/docs/releasenotes/release-notes.rst
index 4d3ac9df..e8a12c37 100644
--- a/docs/releasenotes/release-notes.rst
+++ b/docs/releasenotes/release-notes.rst
@@ -85,6 +85,12 @@ Version history Policy Management Service
| 2022-10-25 | 1.4.1 | Dan Timoney | RC (1) version, |
| | | | Kohn Release |
+------------+----------+-------------+-------------------+
+| 2022-12-06 | 1.4.2 | Dan Timoney | Release version, |
+| | | | Kohn Release |
++------------+----------+-------------+-------------------+
+| 2023-04-26 | 1.5.0 | Dan Timoney | RC version, |
+| | | | London Release |
++------------+----------+-------------+-------------------+
Version history A1 Adapter
==========================
@@ -156,6 +162,12 @@ Version history A1 Adapter
| 2022-10-25 | 1.4.1 | Dan Timoney | RC (1) version, |
| | | | Kohn Release |
+------------+----------+-------------+-------------------+
+| 2022-12-06 | 1.4.2 | Dan Timoney | Release version, |
+| | | | Kohn Release |
++------------+----------+-------------+-------------------+
+| 2023-04-26 | 1.5.0 | Dan Timoney | RC version, |
+| | | | London Release |
++------------+----------+-------------+-------------------+
Release Data
============
@@ -558,3 +570,41 @@ Kohn, RC (1)
| **Purpose of the delivery** | Improvements, Kohn RC 1.4.1 version |
| | |
+-----------------------------+-----------------------------------------------------+
+
+Kohn, Release 1.4.2
+-------------------
++-----------------------------+-----------------------------------------------------+
+| **Project** | CCSDK ORAN |
+| | |
++-----------------------------+-----------------------------------------------------+
+| **Repo/commit-ID** | ccsdk-oran/e774b9608cb82c6ad7a89542a559915468c58158 |
+| | |
++-----------------------------+-----------------------------------------------------+
+| **Release designation** | Kohn |
+| | |
++-----------------------------+-----------------------------------------------------+
+| **Release date** | 2022-12-06 |
+| | |
++-----------------------------+-----------------------------------------------------+
+| **Purpose of the delivery** | Improvements, Kohn Release, 1.4.2 version |
+| | |
++-----------------------------+-----------------------------------------------------+
+
+London, RC
+----------
++-----------------------------+-----------------------------------------------------+
+| **Project** | CCSDK ORAN |
+| | |
++-----------------------------+-----------------------------------------------------+
+| **Repo/commit-ID** | ccsdk-oran/6ef6b6ffec7ad343a73a355b5563913200dbf52f |
+| | |
++-----------------------------+-----------------------------------------------------+
+| **Release designation** | London |
+| | |
++-----------------------------+-----------------------------------------------------+
+| **Release date** | 2023-04-26 |
+| | |
++-----------------------------+-----------------------------------------------------+
+| **Purpose of the delivery** | Improvements, London RC 1.5.0 version |
+| | |
++-----------------------------+-----------------------------------------------------+
diff --git a/pom.xml b/pom.xml
index 389bb80b..e99bd875 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
<groupId>org.onap.ccsdk.oran</groupId>
<artifactId>ccsdk-oran</artifactId>
- <version>1.5.1-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
diff --git a/version.properties b/version.properties
index 1f033065..5b675eea 100644
--- a/version.properties
+++ b/version.properties
@@ -5,8 +5,8 @@
release_name=1
-sprint_number=5
-feature_revision=1
+sprint_number=6
+feature_revision=0
base_version=${release_name}.${sprint_number}.${feature_revision}