From: Lott, Christopher (cl778h) Date: Tue, 13 Aug 2019 11:32:54 +0000 (-0400) Subject: Upgrade E2 manager spec to version 2019-08-13 X-Git-Tag: R2~46 X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=4343a59bf8db708600c9c6a712aa01bbb437db00;p=portal%2Fric-dashboard.git Upgrade E2 manager spec to version 2019-08-13 This changes the drop-all-connections endpoint path from "nodebPut" to "nodebShutdownPut". Change-Id: I3f4fcb727c20f62bf0d7521ffe3d3d2eafdb3bb2 Signed-off-by: Lott, Christopher (cl778h) --- diff --git a/docs/release-notes.rst b/docs/release-notes.rst index e29b6138..5e89d6e2 100644 --- a/docs/release-notes.rst +++ b/docs/release-notes.rst @@ -24,8 +24,8 @@ Version 1.2.1, ? Aug 2019 ------------------------- * Add EPSDK-FW user management and Portal security -Version 1.2.0, 8 Aug 2019 -------------------------- +Version 1.2.0, 13 Aug 2019 +-------------------------- * Split URL properties into prefix/suffix parts * Add jacoco plugin to back-end for code coverage * Compile with Java version 11, use base openjdk:11-jre-slim @@ -35,7 +35,7 @@ Version 1.2.0, 8 Aug 2019 * Move mock configuration classes into test area * Update A1 mediator client to spec version 0.10.0 * Update App manager client to spec version 0.1.7 -* Update E2 manager client to spec version 20190808 +* Update E2 manager client to spec version 20190813 Version 1.0.5, 5 July 2019 -------------------------- diff --git a/e2-mgr-client/pom.xml b/e2-mgr-client/pom.xml index 3898380b..5d56fc32 100644 --- a/e2-mgr-client/pom.xml +++ b/e2-mgr-client/pom.xml @@ -31,7 +31,7 @@ limitations under the License. org.o-ran-sc.ric.plt.e2mgr.client e2-mgr-client RIC E2 Manager client - 20190808-SNAPSHOT + 20190813-SNAPSHOT UTF-8 UTF-8 @@ -102,7 +102,7 @@ limitations under the License. generate - ${project.basedir}/src/main/resources/E2M_API_2019-08-08.yaml + ${project.basedir}/src/main/resources/E2M_API_2019-08-13.yaml java ${client.base.package.name} ${client.base.package.name}.model diff --git a/e2-mgr-client/src/main/resources/E2M_API_2019-08-08.yaml b/e2-mgr-client/src/main/resources/E2M_API_2019-08-13.yaml similarity index 99% rename from e2-mgr-client/src/main/resources/E2M_API_2019-08-08.yaml rename to e2-mgr-client/src/main/resources/E2M_API_2019-08-13.yaml index 2bd99a2d..ead97ebe 100644 --- a/e2-mgr-client/src/main/resources/E2M_API_2019-08-08.yaml +++ b/e2-mgr-client/src/main/resources/E2M_API_2019-08-13.yaml @@ -118,13 +118,12 @@ paths: application/problem+json: schema: $ref: '#/components/schemas/ErrorResponse' - /nodeb: + /nodeb/shutdown: put: tags: - nodeb summary: >- - Close all connections to the RANs and delete the data from the - nodeb-rnib DB + Close all connections to the RANs responses: '204': description: Successful operation @@ -160,7 +159,7 @@ paths: tags: - nodeb summary: >- - Upon receipt of this message, 'ranName' shall abort any other ongoing procedures over X2 between the RIC and the RAN. The RAN shall delete all the context information related to the RIC, except the application level configuration data exchanged during the X2 Setup or eNB Configuration Update procedures, and release the corresponding resource. + Upon receipt of this message, 'ranName' shall abort any other ongoing procedures over X2 between the RIC and the RAN. The RAN shall delete all the context information related to the RIC, except the application level configuration data exchanged during the X2 Setup or eNB Configuration Update procedures, and release the corresponding resource. operationId: reset parameters: - name: ranName @@ -246,8 +245,8 @@ radioNetwork:time-critical-handover, radioNetwork:resource-optimisation-handover, radioNetwork:reduce-load-in-serving-cell, radioNetwork:partial-handover, -radioNetwork:unknown-new-eNB-UE-X2AP-ID, -radioNetwork:unknown-old-eNB-UE-X2AP-ID, +radioNetwork:unknown-new-eNB-UE-X2AP-ID, +radioNetwork:unknown-old-eNB-UE-X2AP-ID, radioNetwork:unknown-pair-of-UE-X2AP-ID, radioNetwork:ho-target-not-allowed, radioNetwork:tx2relocoverall-expiry, diff --git a/webapp-backend/pom.xml b/webapp-backend/pom.xml index 4f006c17..e5ea9729 100644 --- a/webapp-backend/pom.xml +++ b/webapp-backend/pom.xml @@ -62,7 +62,7 @@ limitations under the License. org.o-ran-sc.ric.plt.e2mgr.client e2-mgr-client - 20190808-SNAPSHOT + 20190813-SNAPSHOT org.onap.portal.sdk @@ -271,7 +271,7 @@ limitations under the License. io.fabric8 docker-maven-plugin - 0.28.0 + 0.30.0 true diff --git a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/E2ManagerController.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/E2ManagerController.java index f020d8e0..e4a5ad76 100644 --- a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/E2ManagerController.java +++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/E2ManagerController.java @@ -168,9 +168,9 @@ public class E2ManagerController { @ApiOperation(value = "Close all connections to the RANs and delete the data from the nodeb-rnib DB.") @PutMapping(NODEB_METHOD) @Secured({ DashboardConstants.ROLE_ADMIN }) - public void nodebPut(HttpServletResponse response) { - logger.debug("nodebPut"); - e2NodebApi.nodebPut(); + public void nodebShutdownPut(HttpServletResponse response) { + logger.debug("nodebShutdownPut"); + e2NodebApi.nodebShutdownPut(); response.setStatus(e2NodebApi.getApiClient().getStatusCode().value()); } diff --git a/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/E2ManagerMockConfiguration.java b/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/E2ManagerMockConfiguration.java index 520da742..02d7f498 100644 --- a/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/E2ManagerMockConfiguration.java +++ b/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/E2ManagerMockConfiguration.java @@ -98,7 +98,7 @@ public class E2ManagerMockConfiguration { Thread.sleep(delayMs); } return null; - }).when(mockApi).nodebPut(); + }).when(mockApi).nodebShutdownPut(); doAnswer(inv -> { if (delayMs > 0) { logger.debug("reset sleeping {}", delayMs);