From 7af223f6899ed153028f0261e72baec6b4a247d3 Mon Sep 17 00:00:00 2001 From: "Lott, Christopher (cl778h)" Date: Mon, 20 May 2019 06:17:40 -0400 Subject: [PATCH] Update ANR API to version 0.0.5 Change-Id: Ieb8eb1e6a4bcc4ab0b8c87ba25f4d3f0c88ceb33 Signed-off-by: Lott, Christopher (cl778h) --- .gitignore | 5 +++- anr-xapp-client/pom.xml | 4 +-- ...r_swagger_0.0.4.yaml => anr_swagger_0.0.5.yaml} | 32 +++++++++++----------- docs/release-notes.rst | 4 +-- webapp-backend/pom.xml | 2 +- .../dashboard/config/AnrXappMockConfiguration.java | 10 +++---- .../dashboard/controller/AnrXappController.java | 6 ++-- 7 files changed, 32 insertions(+), 31 deletions(-) rename anr-xapp-client/src/main/resources/{anr_swagger_0.0.4.yaml => anr_swagger_0.0.5.yaml} (94%) diff --git a/.gitignore b/.gitignore index 50288669..c147df40 100644 --- a/.gitignore +++ b/.gitignore @@ -39,4 +39,7 @@ /build/ ### visual studio ### -.vs \ No newline at end of file +.vs + +# OSx cruft +**/.DS_Store diff --git a/anr-xapp-client/pom.xml b/anr-xapp-client/pom.xml index e450c1d5..247cff70 100644 --- a/anr-xapp-client/pom.xml +++ b/anr-xapp-client/pom.xml @@ -31,7 +31,7 @@ limitations under the License. org.o-ran-sc.ric.anrxapp.client anr-xapp-client RIC ANR xApp client - 0.0.4-SNAPSHOT + 0.0.5-SNAPSHOT UTF-8 UTF-8 @@ -104,7 +104,7 @@ limitations under the License. generate - ${project.basedir}/src/main/resources/anr_swagger_0.0.4.yaml + ${project.basedir}/src/main/resources/anr_swagger_0.0.5.yaml java ${project.groupId} diff --git a/anr-xapp-client/src/main/resources/anr_swagger_0.0.4.yaml b/anr-xapp-client/src/main/resources/anr_swagger_0.0.5.yaml similarity index 94% rename from anr-xapp-client/src/main/resources/anr_swagger_0.0.4.yaml rename to anr-xapp-client/src/main/resources/anr_swagger_0.0.5.yaml index 55bba184..f5e518ae 100644 --- a/anr-xapp-client/src/main/resources/anr_swagger_0.0.4.yaml +++ b/anr-xapp-client/src/main/resources/anr_swagger_0.0.5.yaml @@ -18,7 +18,7 @@ swagger : '2.0' info : description : REST API specification for RIC ANR closed xAPP - version : 0.0.4 + version : 0.0.5 title : RIC ANR license: name : Nokia Closed App @@ -31,7 +31,7 @@ paths : /health/alive : get : summary : Health check of ANR - Liveness probe - tags : + tags : - health operationId : getHealthAlive responses : @@ -40,7 +40,7 @@ paths : /health/ready : get : summary : Health check of ANR - Readiness probe - tags : + tags : - health operationId : getHealthReady responses : @@ -53,7 +53,7 @@ paths : - $ref : '#/parameters/limit' get : summary : Returns neighbor cell relation table for all gnodeBs or based on query string - tags : + tags : - ncrt operationId : getNcrtInfo produces : @@ -68,11 +68,9 @@ paths : /ncrt/cell/{cellIdentifier} : parameters : - $ref : '#/parameters/cellIdentifier' - - $ref : '#/parameters/neighborCellNrpci' - - $ref : '#/parameters/neighborCellNrcgi' get : summary : Returns neighbor cell relation table for a Source Cell (NR CGI) and optionally a neighbor cell based on query string - tags : + tags : - ncrt operationId : getCellNcrtInfo produces : @@ -80,6 +78,8 @@ paths : parameters : - $ref : '#/parameters/startIndex' - $ref : '#/parameters/limit' + - $ref : '#/parameters/neighborCellNrpci' + - $ref : '#/parameters/neighborCellNrcgi' responses : '200' : description : successful operation @@ -89,7 +89,7 @@ paths : description : Non-existant identifier {cellIdentifier | neighborCellNrpci | neighborCellNrcgi} in request put : summary : Modify neighbor cell relation based on Source Cell NR CGI and Target Cell NR PCI / NR CGI - tags : + tags : - ncrt operationId : modifyNcrt consumes : @@ -114,7 +114,7 @@ paths : } delete : summary : Delete neighbor cell relation based on Source Cell NR CGI and Target Cell NR PCI / NR CGI - tags : + tags : - ncrt operationId : deleteNcrt parameters : @@ -123,7 +123,7 @@ paths : description : Parameters to delete neighbor cell relation required : true schema : - $ref : '#/definitions/neighborCellRelationDelTable' + $ref : '#/definitions/neighborCellRelationDelTable' responses : '204' : description : Successfully deleted neighbor cell relation @@ -167,8 +167,8 @@ parameters : definitions : neighborCellRelationTable : type : object - properties : - ncrtRelations : + properties : + ncrtRelations : type : array items : $ref : '#/definitions/neighborCellRelation' @@ -182,11 +182,11 @@ definitions : $ref : '#/definitions/neighborCellRelationMod' neighborCellRelationDelTable : type : array - items : + items : $ref : '#/definitions/neighborCellRelationDel' neighborCellRelation : type : object - required : + required : - cellIdentifierNrcgi - neighborCellNrpci - neighborCellNrcgi @@ -221,10 +221,10 @@ definitions : neighborCellRelationMod : type : object required : - - neighbourCellIdentifierType + - neighborCellIdentifierType - action properties : - neighbourCellIdentifierType : + neighborCellIdentifierType : type : string description : Neighbor Cell Identifier Type enum : diff --git a/docs/release-notes.rst b/docs/release-notes.rst index 7f752076..fa2b4601 100644 --- a/docs/release-notes.rst +++ b/docs/release-notes.rst @@ -20,11 +20,11 @@ RIC Dashboard Release Notes =========================== -Version 1.0.3, 15 May 2019 +Version 1.0.3, 20 May 2019 -------------------------- * Add AC xapp controller * Add RAN type radio selector to connection setup -* Update ANR xApp client to spec version 0.0.4 +* Update ANR xApp client to spec version 0.0.5 * Add get-version methods to all controllers * Add simple page footer with copyright and version diff --git a/webapp-backend/pom.xml b/webapp-backend/pom.xml index f14db0cf..ab61db54 100644 --- a/webapp-backend/pom.xml +++ b/webapp-backend/pom.xml @@ -42,7 +42,7 @@ limitations under the License. org.o-ran-sc.ric.anrxapp.client anr-xapp-client - 0.0.4-SNAPSHOT + 0.0.5-SNAPSHOT org.o-ran-sc.ric.e2mgr.client diff --git a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/AnrXappMockConfiguration.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/AnrXappMockConfiguration.java index 275f047c..1668eb1b 100644 --- a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/AnrXappMockConfiguration.java +++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/AnrXappMockConfiguration.java @@ -88,18 +88,16 @@ public class AnrXappMockConfiguration { .addNcrtRelationsItem(e); when(mockApi.getNcrtInfo(any(String.class), any(String.class), any(Integer.class))).thenReturn(ncrt); - when(mockApi.getCellNcrtInfo(any(String.class), any(String.class), any(String.class), any(String.class), - any(Integer.class))).thenReturn(ncrt); + when(mockApi.getCellNcrtInfo(any(String.class), any(String.class), any(Integer.class), any(String.class), + any(String.class))).thenReturn(ncrt); doAnswer(i -> { return null; - }).when(mockApi).deleteNcrt(any(String.class), any(NeighborCellRelationDelTable.class), any(String.class), - any(String.class)); + }).when(mockApi).deleteNcrt(any(String.class), any(NeighborCellRelationDelTable.class)); doAnswer(i -> { return null; - }).when(mockApi).modifyNcrt(any(String.class), any(NeighborCellRelationModTable.class), any(String.class), - any(String.class)); + }).when(mockApi).modifyNcrt(any(String.class), any(NeighborCellRelationModTable.class)); return mockApi; } diff --git a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/AnrXappController.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/AnrXappController.java index 5692c5e4..6c0ca4bd 100644 --- a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/AnrXappController.java +++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/AnrXappController.java @@ -118,7 +118,7 @@ public class AnrXappController { @RequestParam(name = NRCGI, required = false) String nrcgi) { logger.debug("queryNcrtAllCells: cellIdentifier {}, startIndex {} limit {} nrpci {} nrcgi {}", cellIdentifier, startIndex, limit, nrpci, nrcgi); - return ncrtApi.getCellNcrtInfo(cellIdentifier, nrpci, nrcgi, startIndex, limit); + return ncrtApi.getCellNcrtInfo(cellIdentifier, startIndex, limit, nrpci, nrcgi); } @ApiOperation(value = "Modify neighbor cell relation based on Source Cell NR CGI and Target Cell NR PCI / NR CGI") @@ -127,7 +127,7 @@ public class AnrXappController { @RequestBody NeighborCellRelationModTable ncrtModTable, // HttpServletResponse response) { logger.debug("modifyNcrt: cellIdentifier {} modTable {}", cellIdentifier, ncrtModTable); - ncrtApi.modifyNcrt(cellIdentifier, ncrtModTable, null, null); + ncrtApi.modifyNcrt(cellIdentifier, ncrtModTable); response.setStatus(healthApi.getApiClient().getStatusCode().value()); } @@ -137,7 +137,7 @@ public class AnrXappController { @RequestBody NeighborCellRelationDelTable ncrtDelTable, // HttpServletResponse response) { logger.debug("modifyNcrt: cellIdentifier {} delTable {}", cellIdentifier, ncrtDelTable); - ncrtApi.deleteNcrt(cellIdentifier, ncrtDelTable, null, null); + ncrtApi.deleteNcrt(cellIdentifier, ncrtDelTable); response.setStatus(healthApi.getApiClient().getStatusCode().value()); } } -- 2.16.6