summaryrefslogtreecommitdiffstats
path: root/docs/Chapter5/Heat
diff options
context:
space:
mode:
authorweinstock, alan <aw2574@att.com>2019-04-24 20:35:58 +0000
committerweinstock, alan <aw2574@att.com>2019-04-24 20:35:58 +0000
commit3422870a179cdeed4df9631faa08357d28da5c7a (patch)
treef575e2c8c02578c601d66a9de0ca17cab0ef2efc /docs/Chapter5/Heat
parent0ca11a945f993ee571a13f0ae56c8253714e440a (diff)
[VNFRQTS] updated R-99110, R-26506, R-708564
Change-Id: Iffa4d578c852d508b3351253a1187551472fb22f Issue-ID: VNFRQTS-629 Signed-off-by: weinstock, alan <aw2574@att.com>
Diffstat (limited to 'docs/Chapter5/Heat')
-rw-r--r--docs/Chapter5/Heat/ONAP Heat Resource ID and Parameter Naming Convention/Resource IDs.rst14
-rw-r--r--docs/Chapter5/Heat/ONAP Heat Resource ID and Parameter Naming Convention/{network-role}.rst6
-rw-r--r--docs/Chapter5/Heat/ONAP Heat Template Constructs.rst6
3 files changed, 13 insertions, 13 deletions
diff --git a/docs/Chapter5/Heat/ONAP Heat Resource ID and Parameter Naming Convention/Resource IDs.rst b/docs/Chapter5/Heat/ONAP Heat Resource ID and Parameter Naming Convention/Resource IDs.rst
index 0d1093b..f161ded 100644
--- a/docs/Chapter5/Heat/ONAP Heat Resource ID and Parameter Naming Convention/Resource IDs.rst
+++ b/docs/Chapter5/Heat/ONAP Heat Resource ID and Parameter Naming Convention/Resource IDs.rst
@@ -934,21 +934,15 @@ OS::ContrailV2::VirtualNetwork
:target: VNF
:keyword: MUST
:validation_mode: static
- :updated: casablanca
+ :updated: dublin
A VNF's Heat Orchestration Template's Resource
- ``OS::ContrailV2::VirtualNetwork`` Resource ID **MUST** use the naming convention
-
- 1) ``int_{network-role}_network``
-
- or
+ ``OS::ContrailV2::VirtualNetwork`` Resource ID **MUST** use the naming
+ convention
- 2) ``int_{network-role}_RVN`` where RVN represents Resource Virtual
- Network
+ * ``int_{network-role}_network``
VNF Heat Orchestration Templates can only create internal networks.
There is no ``{index}`` after ``{network-role}`` because ``{network-role}``
**MUST** be unique in the scope of the VNF's
Heat Orchestration Template.
-
- Note that option 1 is preferred.
diff --git a/docs/Chapter5/Heat/ONAP Heat Resource ID and Parameter Naming Convention/{network-role}.rst b/docs/Chapter5/Heat/ONAP Heat Resource ID and Parameter Naming Convention/{network-role}.rst
index fc7d080..498d79f 100644
--- a/docs/Chapter5/Heat/ONAP Heat Resource ID and Parameter Naming Convention/{network-role}.rst
+++ b/docs/Chapter5/Heat/ONAP Heat Resource ID and Parameter Naming Convention/{network-role}.rst
@@ -83,13 +83,15 @@
:validation_mode: static
:updated: dublin
-
A VNF's Heat Orchestration Template's ``{network-role}`` **MUST** contain
only alphanumeric characters and/or underscores '_' and
* **MUST NOT** contain any of the following strings: ``_int`` or ``int_``
or ``_int_``
- * **MUST NOT** end in the following string: ``_v6``
+ * **MUST NOT** end in the string: ``_v6``
+ * **MUST NOT** contain the strings ``_#_``, where ``#`` is a number
+ * **MUST NOT** end in the string: ``_#``, where ``#`` is a number
+
.. req::
:id: R-00977
diff --git a/docs/Chapter5/Heat/ONAP Heat Template Constructs.rst b/docs/Chapter5/Heat/ONAP Heat Template Constructs.rst
index e55eb4f..ab30c81 100644
--- a/docs/Chapter5/Heat/ONAP Heat Template Constructs.rst
+++ b/docs/Chapter5/Heat/ONAP Heat Template Constructs.rst
@@ -117,7 +117,11 @@ the second level of nested heat.
* ``OS::ContrailV2::VirtualMachineInterface`` property
``virtual_network_refs``
* ``OS::ContrailV2::VirtualMachineInterface`` property
- ``virtual_machine_interface_allowed_address_pairs``
+ ``virtual_machine_interface_allowed_address_pairs``, map property
+ ``virtual_machine_interface_allowed_address_pairs_allowed_address_pair``,
+ ``virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip``
+ ,
+ ``virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix``
* ``OS::ContrailV2::InstanceIP`` property ``instance_ip_address``