Update for MDONS Extersion in Guilin

Issue-ID: INT-1690

Signed-off-by: Xin Miao <xin.miao@us.fujitsu.com>
Change-Id: I023d81ec54df57170c267ad3b373e12fc71865dc
Signed-off-by: mrichomme <morgan.richomme@orange.com>

3 files changed, 39 insertions, 4 deletions

diff --git a/docs/docs_BBS.rst b/docs/docs_BBS.rst
index d2bca11c6..38c43084a 100644
--- a/docs/docs_BBS.rst
+++ b/docs/docs_BBS.rst
@@ -166,7 +166,7 @@ Create the required topics in DMaaP
 DCAE: BBS Event Processor (BBS-ep)
 ==================================
 
-Description: :doc:`BBS-ep <https://docs.onap.org/en/frankfurt/submodules/dcaegen2.git/docs/sections/services/bbs-event-processor/>`
+Description: :doc:`BBS-ep <https://docs.onap.org/projects/onap-dcaegen2/en/frankfurt/sections/services/bbs-event-processor/index.html?highlight=BBS>`
 
 The following BBS event processor blueprint will be used:
 
@@ -191,7 +191,7 @@ IMPORTANT: Make sure that the configuration of BBS-ep in Consul contains the fol
 DCAE: RESTCONF Collector
 ========================
 
-Description: :doc:`RESTCONF Collector <https://docs.onap.org/en/frankfurt/submodules/dcaegen2.git/docs/sections/services/restconf/index.html>`
+Description: :doc:`RESTCONF Collector <https://docs.onap.org/projects/onap-dcaegen2/en/frankfurt/sections/services/restconf/index.html>`
 
 The following RESTCONF collector blueprint will be used:
 
@@ -209,7 +209,7 @@ RESTCONF Collector deployment procedure:
 DCAE: VES mapper
 ================
 
-Description: :doc:`VES Mapper <https://docs.onap.org/en/frankfurt/submodules/dcaegen2.git/docs/sections/services/mapper/>`
+Description: :doc:`VES Mapper <https://docs.onap.org/projects/onap-dcaegen2/en/frankfurt/sections/services/mapper/index.html>`
 
 The following VES mapper blueprint will be used:
 
diff --git a/docs/docs_CCVPN.rst b/docs/docs_CCVPN.rst
index 11fb83525..21a133766 100644
--- a/docs/docs_CCVPN.rst
+++ b/docs/docs_CCVPN.rst
@@ -6,6 +6,41 @@
 CCVPN (Cross Domain and Cross Layer VPN)
 ----------------------------------------
 
+Update for Guilin Release
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+In Guilin Release, MDONS Extension feature is introduced.
+
+
+Guilin Scope and Impacted modules
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+MDONS Extension implementation for the Frankfurt release will incorporate the following:
+
+- Support Asynchronous OpenRoadM OTN service activation notification handling
+- Add OOF support for inter domain link/path selection
+- Support Closed Loop sub-use case
+Impacted ONAP modules include: OOF, SDN-C, SO and Holmes
+
+Wiki link reference: https://wiki.onap.org/display/DW/MDONS+Extension+in+R7
+
+Functional/Integration Test Cases
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+For integration test case and description, refer to this following wiki-page:
+https://wiki.onap.org/display/DW/Integration+Test+Cases+-+MDONS+Extension
+
+Installation Procedure
+~~~~~~~~~~~~~~~~~~~~~~
+The integration test environment is established to have ONAP instance with Guilin
+release interfacing to 3rd party transport domain controllers. One controller
+instance manages OpenROADM OTN topology and the other 2 instances manage TAPI
+OTN topology. L0 infrastructure and WDM services are pre-provisioned to support
+L1 topology discovery and OTN service orchestration from ONAP.
+
+Testing Procedure
+~~~~~~~~~~~~~~~~~
+https://wiki.onap.org/display/DW/Integration+Test+Cases+-+MDONS+Extension
+
+
 Update for Frankfurt release
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 In Frankfurt, we introduced two extensions in CCVPN use case. One is E-LINE service over OTN NNI handover, another is the
diff --git a/docs/functional-requirements.csv b/docs/functional-requirements.csv
index ad90917aa..086e7958a 100644
--- a/docs/functional-requirements.csv
+++ b/docs/functional-requirements.csv
@@ -6,6 +6,6 @@ VSP Compliance and Validation Check within SDC,`wiki page <https://wiki.onap.org
 Enable PNF software version at onboarding,`wiki page <https://jira.onap.org/browse/REQ-88?src=confmacro>`__,A.Schmid
 xNF communication security enhancements, `wiki page <https://wiki.onap.org/display/DW/xNF+communication+security+enhancements+-+Tests+Description+and+Status>`__,M.Przybysz
 ETSI Alignment SO plugin to support SOL003 to connect to an external VNFM,`wiki page <https://wiki.onap.org/display/DW/ETSI+Alignment+Support>`__,F.Oliveira Byung-Woo Jun
-Integration of CDS as an Actor, `wiki page <https://docs.onap.org/projects/onap-ccsdk-cds/en/latest/CDS_Designer_Guide.html?highlight=actors%2Fcds>`__, B.Sakoto R.K.Verma Y.Malakov
+Integration of CDS as an Actor, `wiki page <https://docs.onap.org/projects/onap-ccsdk-cds/en/latest/ui/designer.html>`__, B.Sakoto R.K.Verma Y.Malakov
 3rd Party Operational Domain Manager, `wiki page <https://wiki.onap.org/display/DW/Third-party+Operational+Domain+Manager>`__, D.Patel
 Configuration & persistency, `wiki page <https://wiki.onap.org/pages/viewpage.action?pageId=64003184>`__,Reshmasree c Swaminathan S