nbi doc update 13/43913/1
authorRene Robert <rene.robert@orange.com>
Fri, 20 Apr 2018 13:12:45 +0000 (13:12 +0000)
committerRene Robert <rene.robert@orange.com>
Fri, 20 Apr 2018 13:16:23 +0000 (13:16 +0000)
Issue-ID: EXTAPI-74

Change-Id: Iedf3bad3ac690a3e2e2ffbb77bff6bc5aee20323
Signed-off-by: Rene Robert <rene.robert@orange.com>
20 files changed:
docs/architecture/NBI_R1_Developer_Guide.rst
docs/offeredapis/index.rst
docs/offeredapis/pdf/nbicallflow.pdf [new file with mode: 0644]
docs/offeredapis/postman/ONAPBeijingServiceOrderDoc.postman_collection.json
docs/offeredapis/serviceCatalog/apiServiceCatalog.plantuml
docs/offeredapis/serviceCatalog/asciiDoc.adoc
docs/offeredapis/serviceCatalog/documentation.html
docs/offeredapis/serviceCatalog/markDown.md
docs/offeredapis/serviceInventory/apiServiceInventory.plantuml
docs/offeredapis/serviceInventory/asciiDoc.adoc
docs/offeredapis/serviceInventory/documentation.html
docs/offeredapis/serviceInventory/markDown.md
docs/offeredapis/serviceOrder/apiServiceOrder.plantuml
docs/offeredapis/serviceOrder/asciiDoc.adoc
docs/offeredapis/serviceOrder/documentation.html
docs/offeredapis/serviceOrder/markDown.md
docs/offeredapis/swaggers/serviceCatalog_1_0_0.yaml
docs/offeredapis/swaggers/serviceInventory_1_0_0.yaml
docs/offeredapis/swaggers/serviceOrder_1_0_0.json
docs/offeredapis/swaggers/serviceOrder_1_0_0.yaml

index 1d17665..e855fea 100644 (file)
@@ -53,12 +53,20 @@ Or through a terminal, ensure that your maven installation is works and run *mvn
 
 **Docker**
 
-in progress ...
+Requirements: `Docker engine <https://docs.docker.com/engine/>`_ and `docker-compose <https://docs.docker.com/compose/>`_.
 
