9 files changed, 315 insertions, 19 deletions
diff --git a/docs/guides/onap-developer/architecture/media/ONAP-bbs.png b/docs/guides/onap-developer/architecture/media/ONAP-bbs.png
new file mode 100644
index 000000000..4996a066f
--- /dev/null
+++ b/docs/guides/onap-developer/architecture/media/ONAP-bbs.png
diff --git a/docs/guides/onap-developer/architecture/onap-architecture.rst b/docs/guides/onap-developer/architecture/onap-architecture.rst
index 01369a9cd..35156b227 100644
--- a/docs/guides/onap-developer/architecture/onap-architecture.rst
+++ b/docs/guides/onap-developer/architecture/onap-architecture.rst
@@ -634,24 +634,33 @@ Policy.
 
 Read the vFW/vDNS with ONAP blueprint to learn more.
 
-Conclusion
-==========
+BBS (Broadband Service) Blueprint
+---------------------------------
 
-The ONAP platform provides a comprehensive platform for real-time,
-policy-driven orchestration and automation of physical and virtual network
-functions that will enable software, network, IT and cloud providers and
-developers to rapidly automate new services and support complete lifecycle
-management.
+The Broadband Service blueprint uses ONAP for the design, provisioning, life-cycle management and
+assurance of fixed broadband access services. In a first step, BBS blueprint works with multi-Gigabit
+Internet Connectivity services based on PON (Passive Optical Network access technology, and relies
+on the orchestration and automation capabilities provided by the ONAP platform to support new
+scenarios, such as the Nomadic ONT (see Figure 8).
 
-By unifying member resources, ONAP will accelerate the development of a vibrant
-ecosystem around a globally shared architecture and implementation for network
-automation—with an open standards focus—faster than any one product could on
-its own.
+|image8|
 
-Resources
-=========
-Watch videos about the major platform components on YouTube and Youku
-Read about how ONAP can be deployed using containers
+**Figure 8. ONAP BBS Nomadic ONT Architecture**
+
+This blueprint shows the extensibility of the ONAP platform in supporting the orchestration of
+services across different location (e.g., Central Office, Core) and technology domains (e.g.,
+Access, Edge).
+
+In a joint collaboration with BBF (Broadband Forum) members, BBS implements and tests some of the
+specifications defined in the architectural framework of CloudCO (Cloud Central Office), Technical
+Report TR-384, among others. CloudCO aims at re-architecting the broadband network using SDN and NFV
+technologies and a cloud-like infrastructure deployed at Central Offices.
+
+The definition of External API capabilities supporting this use case also relies on TM Forum
+OpenAPIs and MEF LSO.
+
+BBS uses the following ONAP key components: ExternalAPI, SDC, SO, SDN-C, APEX policy engine and
+DCAE.
 
 .. |image1| image:: media/ONAP-toplevel.png
    :width: 6.5in
@@ -674,3 +683,5 @@ Read about how ONAP can be deployed using containers
 .. |image7| image:: media/ONAP-ccvpn.png
    :width: 6.5in
    :height: 3.02431in
+.. |image8| image:: media/ONAP-bbs.png
+   :width: 6.5in
diff --git a/docs/guides/onap-developer/how-to-use-docs/api-swagger-guide.rst b/docs/guides/onap-developer/how-to-use-docs/api-swagger-guide.rst
new file mode 100644
index 000000000..9d3a7f6fc
--- /dev/null
+++ b/docs/guides/onap-developer/how-to-use-docs/api-swagger-guide.rst
@@ -0,0 +1,84 @@
+.. This work is licensed under a Creative Commons Attribution 4.0
+.. International License. http://creativecommons.org/licenses/by/4.0
+.. Copyright 2019 Orange.  All rights reserved.
+
+.. _api-swagger-guide:
+
+API documentation
+=================
+
+Swagger
+-------
+
+The API should be described using OpenAPI specifications and available as a
+`JSON file <https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md>`_
+
+A Swagger editor is available here `<http://editor.swagger.io/>`_ to generate
+such JSON files.
+
+As a result, you should get one JSON file per API. For example the project
+**my** has 2 API: **myAPI1** and **myAPI2**.
+
+- myAPI1.json
+- myAPI2.json
+
+Global API table
+----------------
+It is recommended to list the following API available with an access to the
+Swagger JSON files to help the developers/users to play with JSON.
+
+We propose the following table:
+
+.. csv-table::
+   :header: "API name", "Swagger JSON"
+   :widths: 10,5
+
+   "myAPI1", ":download:`link <myAPI1.json>`"
+   "myAPI12", ":download:`link <myAPI2.json>`"
+
+.. note::
+   During documentation merge/publish at RTD, any file referenced in an RST file with
+   ':download:' and relative path to a contributing project repository is copied, uniquely
+   named, and published with the generated HTML pages.
+
+The code is available here:
+
+.. code:: rst
+
+   .. csv-table::
+      :header: "API name", "Swagger JSON"
+      :widths: 10,5
+
+      "myAPI1", ":download:`link <myAPI1.json>`"
+      "myAPI2", ":download:`link <myAPI2.json>`"
+
+.. note::
+   The syntax of <myAPI1.json> is to be taken literally. Keep '<' and '>'.
+
+.. note::
+   Note the “v” in  swaggerv2doc!
+   If your JSON file has multiple endpoints, this directive does not preserve the order.
+
+API Swagger
+-----------
+For each API, the ``swaggerv2doc`` directive must be used as follows:
+
+.. code:: rst
+
+   myAPI1
+   ......
+   .. swaggerv2doc:: myAPI1.json
+
+   myAPI2
+   ......
+   .. swaggerv2doc:: myAPI2.json
+
+It will produce the following output:
+
+myAPI1
+......
+.. swaggerv2doc:: myAPI1.json
+
+myAPI2
+......
+.. swaggerv2doc:: myAPI2.json
diff --git a/docs/guides/onap-developer/how-to-use-docs/include-documentation.rst b/docs/guides/onap-developer/how-to-use-docs/include-documentation.rst
index 35c833cf9..896c23170 100644
--- a/docs/guides/onap-developer/how-to-use-docs/include-documentation.rst
+++ b/docs/guides/onap-developer/how-to-use-docs/include-documentation.rst
@@ -492,11 +492,13 @@ Build documentation using tox local environment & then open using any browser.
    firefox docs/_build/html/index.html
 
 .. note:: Make sure to run `tox -elocal` and not just `tox`.
+   This updates all submodule repositories that are integrated
+   by the doc project.
 
 There are additional tox environment options for checking External
 URLs and Spelling.  Use the tox environment options below and then
-look at the output with the Linux `more` or similar command for
-scanning for output that applies to the files you are validating.
+look at the output with the Linux `more` or similar command
+scan for output that applies to the files you are validating.
 
 .. code-block:: bash
 
diff --git a/docs/guides/onap-developer/how-to-use-docs/index.rst b/docs/guides/onap-developer/how-to-use-docs/index.rst
index a2cdd6e6b..90c657501 100644
--- a/docs/guides/onap-developer/how-to-use-docs/index.rst
+++ b/docs/guides/onap-developer/how-to-use-docs/index.rst
@@ -10,6 +10,7 @@ Creating Documentation
    documentation-guide
    style-guide
    include-documentation
+   api-swagger-guide
    converting-formats
    addendum
 
diff --git a/docs/guides/onap-developer/how-to-use-docs/myAPI1.json b/docs/guides/onap-developer/how-to-use-docs/myAPI1.json
new file mode 100644
index 000000000..b611ad81c
--- /dev/null
+++ b/docs/guides/onap-developer/how-to-use-docs/myAPI1.json
@@ -0,0 +1,37 @@
+{
+  "swagger" : "2.0",
+  "info" : {
+    "description" : "my API 1",
+    "version" : "1.0.0",
+    "title" : "API example",
+    "contact" : {
+      "email" : "onap@orange.com"
+    },
+    "license" : {
+      "name" : "Apache 2.0",
+      "url" : "http://www.apache.org/licenses/LICENSE-2.0.html"
+    }
+  },
+  "host" : "serverRoot",
+  "basePath" : "/healthCheck",
+  "schemes" : [ "https" ],
+  "produces": [
+    "application/json;charset=utf-8"
+  ],
+  "paths" : {
+    "/healthCheck" : {
+      "get" : {
+        "summary" : "Displays healhcheck for my favorite component",
+        "description" : "Displays healthcheck for my favorite component",
+        "responses": {
+          "200": {
+            "description": "Service OK"
+          },
+          "503" : {
+            "description" : "Service Unavailable"
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/docs/guides/onap-developer/how-to-use-docs/myAPI2.json b/docs/guides/onap-developer/how-to-use-docs/myAPI2.json
new file mode 100644
index 000000000..473d351b2
--- /dev/null
+++ b/docs/guides/onap-developer/how-to-use-docs/myAPI2.json
@@ -0,0 +1,37 @@
+{
+  "swagger" : "2.0",
+  "info" : {
+    "description" : "my API 2",
+    "version" : "1.0.0",
+    "title" : "API example",
+    "contact" : {
+      "email" : "onap@orange.com"
+    },
+    "license" : {
+      "name" : "Apache 2.0",
+      "url" : "http://www.apache.org/licenses/LICENSE-2.0.html"
+    }
+  },
+  "host" : "serverRoot",
+  "basePath" : "/status",
+  "schemes" : [ "https" ],
+  "produces": [
+    "application/json;charset=utf-8"
+  ],
+  "paths" : {
+    "/status" : {
+      "get" : {
+        "summary" : "Displays status for my favorite component",
+        "description" : "Displays status for my favorite component",
+        "responses": {
+          "200": {
+            "description": "Service OK"
+          },
+          "503" : {
+            "description" : "Service Unavailable"
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/docs/guides/onap-developer/settingup/index.rst b/docs/guides/onap-developer/settingup/index.rst
index d7d378773..2b9f8b133 100644
--- a/docs/guides/onap-developer/settingup/index.rst
+++ b/docs/guides/onap-developer/settingup/index.rst
@@ -5,6 +5,7 @@
 .. Modifications Copyright 2018 Orange
 .. Modifications Copyright 2018 Amdocs
 .. Modifications Copyright 2018 Huawei
+.. Modifications Copyright 2019 Orange
 
 Setting Up ONAP
 ===============
@@ -55,6 +56,14 @@ ONAP installation is described here:
 
    ../../../../submodules/oom.git/docs/oom_quickstart_guide.rst
 
+Alternative way of offline ONAP installation is described here:
+
+.. toctree::
+   :maxdepth: 1
+   :titlesonly:
+
+   ../../../../submodules/oom/offline-installer.git/docs/index.rst
+
 NodePorts
 ---------
 
@@ -65,8 +74,23 @@ microservice.
 It should be noted that the use of NodePorts is temporary.
 An alternative solution is currently being scoped for the Dublin Release.
 
-* The list of node ports used by ONAP is documented
-  in `ONAP Node Port List <https://wiki.onap.org/display/DW/OOM+NodePort+List>`_.
+More information from official Kubernetes documentation about
+`NodePort <https://kubernetes.io/docs/concepts/services-networking/service/#nodeport>`_.
+
+The following table lists all the NodePorts used by ONAP.
+
+.. csv-table:: NodePorts table
+   :file: nodeports.csv
+   :widths: 20,20,20,20,20
+   :header-rows: 1
+
+This table retrieves information from the ONAP deployment using the following
+Kubernetes command:
+
+.. code-block:: bash
+
+  kubectl get svc -n onap -o go-template='{{range .items}}{{range.spec.ports}}{{if .nodePort}}{{.nodePort}}{{.}}{{"\n"}}{{end}}{{end}}{{end}}'
+
 
 .. note::
    Prior to deployment of ONAP, there is no need to download manually any Docker container.
diff --git a/docs/guides/onap-developer/settingup/nodeports.csv b/docs/guides/onap-developer/settingup/nodeports.csv
new file mode 100644
index 000000000..2e294d2be
--- /dev/null
+++ b/docs/guides/onap-developer/settingup/nodeports.csv
@@ -0,0 +1,100 @@
+NodePort,Component,Service name,targetPort,Port
+30200,VID,vid,8443,8443
+30201,SDNC,sdnc-portal,8843,8843
+30202,SDNC,sdnc-8282,8181,8282
+30203,SDNC,dgbuilder3,3100,3000
+30204,SDC,sdc-be,8443,8443
+30205,SDC,sdc-be2,8080,8080
+30206,SDC,sdc-fe,8181,8181
+30207,SDC,sdc-fe2,9443,9443
+30208,SDNC,sdnc-8202,8181,8202
+30209,ROBOT,httpd,88,88
+30210,AAI,aai-modelloader,8080,8080
+30211,APPC,appc-9090,9191,9090
+30212,PORTAL,portal-sdk,8080,8080
+30213,PORTAL,portal-app2,8005,8006
+30214,PORTAL,portal-app3,8009,8010
+30215,PORTAL,portal-app,8080,8989
+30216,POLICY,brmsgw,9989,9989
+30217,POLICY,drools-6969,6969,6969
+30218,POLICY,pap-9091,9091,9091
+30219,POLICY,pap-8443,8443,8443
+30220,AAI,aai-sparky-be,9517,9517
+30221,POLICY,drools-9696,9696,9696
+30222,DCAE,xdcae-hv-ves-collector,6061,6061
+30223,DCAE,xdcae-datafile-collector,8100,8100
+30224,SO,so-monitor-port,9091,9091
+30225,PORTAL,portal-app4,8443,8443
+30226,DMAAP,message-router-3905,3905,3905
+30227,DMAAP,message-router-3904,3904,3904
+30228,APPC,dgbuilder,3100,3000
+30229,AAI,aai-modelloader-ssl,8443,8443
+30230,APPC,appc-8282,8181,8282
+30231,APPC,appc-1830,1830,1830
+30232,AAI,aai,8080,8080
+30233,AAI,aai-ssl,8443,8443
+30234,POMBA,pomba-kibana,5601,5601
+30235,DCAE,xdcae-ves-collector,8080,8080
+30236,POLICY,nexus,8081,8081
+30237,POLICY,policy-apex-pdp,12345,12345
+30238,VID,vid-http,8080,8080
+30239,AAI,spike,9518,9518
+30241,DMAAP,dmaap-bc,8080,8080
+30242,DMAAP,dmaap-bc2,8443,8443
+30243,AAF,aaf-sms,10443,10443
+30244,AAF,aaf-sms-db,8200,8200
+30246,SDNC,sdnc-8280,8080,8280
+30247,AAF,aaf-service,8100,8100
+30248,OOF,oof-osdf,8699,8698
+30249,POMBA,pomba-data-router,9502,9502
+30251,AAF,aaf-gui,8200,8200
+30252,SO,mariadb,3306,3306
+30253,LOG,log-kibana,5601,5601
+30254,LOG,log-es,9200,9200
+30255,LOG,log-ls,5044,5044
+30256,SDC,sdc-wfd-fe,8080,8080
+30257,SDC,sdc-wfd-be,8080,8080
+30258,CLAMP,clamp2,8443,8443
+30259,DMAAP,dmaap-dr-prov,8080,8080
+30260,CLI,cli8080,80,80
+30261,MULTICLOUD,multicloud-azure,9008,9008
+30262,DCAE,xdcae-datafile-collector,8433,8443
+30263,DCAE,dcae-fe,8183,8183
+30264,DCAE,dcae-fe2,9444,9444
+30265,DCAE,dcae-dt,8186,8186
+30266,DCAE,dcae-dt2,9446,9446
+30267,SDNC,sdnc-8443,2550,8443
+30268,AAI,aai-crud-service,9520,9520
+30269,DMAAP,dmaap-dr-prov2,8443,8443
+30270,CONSUL,consul-ui,8500,8500
+30271,CLI,cli9090,8080,9090
+30274,EXTAPI,api-8080,8080,8080
+30275,OOF,oof-has-api,8091,8091
+30277,SO,so-apih-port,8080,8080
+30278,AAI,aai-champ,9522,9522
+30279,AAI,babel,9516,9516
+30280,MSB,http-msb-iag,80,80
+30281,MSB,http-msb-discovery,10081,10081
+30282,MSB,http-msb-eag,80,80
+30283,MSB,https-msb-iag,443,443
+30284,MSB,https-msb-eag,443,443
+30285,MSB,http-msb-consul,8500,8500
+30286,DCAE,client,6379,6379
+30287,DCAE,gossip,16379,16379
+30288,SNRIRO,httpd,80,80
+30289,APPC,appc-cdt,80,80
+30290,CLAMP,cdash-kibana,5601,5601
+30291,MULTICLOUD,multicloud-framework,9001,9001
+30292,MULTICLOUD,multicloud-vio,9004,9004
+30293,MULTICLOUD,multicloud-ocata,9006,9006
+30294,MULTICLOUD,multicloud-titaniumcloud,9005,9005
+30295,CLAMP,clamp,8080,8080
+30296,MULTICLOUD,multicloud-pike,9007,9007
+30297,VNFSDK,refrepo,8702,8702
+30398,UUI,uui,8080,8080
+30399,UUI,uui-server,8082,8082
+30420,CONTRIB,netbox-nginx,8080,8080
+30476,DCAE,tomcat,8080,8080
+32010,DCAE,xdcae-tca-analytics,11011,11011
+
+