summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHagop Bozawglanian <hagop.bozawglanian@att.com>2020-01-22 23:29:23 +0000
committerGerrit Code Review <gerrit@onap.org>2020-01-22 23:29:23 +0000
commitc8fd0b27cbfd24bdd80f6a4ac163aa25d5bd7906 (patch)
tree6b4fd5a6ef95bc78e0c4b1174e31942d86af8a89
parentd28cb6d2f0a36b15caac5018d848ed95255504bf (diff)
parent0f458cd9c8bb6a282b0c569103efaf97a91341cb (diff)
Merge "[VNFRQTS] update Requirement: R-02164 with Resource Information"
-rw-r--r--docs/Chapter5/Heat/ONAP Heat Orchestration Template Format.rst2
-rw-r--r--docs/Chapter5/Heat/ONAP Heat Resource ID and Parameter Naming Convention/Contrail Resource Parameters.rst20
2 files changed, 12 insertions, 10 deletions
diff --git a/docs/Chapter5/Heat/ONAP Heat Orchestration Template Format.rst b/docs/Chapter5/Heat/ONAP Heat Orchestration Template Format.rst
index c9fd6c4..c8b2f13 100644
--- a/docs/Chapter5/Heat/ONAP Heat Orchestration Template Format.rst
+++ b/docs/Chapter5/Heat/ONAP Heat Orchestration Template Format.rst
@@ -93,7 +93,6 @@ parameters
:id: R-35413
:target: VNF
:keyword: MAY
- :validation_mode: static
:introduced: frankfurt
A VNF Heat Orchestration's template's base module **MAY** (or **MAY NOT**)
@@ -477,7 +476,6 @@ resources
:id: R-23663
:target: VNF
:keyword: MAY
- :validation_mode: none
:introduced: frankfurt
A VNF's Heat Orchestration template's base module
diff --git a/docs/Chapter5/Heat/ONAP Heat Resource ID and Parameter Naming Convention/Contrail Resource Parameters.rst b/docs/Chapter5/Heat/ONAP Heat Resource ID and Parameter Naming Convention/Contrail Resource Parameters.rst
index 38136e5..b3ea7e0 100644
--- a/docs/Chapter5/Heat/ONAP Heat Resource ID and Parameter Naming Convention/Contrail Resource Parameters.rst
+++ b/docs/Chapter5/Heat/ONAP Heat Resource ID and Parameter Naming Convention/Contrail Resource Parameters.rst
@@ -26,25 +26,29 @@ ONAP External Networks
:updated: frankfurt
When a VNF's Heat Orchestration Template's Contrail resource
- has a property that
- references an ONAP external network (per the
+ ``OS::ContrailV2::InstanceIp`` and/or
+ ``OS::ContrailV2::VirtualMachineInterface``
+ contains the property ``virtual_network_refs``
+ that references an ONAP external network (per the
ONAP definition, see Requirement R-57424 and R-16968),
- that requires the network's
- Fully Qualified Domain Name (FQDN), the property parameter
+ the property value **MUST** be obtained by a ``get_param`` and the
+ property parameter
* **MUST** follow the format ``{network-role}_net_fqdn``
* **MUST** be declared as type ``string``
- * **MUST NOT** be enumerated in the VNF's Heat Orchestration Template's
- Environment File
+
.. req::
:id: R-92193
:target: VNF
:keyword: MUST NOT
:validation_mode: static
+ :updated: frankfurt
- A VNF's Heat Orchestration Template's parameter
- ``{network-role}_net_fqdn``
+ A VNF's Heat Orchestration Template's Contrail resource
+ ``OS::ContrailV2::InstanceIp`` and/or
+ ``OS::ContrailV2::VirtualMachineInterface`` property
+ ``virtual_network_refs`` parameter ``{network-role}_net_fqdn``
**MUST NOT** be enumerated in the VNF's Heat Orchestration Template's
Environment File.