From 0aa99919dea387fd2216b3b13bc06d3a10868089 Mon Sep 17 00:00:00 2001
From: "Lott, Christopher (cl778h)" <cl778h@att.com>
Date: Sun, 30 Jun 2019 10:08:51 -0400
Subject: [PATCH] Upgrade E2 manager to spec dated 2019-06-30

This renames the get-nodeb-ids endpoint path slightly.

Change-Id: I8156d325bf023d5ed1beb0c9fdfda09d25b1e9e7
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>
---
 docs/release-notes.rst                                           | 9 ++-------
 e2-mgr-client/pom.xml                                            | 4 ++--
 .../{E2_Manager_API_2019-06-26.yaml => E2M_API_2019-06-30.yaml}  | 2 +-
 webapp-backend/pom.xml                                           | 2 +-
 .../ric/portal/dashboard/controller/E2ManagerController.java     | 2 +-
 5 files changed, 7 insertions(+), 12 deletions(-)
 rename e2-mgr-client/src/main/resources/{E2_Manager_API_2019-06-26.yaml => E2M_API_2019-06-30.yaml} (99%)

diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index ff4e6b9e..3e270421 100644
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -20,12 +20,12 @@
 RIC Dashboard Release Notes
 ===========================
 
-Version 1.0.5, 28 June 2019
+Version 1.0.5, 1 July 2019
 ---------------------------
 * Upgrade to Angular version 8
 * Upgrade to Spring-Boot 2.1.6.RELEASE
 * Fixed AC xApp policy page title is not aligned
-* Update E2 manager client to spec version 20190626
+* Update E2 manager client to spec version 20190630
 * Add configuration-driven mock of E2 getNodebIdList
 
 Version 1.0.4, 27 June 2019
@@ -49,13 +49,8 @@ Version 1.0.4, 27 June 2019
 * Update App manager client to spec version 0.1.5
 * Move RAN connection feature to control screen
 * Rework admin table
-<<<<<<< HEAD
-* Update the notification service
-* Remove the RAN connection invocation link from left menu and move it to control screen
-=======
 * Update the notification service 
 * Move RAN connection feature to control screen
->>>>>>> Upgrade E2 to version 20190626
 * Repair deploy-app feature and use icon instead of text button
 
 Version 1.0.3, 28 May 2019
diff --git a/e2-mgr-client/pom.xml b/e2-mgr-client/pom.xml
index a4676659..a2f38a58 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>20190626-SNAPSHOT</version>
+	<version>20190630-SNAPSHOT</version>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -104,7 +104,7 @@ limitations under the License.
 							<goal>generate</goal>
 						</goals>
 						<configuration>
-							<inputSpec>${project.basedir}/src/main/resources/E2_Manager_API_2019-06-26.yaml</inputSpec>
+							<inputSpec>${project.basedir}/src/main/resources/E2M_API_2019-06-30.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/E2_Manager_API_2019-06-26.yaml b/e2-mgr-client/src/main/resources/E2M_API_2019-06-30.yaml
similarity index 99%
rename from e2-mgr-client/src/main/resources/E2_Manager_API_2019-06-26.yaml
rename to e2-mgr-client/src/main/resources/E2M_API_2019-06-30.yaml
index 3e7b08ab..83b59cac 100644
--- a/e2-mgr-client/src/main/resources/E2_Manager_API_2019-06-26.yaml
+++ b/e2-mgr-client/src/main/resources/E2M_API_2019-06-30.yaml
@@ -134,7 +134,7 @@ paths:
             application/problem+json:
               schema:
                 $ref: '#/components/schemas/ErrorResponse'
-  /nodeb/ids:
+  /nodeb-ids:
     get:
       tags:
         - nodeb
diff --git a/webapp-backend/pom.xml b/webapp-backend/pom.xml
index 1107a48e..cf193678 100644
--- a/webapp-backend/pom.xml
+++ b/webapp-backend/pom.xml
@@ -56,7 +56,7 @@ limitations under the License.
 		<dependency>
 			<groupId>org.o-ran-sc.ric.plt.e2mgr.client</groupId>
 			<artifactId>e2-mgr-client</artifactId>
-			<version>20190626-SNAPSHOT</version>
+			<version>20190630-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</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 6b621f4f..631515b3 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
@@ -148,7 +148,7 @@ public class E2ManagerController {
 	}
 
 	@ApiOperation(value = "Get RAN identities list.", response = NodebIdentity.class, responseContainer = "List")
-	@RequestMapping(value = "/nodeb/id", method = RequestMethod.GET)
+	@RequestMapping(value = "/nodeb-ids", method = RequestMethod.GET)
 	public Object getNodebIdList() {
 		logger.debug("getNodebIdList");
 		try {
-- 
2.16.6