4 files changed, 54 insertions, 6 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 21ef5fd72..35156b227 100644
--- a/docs/guides/onap-developer/architecture/onap-architecture.rst
+++ b/docs/guides/onap-developer/architecture/onap-architecture.rst
@@ -634,6 +634,33 @@ Policy.
 
 Read the vFW/vDNS with ONAP blueprint to learn more.
 
+BBS (Broadband Service) Blueprint
+---------------------------------
+
+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).
+
+|image8|
+
+**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
@@ -656,3 +683,5 @@ Read the vFW/vDNS with ONAP blueprint to learn more.
 .. |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
index d5e2099a5..9d3a7f6fc 100644
--- 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
@@ -16,7 +16,8 @@ The API should be described using OpenAPI specifications and available as a
 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:
+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
@@ -35,17 +36,28 @@ We propose the following table:
    "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
+   .. csv-table::
+      :header: "API name", "Swagger JSON"
+      :widths: 10,5
 
-     "myAPI1", ":download:`link <myAPI1.json>`"
-     "myAPI2", ":download:`link <myAPI2.json>`"
+      "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
 -----------
diff --git a/docs/guides/onap-developer/settingup/nodeports.csv b/docs/guides/onap-developer/settingup/nodeports.csv
index 3d5253aaa..2e294d2be 100644
--- a/docs/guides/onap-developer/settingup/nodeports.csv
+++ b/docs/guides/onap-developer/settingup/nodeports.csv
@@ -21,6 +21,8 @@ NodePort,Component,Service name,targetPort,Port
 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
@@ -32,6 +34,7 @@ NodePort,Component,Service name,targetPort,Port
 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
@@ -55,6 +58,7 @@ NodePort,Component,Service name,targetPort,Port
 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
@@ -91,3 +95,6 @@ NodePort,Component,Service name,targetPort,Port
 30399,UUI,uui-server,8082,8082
 30420,CONTRIB,netbox-nginx,8080,8080
 30476,DCAE,tomcat,8080,8080
+32010,DCAE,xdcae-tca-analytics,11011,11011
+
+