summaryrefslogtreecommitdiffstats
path: root/docs/Chapter5/Heat
diff options
context:
space:
mode:
authorweinstock, alan <aw2574@att.com>2018-10-11 18:38:55 +0000
committerweinstock, alan <aw2574@att.com>2018-10-11 18:38:55 +0000
commit4c36802d5bb73af376b96bc6834920128ddb147b (patch)
treee887bac753116b539265afb5233d24aff6cd81e8 /docs/Chapter5/Heat
parentfc2db12e88eaf5f3fcee2359f22186949fe9945f (diff)
[VNFRQTS] Addition heat updates
Change-Id: I28971ba90b5a1b62c603ac50dec4554bc2fc8ab4 Issue-ID: VNFRQTS-469 Signed-off-by: weinstock, alan <aw2574@att.com>
Diffstat (limited to 'docs/Chapter5/Heat')
-rw-r--r--docs/Chapter5/Heat/ONAP Heat Networking.rst7
-rw-r--r--docs/Chapter5/Heat/ONAP Heat Resource ID and Parameter Naming Convention/Neutron Parameters.rst10
2 files changed, 9 insertions, 8 deletions
diff --git a/docs/Chapter5/Heat/ONAP Heat Networking.rst b/docs/Chapter5/Heat/ONAP Heat Networking.rst
index cce7988..1d10a5a 100644
--- a/docs/Chapter5/Heat/ONAP Heat Networking.rst
+++ b/docs/Chapter5/Heat/ONAP Heat Networking.rst
@@ -42,7 +42,7 @@ independently of VNFs.
:updated: casablanca
A VNF **MAY** be connected to zero, one or more than one external
- networks.
+ network.
.. req::
:id: R-57424
@@ -189,8 +189,9 @@ Contrail Heat Resources.
:validation_mode: static
:updated: casablanca
- A VNF's port connected to an internal network **MUST NOT** connect
- the port to VMs in another VNF and/or an external gateway and/or
+ A VNF's port connected to an internal network **MUST NOT** use the port
+ for the purpose of reaching VMs in another VNF and/or an
+ external gateway and/or
external router.
.. req::
diff --git a/docs/Chapter5/Heat/ONAP Heat Resource ID and Parameter Naming Convention/Neutron Parameters.rst b/docs/Chapter5/Heat/ONAP Heat Resource ID and Parameter Naming Convention/Neutron Parameters.rst
index 56775e2..e9049c0 100644
--- a/docs/Chapter5/Heat/ONAP Heat Resource ID and Parameter Naming Convention/Neutron Parameters.rst
+++ b/docs/Chapter5/Heat/ONAP Heat Resource ID and Parameter Naming Convention/Neutron Parameters.rst
@@ -81,7 +81,7 @@ Items to Note
A VNF **MAY** have one or more ports connected to a unique
internal network. All VNF ports connected to the unique internal
- network **MUST** have Cloud Assigned IP Addresses
+ network **MUST** have cloud assigned IP Addresses
or **MUST** have statically assigned IP addresses.
.. req::
@@ -92,7 +92,7 @@ Items to Note
:updated: casablanca
If the VNF's ports connected to a unique network (internal or external)
- and the port's IP addresses are Cloud Assigned IP Addresses,
+ and the port's IP addresses are cloud assigned IP Addresses,
all the IPv4 Addresses **MUST** be from
the same subnet and all the IPv6 Addresses **MUST** be from the
same subnet.
@@ -491,7 +491,7 @@ the value at orchestration to the Heat Orchestration Template.
When the VNF's Heat Orchestration Template's Resource
``OS::Neutron::Port`` is attaching to an external network (per the
- ONAP definition, see Requirement Requirement R-57424),
+ ONAP definition, see Requirement R-57424),
and an IPv6 address is assigned
using the property ``fixed_ips``
map property ``ip_address`` and the parameter type is defined as a
@@ -601,7 +601,7 @@ Heat Orchestration Template's Environment File.
When the VNF's Heat Orchestration Template's Resource
``OS::Neutron::Port`` is attaching to an internal network (per the
- ONAP definition, see Requirement Requirements R-52425 and R-46461),
+ ONAP definition, see Requirements R-52425 and R-46461),
and an IPv4 address is assigned
using the property ``fixed_ips``
map property ``ip_address`` and the parameter type is defined as a
@@ -1437,7 +1437,7 @@ VIP Assignment, External Networks, Supported by Automation
the parameter name **MUST** follow the
naming convention
- * ``{vm-type}_{network-role}_v6_floating_ip``
+ * ``{vm-type}_{network-role}_floating_v6_ip``
where