Merge "Add link check exceptions"

4 files changed, 58 insertions, 22 deletions

diff --git a/docs/conf.py b/docs/conf.py
index 7126e3488..815d0d0a3 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -378,28 +378,51 @@ epub_exclude_files = ['search.html']
 
 # Patterns to ignore in linkcheck builder
 linkcheck_ignore = [
-	r'http://localhost',
-	r'http://yourhostname',
-	r'http://{PDP_URL}:\d+/',
-	r'http://.*simpledemo.onap.org:\d+/',
+	r'http://$',
+	r'http:/$',
+	r'http://10\.',
+	r'http://127\.',
+	r'http://172\.[123]',
+	r'http://app_host:port/',
+	r'http://app-host:port/',
+	r'http://ESR_SERVICE_IP',
+	r'http://ESR_SERVER_IP',
+	r'http://hostIP:\d+/',
 	r'http://load-balanced-address:\d+/',
-	r'http://127.0.0.1',
-	r'http://ESR_SERVER_IP:\d+/',
-	r'http://MSB_SERVER_IP:\d+/',
-	r'http://msb_docker_host_ip:\d+/',
-	r'http://msb.onap.org/',
+	r'http://localhost',
 	r'http://\$msb_address/',
-	r'http://hostIP:\d+/',
-	r'https://\$CBAM_IP:\d+/',
-	r'http://app-host:port/',
+	r'http://\$MSB_SERVER_IP:\d+/',
+	r'http://msb_docker_host_ip:\d+/',
+	r'http://MSB_IP:MSB_PORT/',
+	r'http://msb.onap.org',
+	r'http://MSB_SERVER_IP:\d+/',
+	r'http://org.openecomp.',
+	r'http://{PDP_URL}:\d+/',
 	r'http://servername.domain.com',
-	r'https://we-are-message-router.us:\d+/',
-	r'https://we-are-data-router.us:\d+/',
-	r'http://prov.datarouternew.com:8443/',
-	r'http://www.[host]:[port]/',
-	r'http:/$',
-	r'https:/$',
-	r'http://$',
+	r'http://.*simpledemo.openecomp.org',
+	r'http://.*simpledemo.onap.org',
+	r'http://.*test.att.com:\d+/',
+	r'http://we-are-data-router.us',
+	r'http://we-are-message-router.us:\d+/'
+	r'http://www.\[host\]:\[port\]/',
+	r'http://yourhostname',
 	r'https://$',
-	r'http://app-host:port/'
+	r'https:/$',
+	r'https://10\.',
+	r'https://127\.',
+	r'https://172\.[123]',
+	r'https://aaf.onap.org',
+	r'https://\$CBAM_IP',
+	r'https://ESR_SERVICE_IP',
+	r'https://ESR_SERVER_IP',
+	r'https://msb.onap.org',
+	r'https://my-subscriber-app.dcae',
+	r'https://\$CBAM_IP:\d+/',
+	r'https://load-balanced-address:\d+/',
+	r'https://prov.datarouternew.com:8443',
+	r'https://.*simpledemo.openecomp.org',
+	r'https://.*simpledemo.onap.org',
+	r'https://.*test.att.com:\d+/',
+	r'https://we-are-data-router.us',
+	r'https://we-are-message-router.us:\d+/'
 	]
diff --git a/docs/guides/onap-developer/apiref/index.rst b/docs/guides/onap-developer/apiref/index.rst
index ac2be8e06..8ae5aab45 100644
--- a/docs/guides/onap-developer/apiref/index.rst
+++ b/docs/guides/onap-developer/apiref/index.rst
@@ -46,7 +46,8 @@ Common Services
    :maxdepth: 1
    :titlesonly:
 
-   AAI - Active and Available Inventory <../../../submodules/aai/aai-common.git/docs/AAI REST API Documentation/AAIRESTAPI_AMSTERDAM.rst>
+   AAI - Active and Available Inventory Common <../../../submodules/aai/aai-common.git/docs/AAI REST API Documentation/AAIRESTAPI_AMSTERDAM.rst>
+   AAI - Active and Available Inventory ESR <../../../submodules/submodules/aai/esr-server.git/docs/offeredapis.rst>
    DMaaP - Data Management as a Platform Message Router <../../../submodules/dmaap/messagerouter/messageservice.git/docs/offeredapis/offeredapis.rst>
    Modeling Parsers <../../../submodules/modeling/toscaparsers.git/docs/offeredapis.rst>
    MSB - Micro Services Bus <../../../submodules/msb/apigateway.git/docs/platform/offeredapis.rst>
diff --git a/docs/guides/onap-developer/developing/index.rst b/docs/guides/onap-developer/developing/index.rst
index 740113715..331248c2f 100644
--- a/docs/guides/onap-developer/developing/index.rst
+++ b/docs/guides/onap-developer/developing/index.rst
@@ -262,6 +262,15 @@ Software Defined Network Controller
    ../../../submodules/sdnc/parent.git/docs/index
    ../../../submodules/sdnc/plugins.git/docs/index
 
+User Interface Applications
+---------------------------
+
+.. toctree::
+   :maxdepth: 2
+   :titlesonly:
+
+   ../../../submodules/ui/dmaapbc.git/docs/index
+
 Virtual Function Controller
 ---------------------------
 
diff --git a/docs/release/releaserepos.rst b/docs/release/releaserepos.rst
index 5eb460afb..71a163073 100644
--- a/docs/release/releaserepos.rst
+++ b/docs/release/releaserepos.rst
@@ -35,6 +35,7 @@ Common Controller Software Development Kit
    :titlesonly:
 
    ccsdk/distribution<../submodules/ccsdk/distribution.git/docs/release-notes.rst>
+   ccsdk/platform/plugins<../submodules/ccsdk/platform/plugins.git/docs/release-notes.rst>
 
 Closed Loop Automation Platform
 -------------------------------
@@ -115,7 +116,7 @@ Modeling
    :maxdepth: 1
    :titlesonly:
 
-   modeling/modelspec<../submodules/modeling/toscaparsers.git/docs/javatoscachecker/release-notes/release-notes.rst>
+   modeling/modelspec<../submodules/modeling/toscaparsers.git/docs/javatoscachecker/release-notes.rst>
    modeling/toscaparsers<../submodules/modeling/toscaparsers.git/docs/nfvparser/release-notes/release-notes.rst>
 
 Micro Services Bus
@@ -237,6 +238,8 @@ VNF Requirements
    :titlesonly:
 
    vnfrqts/requirements<../submodules/vnfrqts/requirements.git/docs/release-notes.rst>
+   vnfrqts/testcases<../submodules/vnfrqts/testcases.git/docs/release-notes.rst>
+   vnfrqts/usecases<../submodules/vnfrqts/usecases.git/docs/release-notes.rst>
 
 VNF Software Development Kit
 ----------------------------