+To start the application:
+    1. Generate the application .jar file: `$ mvn clean package`
+    2. Configure the **.env** file
+    3. Start the *MariaDB* and *MongoDB* services: `$ docker-compose up -d mongo mariadb`
+    4. Build and start the *NBI* service: `$ docker-compose up --build -d nbi`
+
+You can view the log output of the application with the following command:
+
+`$ docker-compose logs -f nbi`
 
 **Testing**
 When the app is running, you can access the API at http://yourhostname:8080/nbi/api/v1/ 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>`_
 See the *restclient* package at root level to find *.vscode/settings.json* configuration file and */json/* package with samples requests that can be run.
 You can also trigger these endpoints with any RESTful client or automation framework.
-
index 47cae40..bbc8c8d 100644 (file)
@@ -10,9 +10,7 @@ nbi - northbound interface - External API for ONAP
 Introduction
 ***************
 
-NBI stands for NorthBound Interface. It brings to ONAP a set of API that can be used by external systems as BSS for example.
-These API are based on **TMF API**.
-
+NBI stands for NorthBound Interface. It brings to ONAP a set of API that can be used by external systems as BSS for example. These API are based on **TMF API**.
 
 ***************
 Global NBI architecture for Beijing release
@@ -75,9 +73,9 @@ API Table
    :widths: 10,5,5,5,5,5,5
 
    " ", "json file", "html doc", "plantUML doc", "Swagger Editor", "Postman Collection", "pdf doc"
-   "serviceCatalog", ":download:`link <swaggers/serviceCatalog_1_0_0.json>`", ":download:`link <serviceCatalog/documentation.html>`", ":download:`link <serviceCatalog/apiServiceCatalog.plantuml>`", "`link <http://editor2.swagger.io/#/?import=http://onap.readthedocs.io/en/latest/_downloads/serviceCatalog_1_0_0.json>`_", "coming", "coming"
-   "serviceInventory", ":download:`link <swaggers/serviceInventory_1_0_0.json>`", ":download:`link <serviceInventory/documentation.html>`", ":download:`link <serviceInventory/apiServiceInventory.plantuml>`", "`link <http://editor2.swagger.io/#/?import=http://onap.readthedocs.io/en/latest/_downloads/serviceInventory_1_0_0.json>`_", "coming", "coming"
-   "serviceOrder", ":download:`link <swaggers/serviceInventory_1_0_0.json>`", ":download:`link <serviceOrder/documentation.html>`", ":download:`link <serviceOrder/apiServiceOrder.plantuml>`", "`link <http://editor2.swagger.io/#/?import=http://onap.readthedocs.io/en/latest/_downloads/serviceInventory_1_0_0.json>`_", ":download:`link <postman/ONAPBeijingServiceOrderDoc.postman_collection.json>`", "coming"
+   "serviceCatalog", ":download:`link <swaggers/serviceCatalog_1_0_0.json>`", ":download:`link <serviceCatalog/documentation.html>`", ":download:`link <serviceCatalog/apiServiceCatalog.plantuml>`", "`link <http://editor2.swagger.io/?url=http://onap.readthedocs.io/en/latest/_downloads/serviceCatalog_1_0_0.json>`_", "coming", "coming"
+   "serviceInventory", ":download:`link <swaggers/serviceInventory_1_0_0.json>`", ":download:`link <serviceInventory/documentation.html>`", ":download:`link <serviceInventory/apiServiceInventory.plantuml>`", "`link <http://editor2.swagger.io/?url=http://onap.readthedocs.io/en/latest/_downloads/serviceInventory_1_0_0.json>`_", "coming", "coming"
+   "serviceOrder", ":download:`link <swaggers/serviceOrder_1_0_0.json>`", ":download:`link <serviceOrder/documentation.html>`", ":download:`link <serviceOrder/apiServiceOrder.plantuml>`", "`link <http://editor2.swagger.io/?url=http://onap.readthedocs.io/en/latest/_downloads/serviceOrder_1_0_0.json>`_", ":download:`link <postman/ONAPBeijingServiceOrderDoc.postman_collection.json>`", "coming"
 
 
 ***************
@@ -193,5 +191,7 @@ With the current version of APIs used from SO and AAI we need to manage a â€˜cus
 Developer Guide
 ***************
 
-Technical information about NBI (dependancies, configuration, running & testing) could be found here: :doc:`DevDoc <../architecture/NBI_R1_Developer_Guide>`
+Technical information about NBI (dependancies, configuration, running & testing) could be found here: :doc:`NBI_R1_Developer_Guide <../architecture/NBI_R1_Developer_Guide>`
+
+API Flow illustration (with example messages) is described in this document: :download:`nbicallflow.pdf <pdf/nbicallflow.pdf>`
 
diff --git a/docs/offeredapis/pdf/nbicallflow.pdf b/docs/offeredapis/pdf/nbicallflow.pdf
new file mode 100644 (file)
index 0000000..0763c55
Binary files /dev/null and b/docs/offeredapis/pdf/nbicallflow.pdf differ
index 92a16eb..832a9e4 100644 (file)
@@ -1,8 +1,8 @@
 {
        "variables": [],
        "info": {
-               "name": "ONAP Beijing ServiceOrder Doc",
-               "_postman_id": "d88ad75d-6fae-13ea-d63c-cac1f445a1bf",
+               "name": "ONAP Beijing ServiceOrder Test",
+               "_postman_id": "3e51270b-0ef8-0bc3-5b92-8c9b8270cb71",
                "description": "",
                "schema": "https://schema.getpostman.com/json/collection/v2.0.0/collection.json"
        },
@@ -10,7 +10,7 @@
                {
                        "name": "ServiceOrder1",
                        "request": {
-                               "url": "{nbiHostName}:{nbiPort}/nbi/api/v1/serviceOrder",
+                               "url": "http://127.0.0.1:8090/serviceOrder",
                                "method": "POST",
                                "header": [
                                        {
                                "description": ""
                        },
                        "response": []
+               },
+               {
+                       "name": "ServiceOrder3",
+                       "request": {
+                               "url": "http://127.0.0.1:8090/serviceOrder",
+                               "method": "POST",
+                               "header": [
+                                       {
+                                               "key": "Accept",
+                                               "value": "application/json",
+                                               "description": ""
+                                       },
+                                       {
+                                               "key": "Content-Type",
+                                               "value": "application/json",
+                                               "description": ""
+                                       }
+                               ],
+                               "body": {
+                                       "mode": "raw",
+                                       "raw": "{\n  \"externalId\": \"LudONAP002\",\n  \"priority\": \"1\",\n  \"description\": \"Ludo  ONAP Order\",\n  \"category\": \"Consumer\",\n  \"requestedStartDate\": \"2018-02-28T13:33:37.299Z\",\n  \"requestedCompletionDate\": \"2018-02-28T13:33:37.299Z\",\n  \"orderItem\": [\n    {\n      \"id\": \"1\",\n      \"action\": \"add\",\n      \"service\": {\n        \"id\": \"vFW0002\",\n        \"serviceState\": \"active\",\n        \"serviceSpecification\": {\n          \"id\": \"3dd3923d-1681-4f5b-99bb-f695ab147004\"\n        }\n      }\n    }\n  ]\n}"
+                               },
+                               "description": ""
+                       },
+                       "response": []
                }
        ]
 }
\ No newline at end of file
index 96e8164..8483238 100644 (file)
@@ -1,7 +1,3 @@
-/' This work is licensed under a Creative Commons Attribution 4.0 International License.
-   http://creativecommons.org/licenses/by/4.0
-   Copyright 2018 Orange'/
-
 @startuml
 
 enum LifecycleStatusValues {
index c5185bd..327f239 100644 (file)
@@ -1,9 +1,3 @@
-////
-This work is licensed under a Creative Commons Attribution 4.0 International License.
-http://creativecommons.org/licenses/by/4.0
-Copyright 2018 Orange
-////
-
 = API ServiceCatalog
 
 
index c81c1d8..b1ea44a 100644 (file)
@@ -1,8 +1,3 @@
-<!--
-This work is licensed under a Creative Commons Attribution 4.0 International License.
-http://creativecommons.org/licenses/by/4.0
-Copyright 2018 Orange
--->
 <!DOCTYPE html>
 <html lang="en">
 <head>
index 22d062e..4d066c3 100644 (file)
@@ -1,7 +1,3 @@
-# This work is licensed under a Creative Commons Attribution 4.0 International License.
-# http://creativecommons.org/licenses/by/4.0
-# Copyright 2018 Orange
-
 # API ServiceCatalog
 
 
index a7ecc66..447f3fe 100644 (file)
@@ -1,7 +1,3 @@
-/' This work is licensed under a Creative Commons Attribution 4.0 International License.
-   http://creativecommons.org/licenses/by/4.0
-   Copyright 2018 Orange'/
-
 @startuml
 
 enum stateValues {
index 548a6a9..c6f51c4 100644 (file)
@@ -1,9 +1,3 @@
-////
-This work is licensed under a Creative Commons Attribution 4.0 International License.
-http://creativecommons.org/licenses/by/4.0
-Copyright 2018 Orange
-////
-
 = API ServiceInventory
 
 
index a55605a..905fa1b 100644 (file)
@@ -1,8 +1,3 @@
-<!--
-This work is licensed under a Creative Commons Attribution 4.0 International License.
-http://creativecommons.org/licenses/by/4.0
-Copyright 2018 Orange
--->
 <!DOCTYPE html>
 <html lang="en">
 <head>
index 223c13b..3b02751 100644 (file)
@@ -1,7 +1,3 @@
-# This work is licensed under a Creative Commons Attribution 4.0 International License.
-# http://creativecommons.org/licenses/by/4.0
-# Copyright 2018 Orange
-
 # API ServiceInventory
 
 
index eb78af2..3199855 100644 (file)
@@ -1,7 +1,3 @@
-/' This work is licensed under a Creative Commons Attribution 4.0 International License.
-   http://creativecommons.org/licenses/by/4.0
-   Copyright 2018 Orange'/
-
 @startuml
 
 enum ActionType {
index 29da92f..4a29548 100644 (file)
@@ -1,9 +1,3 @@
-////
-This work is licensed under a Creative Commons Attribution 4.0 International License.
-http://creativecommons.org/licenses/by/4.0
-Copyright 2018 Orange
-////
-
 = API ServiceOrder
 
 
index 09732b5..0983ed9 100644 (file)
@@ -1,8 +1,3 @@
-<!--
-This work is licensed under a Creative Commons Attribution 4.0 International License.
-http://creativecommons.org/licenses/by/4.0
-Copyright 2018 Orange
--->
 <!DOCTYPE html>
 <html lang="en">
 <head>
index b47779b..5ee40cf 100644 (file)
@@ -1,7 +1,3 @@
-# This work is licensed under a Creative Commons Attribution 4.0 International License.
-# http://creativecommons.org/licenses/by/4.0
-# Copyright 2018 Orange
-
 # API ServiceOrder
 
 
index ab6eaa9..95e62fa 100644 (file)
@@ -1,7 +1,3 @@
-# This work is licensed under a Creative Commons Attribution 4.0 International License.
-# http://creativecommons.org/licenses/by/4.0
-# Copyright 2018 Orange
-
 swagger: "2.0"
 info:
   description: "serviceCatalog API designed for ONAP Beijing Release.\nThis API is\
index c4a169e..99af226 100644 (file)
@@ -1,7 +1,3 @@
-# This work is licensed under a Creative Commons Attribution 4.0 International License.
-# http://creativecommons.org/licenses/by/4.0
-# Copyright 2018 Orange
-
 swagger: "2.0"
 info:
   description: "serviceInventory API designed for ONAP Beijing Release.\nThis API\
index 9df30a3..b2ffb2c 100644 (file)
@@ -56,7 +56,7 @@
           "201": {
             "description": "Success",
             "schema": {
-              "$ref": "#/definitions/CreateServiceOrder"
+              "$ref": "#/definitions/ServiceOrder"
             }
 
           },
index edb5089..fa2c28e 100644 (file)
@@ -1,7 +1,3 @@
-# This work is licensed under a Creative Commons Attribution 4.0 International License.
-# http://creativecommons.org/licenses/by/4.0
-# Copyright 2018 Orange
-
 swagger: "2.0"
 info:
   description: "serviceOrder API designed for ONAP Beijing Release.\nThis API is build\
@@ -63,7 +59,7 @@ paths:
         201:
           description: "Success"
           schema:
-            $ref: "#/definitions/CreateServiceOrder"
+            $ref: "#/definitions/ServiceOrder"
         400:
           description: "Bad Request\n\nList of supported error codes:\n- 20: Invalid\
             \ URL parameter value\n- 21: Missing body\n- 22: Invalid body\n- 23: Missing\