From: Manoop Talasila <talasila@research.att.com>
Date: Fri, 16 Aug 2019 14:30:56 +0000 (+0000)
Subject: Merge "Revise controller error handling"
X-Git-Tag: R2~40
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=7917e39428020a8f36eaf145daa10d90c5159d1a;hp=c7a3ec6561b3b2ce1facbec092305977c3eba665;p=portal%2Fric-dashboard.git

Merge "Revise controller error handling"
---

diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index d70516ef..07e420df 100644
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -34,7 +34,7 @@ Version 1.2.0, 15 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 20190813
+* 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
diff --git a/e2-mgr-client/pom.xml b/e2-mgr-client/pom.xml
index 5d56fc32..ae8a891c 100644
--- 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>20190813-SNAPSHOT</version>
+	<version>20190815-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-13.yaml</inputSpec>
+							<inputSpec>${project.basedir}/src/main/resources/E2M_API_2019-08-15.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-13.yaml b/e2-mgr-client/src/main/resources/E2M_API_2019-08-15.yaml
similarity index 99%
rename from e2-mgr-client/src/main/resources/E2M_API_2019-08-13.yaml
rename to e2-mgr-client/src/main/resources/E2M_API_2019-08-15.yaml
index ead97ebe..f5e53717 100644
--- a/e2-mgr-client/src/main/resources/E2M_API_2019-08-13.yaml
+++ b/e2-mgr-client/src/main/resources/E2M_API_2019-08-15.yaml
@@ -154,7 +154,7 @@ paths:
             application/problem+json:
               schema:
                 $ref: '#/components/schemas/ErrorResponse'
-  /nodeb/{ranName}/reset:
+  /nodeb-reset/{ranName}:
     put:
       tags:
         - nodeb
@@ -240,6 +240,7 @@ protocol:semantic-error,
 protocol:unspecified,
 protocol:abstract-syntax-error-falsely-constructed-message,
 transport:transport-resource-unavailable,
+transport:unspecified,
 radioNetwork:handover-desirable-for-radio-reasons,
 radioNetwork:time-critical-handover,
 radioNetwork:resource-optimisation-handover,
@@ -913,7 +914,7 @@ radioNetwork:pDCP-Overload]
       properties:
         errorCode:
           type: string
-          description: '401 - corrupted json, 402 - validation error, 403 - RAN in wrong state, 500 - RNIB error, 501 - internal problem, 502 - RMR error'
+          description: '401 - corrupted json, 402 - validation error, 403 - RAN in wrong state, 404 - resource not found, 500 - RNIB error, 501 - internal problem, 502 - RMR error'
         errorMessage:
           type: string
           description: Human readable text
diff --git a/webapp-backend/pom.xml b/webapp-backend/pom.xml
index e5ea9729..11f875a8 100644
--- 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>20190813-SNAPSHOT</version>
+			<version>20190815-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.onap.portal.sdk</groupId>