summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Debeau <eric.debeau@orange.com>2021-03-10 13:10:38 +0000
committerGerrit Code Review <gerrit@onap.org>2021-03-10 13:10:38 +0000
commit1faf293e87a8c7d39ca12621d371f1f6f757da1c (patch)
tree3dbe030d39695d29f0a20e736a5dd4b63064336d
parent5c52765979e697e98eb648702a285085892092b5 (diff)
parent9e1a32f9c0738e3715d9d938a55cb9d38ac97ee2 (diff)
Merge "[DOC] Add link to VID documentation (Instantiate Service, “Macro” mode (PNF example)) Issue-ID: VID-970"
-rw-r--r--docs/guides/onap-user/instantiate/instantiation/service_instance/index.rst9
-rw-r--r--docs/guides/onap-user/instantiate/instantiation/vid1/index.rst (renamed from docs/guides/onap-user/instantiate/instantiation/vid/index.rst)2
-rw-r--r--docs/guides/onap-user/instantiate/instantiation/vid2/index.rst13
-rw-r--r--docs/guides/onap-user/instantiate/instantiation/virtual_link_instance/index.rst2
-rw-r--r--docs/guides/onap-user/instantiate/instantiation/vnf_instance/index.rst2
5 files changed, 22 insertions, 6 deletions
diff --git a/docs/guides/onap-user/instantiate/instantiation/service_instance/index.rst b/docs/guides/onap-user/instantiate/instantiation/service_instance/index.rst
index 9e06c4318..4e8dcab86 100644
--- a/docs/guides/onap-user/instantiate/instantiation/service_instance/index.rst
+++ b/docs/guides/onap-user/instantiate/instantiation/service_instance/index.rst
@@ -41,8 +41,10 @@ Service Instantiation
ONAP will collect and assign all required parameters/values by itself.
- .. Note:: **Macro** method is not (yet) available via ONAP VID
- nor via extAPI/NBI
+.. Note::
+ VID supports the "macro" flow orchestration in a ModernUI, which can be enabled by the system operator.
+
+ **Macro** method is not (yet) available via extAPI/NBI.
With "A La Carte" method
------------------------
@@ -50,7 +52,7 @@ With "A La Carte" method
.. toctree::
:maxdepth: 1
- using ONAP VID Portal <../vid/index.rst>
+ using ONAP VID Portal <../vid1/index.rst>
using ONAP NBI REST API (TM Forum) <../nbi/index.rst>
using ONAP SO REST API <../so1/index.rst>
@@ -60,4 +62,5 @@ With "Macro" method
.. toctree::
:maxdepth: 1
+ using ONAP VID Portal <../vid2/index.rst>
using ONAP SO REST API <../so2/index.rst>
diff --git a/docs/guides/onap-user/instantiate/instantiation/vid/index.rst b/docs/guides/onap-user/instantiate/instantiation/vid1/index.rst
index 9b367f9cf..4157dd6bd 100644
--- a/docs/guides/onap-user/instantiate/instantiation/vid/index.rst
+++ b/docs/guides/onap-user/instantiate/instantiation/vid1/index.rst
@@ -10,4 +10,4 @@ A La Carte mode Service Instantiation via ONAP VID Portal
:maxdepth: 1
:titlesonly:
-:ref:`vidgit docs instantiaterst<onap-vid:instantiate>`
+:ref:`Instantiate Service, VNF, VF modules and Network<onap-vid:instantiate>`
diff --git a/docs/guides/onap-user/instantiate/instantiation/vid2/index.rst b/docs/guides/onap-user/instantiate/instantiation/vid2/index.rst
new file mode 100644
index 000000000..35006d315
--- /dev/null
+++ b/docs/guides/onap-user/instantiate/instantiation/vid2/index.rst
@@ -0,0 +1,13 @@
+.. This work is licensed under a Creative Commons Attribution 4.0
+.. International License. http://creativecommons.org/licenses/by/4.0
+.. Copyright 2019 ONAP Contributors. All rights reserved.
+
+
+Macro mode Service Instantiation via ONAP VID Portal
+=========================================================
+
+.. toctree::
+ :maxdepth: 1
+ :titlesonly:
+
+:ref:`Instantiate Service, “Macro” mode (PNF example)<onap-vid:instantiatemacro>`
diff --git a/docs/guides/onap-user/instantiate/instantiation/virtual_link_instance/index.rst b/docs/guides/onap-user/instantiate/instantiation/virtual_link_instance/index.rst
index 0fb9f1147..e12932a5d 100644
--- a/docs/guides/onap-user/instantiate/instantiation/virtual_link_instance/index.rst
+++ b/docs/guides/onap-user/instantiate/instantiation/virtual_link_instance/index.rst
@@ -44,7 +44,7 @@ With "A La Carte" method
.. toctree::
:maxdepth: 1
- using ONAP VID Portal <../vid/index.rst>
+ using ONAP VID Portal <../vid1/index.rst>
using ONAP SO REST API <../so1/index.rst>
With "Macro" method
diff --git a/docs/guides/onap-user/instantiate/instantiation/vnf_instance/index.rst b/docs/guides/onap-user/instantiate/instantiation/vnf_instance/index.rst
index a020f9aeb..ccf036c2f 100644
--- a/docs/guides/onap-user/instantiate/instantiation/vnf_instance/index.rst
+++ b/docs/guides/onap-user/instantiate/instantiation/vnf_instance/index.rst
@@ -53,7 +53,7 @@ With "A La Carte" method
.. toctree::
:maxdepth: 1
- using ONAP VID Portal <../vid/index.rst>
+ using ONAP VID Portal <../vid1/index.rst>
using ONAP SO REST API <../so1/index.rst>
With "Macro" method