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>

diff --git a/anr-xapp-client/pom.xml b/anr-xapp-client/pom.xml
index 7d079fb..b99e68c 100644 (file)
--- 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 a6f30f0..1673d73 100644 (file)
--- 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 691098a..252aa8a 100644 (file)
--- 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 a2f38a5..99f1074 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>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 83b59ca..42ede31 100644 (file)
--- 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 cf19367..ed53758 100644 (file)
--- 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>