summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorromaingimbert <romain.gimbert@orange.com>2019-04-02 13:50:17 +0200
committerromaingimbert <romain.gimbert@orange.com>2019-04-02 13:50:17 +0200
commit0cb3b571ae8cb5cfa4905357c22e223d1b4a8d24 (patch)
treec326ba6972ba59a071927335e0be07fe9d839cfb
parenta5e02123aea6f24850470a3f54865cfed6540740 (diff)
Update NBI version to 4
-change nbi version to 4.0.0 -change path to v4 Change-Id: Idc35e25fa13625b0916909d5030fcb458561a3fa Issue-ID: EXTAPI-220 Signed-off-by: romaingimbert <romain.gimbert@orange.com>
-rw-r--r--.env6
-rw-r--r--Dockerfile2
-rw-r--r--docs/architecture/NBI_Developer_Guide.rst2
-rw-r--r--docs/installation/installation.rst4
-rw-r--r--docs/offeredapis/offeredapis.rst12
-rwxr-xr-xdocs/releasenotes/releasenotes.rst2
-rw-r--r--pom.xml2
-rw-r--r--src/main/resources/application-test.properties2
-rw-r--r--src/main/resources/application.properties2
-rw-r--r--src/test/java/karate-config.js2
-rw-r--r--src/test/resources/karatetest/data/subscriber.json2
-rw-r--r--src/test/resources/karatetest/features/01--ServiceInventory.feature2
12 files changed, 20 insertions, 20 deletions
diff --git a/.env b/.env
index 71c1433..b5e681d 100644
--- a/.env
+++ b/.env
@@ -14,10 +14,10 @@
# limitations under the License.
#
-NBI_VERSION=v3
+NBI_VERSION=v4
# APPLICATION
-SERVER_CONTEXTPATH=/nbi/api/v3
+SERVER_CONTEXTPATH=/nbi/api/v4
SERVER_PORT=8080
# ONAP
@@ -27,7 +27,7 @@ ONAP_CLOUDOWNER=
NEXUS_DOCKER_REPO=nexus3.onap.org:10001
# NBI
-NBI_URL=http://localhost:8080/nbi/api/v3
+NBI_URL=http://localhost:8080/nbi/api/v4
NBI_CALLFORVNF=false
# SDC
diff --git a/Dockerfile b/Dockerfile
index 91a6a9d..0566534 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,7 +17,7 @@
FROM openjdk:8-jre-alpine
ARG SERVER_PORT
-ARG PKG_FILENAME=nbi-rest-services-3.0.1.jar
+ARG PKG_FILENAME=nbi-rest-services-4.0.0.jar
ADD target/$PKG_FILENAME app.jar
RUN addgroup -S appgroup
diff --git a/docs/architecture/NBI_Developer_Guide.rst b/docs/architecture/NBI_Developer_Guide.rst
index 6a38891..82a7f34 100644
--- a/docs/architecture/NBI_Developer_Guide.rst
+++ b/docs/architecture/NBI_Developer_Guide.rst
@@ -83,7 +83,7 @@ You can view the log output of the application with the following command:
**Testing**
When the application is running, you can access the API at
-:samp:`http://yourhostname:8080/nbi/api/v3` and fill the URL with the name
+:samp:`http://yourhostname:8080/nbi/api/v4` and fill the URL with the name
of the resources you asking for (/serviceSpecification, /service,
/serviceOrder or /status)
You can run a test by using `VisualStudio RestClient plugin <https://github.com/Huachao/vscode-restclient>`_
diff --git a/docs/installation/installation.rst b/docs/installation/installation.rst
index ebf8c7a..fd52e84 100644
--- a/docs/installation/installation.rst
+++ b/docs/installation/installation.rst
@@ -78,14 +78,14 @@ Test
**Healthcheck**
-http://localhost:8080/nbi/api/v3/status
+http://localhost:8080/nbi/api/v4/status
You should get::
{
"name": "nbi",
"status": "ok",
- "version": "v3"
+ "version": "v4"
}
**Play with RESTclient**
diff --git a/docs/offeredapis/offeredapis.rst b/docs/offeredapis/offeredapis.rst
index f575b01..ac9b486 100644
--- a/docs/offeredapis/offeredapis.rst
+++ b/docs/offeredapis/offeredapis.rst
@@ -30,7 +30,7 @@ API Version
***********
APIs are described with a state version with ā€œvā€ following the API Name,
-e.g.: ``nbi/api/v3/productOrder``.
+e.g.: ``nbi/api/v4/productOrder``.
The schema associated with a REST API must have its version number aligned
with that of the REST API.
@@ -121,7 +121,7 @@ Only *basic* service characteristics will be managed in this release. By
**GET serviceSpecification(list)**
-Example: ``GET /nbi/api/v3/serviceSpecification/
+Example: ``GET /nbi/api/v4/serviceSpecification/
?category=NetworkService&distributionStatus=DISTRIBUTED``
It is possible to retrieve a list of ``serviceSpecification`` (get by list).
@@ -134,14 +134,14 @@ If no ``serviceSpecification`` matches, an empty list is send back.
**GET service Specification (id)**
-Example: ``GET /nbi/api/v3/serviceSpecification/{uuid}``
+Example: ``GET /nbi/api/v4/serviceSpecification/{uuid}``
It is use to retrieve one ``serviceSpecification`` - all available information
are retieved (see Swagger for description)
**GET service Specification Schema (id)**
-Example: ``GET /nbi/api/v3/serviceSpecification/{uuid}/specificationInputSchema``
+Example: ``GET /nbi/api/v4/serviceSpecification/{uuid}/specificationInputSchema``
It is use to retrieve one input schema from the tosca file stored in **NBI** - all available
information are retieved (see Swagger for description)
@@ -159,7 +159,7 @@ and ``type``
**GET Service Inventory (list)**
-Example: ``GET /nbi/api/v3/service/?relatedParty.id=Pontus``
+Example: ``GET /nbi/api/v4/service/?relatedParty.id=Pontus``
GET (by list) allows to request with following criteria (all optional) :
@@ -184,7 +184,7 @@ if no service matches, an empty list is send back.
**GET Service Inventory (id)**
-Example: ``GET /nbi/api/v3/service/{id}`` When querying for a specific service
+Example: ``GET /nbi/api/v4/service/{id}`` When querying for a specific service
instance id, no additional filters are required.
The Service Inventory API will retrieve the service instance data from A&AI using
diff --git a/docs/releasenotes/releasenotes.rst b/docs/releasenotes/releasenotes.rst
index cdf3090..4943011 100755
--- a/docs/releasenotes/releasenotes.rst
+++ b/docs/releasenotes/releasenotes.rst
@@ -4,7 +4,7 @@
Release Notes
=============
-Version: 3.0.1
+Version: 4.0.0
--------------
:Release Date: 2018-11-30
diff --git a/pom.xml b/pom.xml
index 09cc6b3..72d2c75 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
<groupId>org.onap.externalapi-nbi</groupId>
<artifactId>nbi-rest-services</artifactId>
- <version>3.0.1</version>
+ <version>4.0.0</version>
<packaging>jar</packaging>
<name>externalapi-nbi</name>
diff --git a/src/main/resources/application-test.properties b/src/main/resources/application-test.properties
index ed34f0a..8511a3b 100644
--- a/src/main/resources/application-test.properties
+++ b/src/main/resources/application-test.properties
@@ -14,7 +14,7 @@
# limitations under the License.
#
-nbi.version = v3
+nbi.version = v4
# SERVER
server.servlet.context-path = /nbi/api/${nbi.version}
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index d488505..5b908b3 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -20,7 +20,7 @@
spring.profiles.active = default
# VERSION
-nbi.version = v3
+nbi.version = v4
# SERVER
server.servlet.context-path = /nbi/api/${nbi.version}
diff --git a/src/test/java/karate-config.js b/src/test/java/karate-config.js
index f67e555..4b81173 100644
--- a/src/test/java/karate-config.js
+++ b/src/test/java/karate-config.js
@@ -1,6 +1,6 @@
function() {
var config = {
- nbiBaseUrl: 'http://localhost:8080/nbi/api/v3'
+ nbiBaseUrl: 'http://localhost:8080/nbi/api/v4'
};
karate.configure('connectTimeout', 5000);
karate.configure('readTimeout', 5000);
diff --git a/src/test/resources/karatetest/data/subscriber.json b/src/test/resources/karatetest/data/subscriber.json
index 1853952..14dfdb8 100644
--- a/src/test/resources/karatetest/data/subscriber.json
+++ b/src/test/resources/karatetest/data/subscriber.json
@@ -13,7 +13,7 @@
"query": "eventType=ServiceOrderItemStateChangeNotification"
},
{
- "callback": "http://localhost:8080/nbi/api/v3/test/listener",
+ "callback": "http://localhost:8080/nbi/api/v4/test/listener",
"query": "eventType=ServiceOrderStateChangeNotification"
}
] \ No newline at end of file
diff --git a/src/test/resources/karatetest/features/01--ServiceInventory.feature b/src/test/resources/karatetest/features/01--ServiceInventory.feature
index 95f8696..eacbf2f 100644
--- a/src/test/resources/karatetest/features/01--ServiceInventory.feature
+++ b/src/test/resources/karatetest/features/01--ServiceInventory.feature
@@ -20,7 +20,7 @@ And match $.supportingResource == '#[2]'
Scenario: testServiceResourceGetInventoryWithStatus
-Given url 'http://localhost:8080/nbi/api/v3/service/405c8c00-44b9-4303-9f27-6797d22ca096'
+Given path 'service','405c8c00-44b9-4303-9f27-6797d22ca096'
When method get
Then status 200
And match $.state == 'Active'