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) <cl778h@att.com>

diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index e29b613..5e89d6e 100644 (file)
--- 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 3898380..5d56fc3 100644 (file)
--- a/e2-mgr-client/pom.xml
+++ b/e2-mgr-client/pom.xml
@@ -31,7 +31,7 @@ limitations under the License.
        <groupId>org.o-ran-sc.ric.plt.e2mgr.client</groupId>
        <artifactId>e2-mgr-client</artifactId>
        <name>RIC E2 Manager client</name>
-       <version>20190808-SNAPSHOT</version>
+       <version>20190813-SNAPSHOT</version>
        <properties>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -102,7 +102,7 @@ limitations under the License.
                                                        <goal>generate</goal>
                                                </goals>
                                                <configuration>
-                                                       <inputSpec>${project.basedir}/src/main/resources/E2M_API_2019-08-08.yaml</inputSpec>
+                                                       <inputSpec>${project.basedir}/src/main/resources/E2M_API_2019-08-13.yaml</inputSpec>
                                                        <language>java</language>
                                                        <packageName>${client.base.package.name}</packageName>
                                                        <modelPackage>${client.base.package.name}.model</modelPackage>

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 2bd99a2..ead97eb 100644 (file)
--- 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 4f006c1..e5ea972 100644 (file)
--- a/webapp-backend/pom.xml
+++ b/webapp-backend/pom.xml
@@ -62,7 +62,7 @@ limitations under the License.
                <dependency>
                        <groupId>org.o-ran-sc.ric.plt.e2mgr.client</groupId>
                        <artifactId>e2-mgr-client</artifactId>
-                       <version>20190808-SNAPSHOT</version>
+                       <version>20190813-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.onap.portal.sdk</groupId>
@@ -271,7 +271,7 @@ limitations under the License.
                        <plugin>
                                <groupId>io.fabric8</groupId>
                                <artifactId>docker-maven-plugin</artifactId>
-                               <version>0.28.0</version>
+                               <version>0.30.0</version>
                                <configuration>
                                        <verbose>true</verbose>
                                        <!-- environment variables supplied by Jenkins -->

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 f020d8e..e4a5ad7 100644 (file)
--- 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 520da74..02d7f49 100644 (file)
--- 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);