From 6592de75c9b6a494b5886ca2e9b30dc183edb1bc Mon Sep 17 00:00:00 2001
From: "Lott, Christopher (cl778h)" <cl778h@att.com>
Date: Wed, 3 Jul 2019 09:37:38 -0400
Subject: [PATCH] Upgrade E2 Manager API to 2019-07-03

Adds data to a response object, no new APIs

Change-Id: Icc1a831d8eb8e59994c53fa3bc4620708c7ed1df
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>
---
 anr-xapp-client/pom.xml                                           | 2 --
 app-mgr-client/pom.xml                                            | 2 --
 docs/release-notes.rst                                            | 4 ++--
 e2-mgr-client/pom.xml                                             | 4 ++--
 .../{E2M_API_2019-06-30.yaml => E2M_API_2019-07-03.yaml}          | 8 ++++++++
 webapp-backend/pom.xml                                            | 2 +-
 6 files changed, 13 insertions(+), 9 deletions(-)
 rename e2-mgr-client/src/main/resources/{E2M_API_2019-06-30.yaml => E2M_API_2019-07-03.yaml} (99%)

diff --git a/anr-xapp-client/pom.xml b/anr-xapp-client/pom.xml
index 7d079fb4..b99e68cf 100644
--- a/anr-xapp-client/pom.xml
+++ b/anr-xapp-client/pom.xml
@@ -110,8 +110,6 @@ limitations under the License.
 								<groupId>${project.groupId}</groupId>
 								<artifactId>${project.artifactId}</artifactId>
 								<artifactVersion>${project.version}</artifactVersion>
-								<artifactUrl>www.O-RAN-SC.org</artifactUrl>
-								<artifactDescription>ANR xApp client library</artifactDescription>
 								<library>resttemplate</library>
 								<java8>true</java8>
 								<dateLibrary>java8</dateLibrary>
diff --git a/app-mgr-client/pom.xml b/app-mgr-client/pom.xml
index a6f30f00..1673d73c 100644
--- a/app-mgr-client/pom.xml
+++ b/app-mgr-client/pom.xml
@@ -110,8 +110,6 @@ limitations under the License.
 								<groupId>${project.groupId}</groupId>
 								<artifactId>${project.artifactId}</artifactId>
 								<artifactVersion>${project.version}</artifactVersion>
-								<artifactUrl>www.O-RAN-SC.org</artifactUrl>
-								<artifactDescription>xApp manager client library</artifactDescription>
 								<library>resttemplate</library>
 								<java8>true</java8>
 								<dateLibrary>java8</dateLibrary>
diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index 691098a6..252aa8aa 100644
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -20,12 +20,12 @@
 RIC Dashboard Release Notes
 ===========================
 
-Version 1.0.5, 2 July 2019
+Version 1.0.5, 3 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 20190630
+* Update E2 manager client to spec version 20190703
 * Add configuration-driven mock of E2 getNodebIdList
 * Revise front-end components to use prefix 'rd'
 
diff --git a/e2-mgr-client/pom.xml b/e2-mgr-client/pom.xml
index a2f38a58..99f1074b 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>20190630-SNAPSHOT</version>
+	<version>20190703-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/E2M_API_2019-06-30.yaml</inputSpec>
+							<inputSpec>${project.basedir}/src/main/resources/E2M_API_2019-07-03.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-06-30.yaml b/e2-mgr-client/src/main/resources/E2M_API_2019-07-03.yaml
similarity index 99%
rename from e2-mgr-client/src/main/resources/E2M_API_2019-06-30.yaml
rename to e2-mgr-client/src/main/resources/E2M_API_2019-07-03.yaml
index 83b59cac..42ede314 100644
--- a/e2-mgr-client/src/main/resources/E2M_API_2019-06-30.yaml
+++ b/e2-mgr-client/src/main/resources/E2M_API_2019-07-03.yaml
@@ -383,6 +383,14 @@ components:
           oneOf:
             - type: string
             - type: integer
+        globalNbId:
+          properties:
+            nbId:
+              type: string
+            plmnId:
+              type: string
+          additionalProperties: false
+          type: object
         gnb:
           properties:
             servedNrCells:
diff --git a/webapp-backend/pom.xml b/webapp-backend/pom.xml
index cf193678..ed537585 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>20190630-SNAPSHOT</version>
+			<version>20190703-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-- 
2.16.6