Upgrade E2Mgr spec to version 2.0.5 of 2019-09-11

Minor changes in the backend but no behavior changes.

Change-Id: Ica61cc488d077dc1001828229a3d858bbeea31ae
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

diff --git a/.gitignore b/.gitignore
index 175c380..ecc268e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,7 @@
 /.settings
 /target/
 /.mvn/wrapper/maven-wrapper.jar
+/.tox
 
 ### STS ###
 .apt_generated

diff --git a/docs/.gitignore b/docs/.gitignore
index 651cf82..f6b991e 100644 (file)
--- a/docs/.gitignore
+++ b/docs/.gitignore
@@ -1,2 +1,3 @@
 /conf.py
 /out
+/_build

diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index 4d94370..9448d20 100644 (file)
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -23,7 +23,7 @@ Version 1.2.1, ? Aug 2019
 -------------------------
 * Add EPSDK-FW user management and Portal security
 
-Version 1.2.0, 23 Aug 2019
+Version 1.2.0, 11 Sep 2019
 --------------------------
 * Split URL properties into prefix/suffix parts
 * Add jacoco plugin to back-end for code coverage
@@ -33,7 +33,6 @@ Version 1.2.0, 23 Aug 2019
 * Extend mock endpoints to simulate delay seen in tests
 * Move mock configuration classes into test area
 * Update App manager client to spec version 0.1.7
-* Update E2 manager client to spec version 20190815
 * Add controller for page refresh of Angular routes
 * Extend E2 mock configuration for demo purposes
 * Add pattern for matching AC/admin application name
@@ -50,6 +49,7 @@ Version 1.2.0, 23 Aug 2019
 * Create loading-dialog component and service
 * Showing the loading-dialog while making API call
 * Add notification and error handling for xapp configuration
+* Update E2 manager client to spec version 2.0.5 of 2019-09-11
 
 Version 1.0.5, 5 July 2019
 --------------------------

diff --git a/e2-mgr-client/pom.xml b/e2-mgr-client/pom.xml
index ae8a891..cf9dedc 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>20190815-SNAPSHOT</version>
+       <version>2.0.5-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-15.yaml</inputSpec>
+                                                       <inputSpec>${project.basedir}/src/main/resources/E2M_API_2019-09-11.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-15.yaml b/e2-mgr-client/src/main/resources/E2M_API_2019-09-11.yaml
similarity index 99%
rename from e2-mgr-client/src/main/resources/E2M_API_2019-08-15.yaml
rename to e2-mgr-client/src/main/resources/E2M_API_2019-09-11.yaml
index f5e5371..685ac2d 100644 (file)
--- a/e2-mgr-client/src/main/resources/E2M_API_2019-08-15.yaml
+++ b/e2-mgr-client/src/main/resources/E2M_API_2019-09-11.yaml
@@ -15,11 +15,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ========================LICENSE_END===================================
+
 openapi: 3.0.0
 info:
   title: E2 Manager Service
   description: E2 Manager Service APIs
-  version: 1.0.0
+  version: 2.0.5
 servers:
   - url: 'http://{apiRoot}/v1'
     variables:
@@ -133,7 +134,7 @@ paths:
             application/problem+json:
               schema:
                 $ref: '#/components/schemas/ErrorResponse'
-  /nodeb-ids:
+  /nodeb/ids:
     get:
       tags:
         - nodeb
@@ -154,12 +155,12 @@ paths:
             application/problem+json:
               schema:
                 $ref: '#/components/schemas/ErrorResponse'
-  /nodeb-reset/{ranName}:
+  /nodeb/{ranName}/reset:
     put:
       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 +247,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 08cc563..d86ba21 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>20190815-SNAPSHOT</version>
+                       <version>2.0.5-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.onap.portal.sdk</groupId>

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 a8b64b3..104cb1d 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
@@ -70,15 +70,17 @@ public class E2ManagerController {
 
        // Publish paths in constants so tests are easy to write
        public static final String CONTROLLER_PATH = DashboardConstants.ENDPOINT_PREFIX + "/e2mgr";
-       // Endpoints
+       // Dashboard only
        public static final String HEALTH_METHOD = "health";
-       public static final String NODEB_SHUTDOWN_METHOD = "/nodebShutdownPut";
-       public static final String NODEB_LIST_METHOD = "/nodeb-ids";
        public static final String RAN_METHOD = "/ran";
-       public static final String RESET_METHOD = "/reset";
-       public static final String ENDC_SETUP_METHOD = "/endcSetup";
-       public static final String X2_SETUP_METHOD = "/x2Setup";
        public static final String VERSION_METHOD = DashboardConstants.VERSION_METHOD;
+       // Keep these consistent with the E2M implementation
+       public static final String NODEB_PREFIX = "/nodeb";
+       public static final String NODEB_SHUTDOWN_METHOD = NODEB_PREFIX + "/shutdown";
+       public static final String NODEB_LIST_METHOD = NODEB_PREFIX + "/ids";
+       public static final String RESET_METHOD = "/reset";
+       public static final String ENDC_SETUP_METHOD = NODEB_PREFIX + "/endc-setup";
+       public static final String X2_SETUP_METHOD = NODEB_PREFIX + "/x2-setup";
        // Path parameters
        private static final String PP_RANNAME = "ranName";
 
@@ -177,7 +179,7 @@ public class E2ManagerController {
        }
 
        @ApiOperation(value = "Abort any other ongoing procedures over X2 between the RIC and the RAN.")
-       @PutMapping(RESET_METHOD + "/{" + PP_RANNAME + "}")
+       @PutMapping(NODEB_PREFIX  + "/{" + PP_RANNAME + "}"+ RESET_METHOD)
        @Secured({ DashboardConstants.ROLE_ADMIN })
        public void reset(@PathVariable(PP_RANNAME) String ranName, @RequestBody ResetRequest resetRequest,
                        HttpServletResponse response) {

diff --git a/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/E2ManagerControllerTest.java b/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/E2ManagerControllerTest.java
index 6161d63..f4caee3 100644 (file)
--- a/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/E2ManagerControllerTest.java
+++ b/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/E2ManagerControllerTest.java
@@ -52,7 +52,8 @@ public class E2ManagerControllerTest extends AbstractControllerTest {
        }
 
        private ResponseEntity<Void> reset() {
-               URI uri = buildUri(null, E2ManagerController.CONTROLLER_PATH, E2ManagerController.RESET_METHOD, "ignored");
+               URI uri = buildUri(null, E2ManagerController.CONTROLLER_PATH, E2ManagerController.NODEB_PREFIX, "ignored",
+                               E2ManagerController.RESET_METHOD);
                logger.info("Invoking {}", uri);
                ResetRequest reset = new ResetRequest();
                HttpEntity<ResetRequest> entity = new HttpEntity<>(reset);