summaryrefslogtreecommitdiffstats
path: root/docs/Chapter5
diff options
context:
space:
mode:
authorweinstock, alan <aw2574@att.com>2018-12-17 18:47:30 +0000
committerweinstock, alan <aw2574@att.com>2018-12-17 21:18:05 +0000
commitacfcfeb9a33b968950629f1d6792a186f4413eee (patch)
treede32b75a441c19450c2fbe6976fb201de40a72f0 /docs/Chapter5
parent2439a93ff6531781914dcb620eb22036febddc38 (diff)
[VNFRQTS] update cross reference in R-304011
Change-Id: I5c9ee951ffb2332d740c6156ec0beb5e4597a803 Issue-ID: VNFRQTS-514 Signed-off-by: weinstock, alan <aw2574@att.com>
Diffstat (limited to 'docs/Chapter5')
-rw-r--r--docs/Chapter5/Heat/ONAP Heat Resource ID and Parameter Naming Convention/Nova Parameters.rst4
-rw-r--r--docs/Chapter5/Heat/ONAP Heat Resource ID and Parameter Naming Convention/Resource IDs.rst26
-rw-r--r--docs/Chapter5/Heat/ONAP Heat Resource ID and Parameter Naming Convention/{vm-type}.rst4
3 files changed, 17 insertions, 17 deletions
diff --git a/docs/Chapter5/Heat/ONAP Heat Resource ID and Parameter Naming Convention/Nova Parameters.rst b/docs/Chapter5/Heat/ONAP Heat Resource ID and Parameter Naming Convention/Nova Parameters.rst
index c84e32b..b59dabd 100644
--- a/docs/Chapter5/Heat/ONAP Heat Resource ID and Parameter Naming Convention/Nova Parameters.rst
+++ b/docs/Chapter5/Heat/ONAP Heat Resource ID and Parameter Naming Convention/Nova Parameters.rst
@@ -40,7 +40,7 @@ Requirement R-82481 defines how the ``{vm-type}`` is used.
* property ``flavor`` parameter name (defined in R-45188)
* property ``name`` parameter name (defined in R-54171 & R-87817)
* property port referenced OS::Neutron::Port Resource ID
- (defined in R-58670)
+ (defined in R-20453)
**MUST** contain the identical ``{vm-type}``
and **MUST** follow the naming conventions defined
@@ -48,7 +48,7 @@ Requirement R-82481 defines how the ``{vm-type}`` is used.
the ``OS::Nova::Server`` Resource ID (defined in R-29751) **MUST** match
the ``{vm-type_index}`` defined in
the ``OS::Nova::Server`` property ``port``
- referenced ``OS::Neutron::Port`` Resource ID.
+ referenced ``OS::Neutron::Port`` Resource ID (defined in R-20453).
The table below provides a summary. The sections that follow provides
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 5534a8b..eaf3e51 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
@@ -281,7 +281,7 @@ that is is creating sub-interfaces.
* ``{vm-type_index}`` is the instance of the ``{vm-type}``
* ``{network-role}`` is the network-role of the networks
that the sub-interfaces attach to
- * ``{port-index}`` is the instance of the the port on the vm-type
+ * ``{port-index}`` is the instance of the port on the vm-type
attached to the network of ``{network-role}``
OS::Heat::SoftwareConfig
@@ -356,7 +356,7 @@ OS::Neutron::Port
* ``{vm-type_index}`` is the instance of the ``{vm-type}``
* ``{network-role}`` is the network-role of the network
that the port is attached to
- * ``{port-index}`` is the instance of the the port on the vm-type
+ * ``{port-index}`` is the instance of the port on the vm-type
attached to the network of ``{network-role}``
.. req::
@@ -378,7 +378,7 @@ OS::Neutron::Port
* ``{vm-type_index}`` is the instance of the ``{vm-type}``
* ``{network-role}`` is the network-role of the network
that the port is attached to
- * ``{port-index}`` is the instance of the the port on the vm-type
+ * ``{port-index}`` is the instance of the port on the vm-type
attached to the network of ``{network-role}``
.. req::
@@ -574,7 +574,7 @@ OS::Nova::Keypair
:updated: casablanca
A VNF's Heat Orchestration Template's Resource ``OS::Nova::Keypair`` applies to
- all Virtual Machines in the the VNF, the Resource ID **SHOULD** use the naming
+ all Virtual Machines in the VNF, the Resource ID **SHOULD** use the naming
convention
* ``{vnf-type}_keypair``
@@ -658,7 +658,7 @@ OS::ContrailV2::InstanceIp
* ``{vm-type}`` is the vm-type
* ``{vm-type_index}`` is the instance of the {vm-type}
* ``{network-role}`` is the network-role of the network that the port is attached to
- * ``{vmi_index}`` is the instance of the the virtual machine interface
+ * ``{vmi_index}`` is the instance of the virtual machine interface
(e.g., port) on the vm-type attached to the network of {network-role}
* ``IP`` signifies that an IPv4 address is being configured
* ``{index}`` is the index of the IPv4 address
@@ -682,7 +682,7 @@ OS::ContrailV2::InstanceIp
* ``{vm-type_index}`` is the instance of the ``{vm-type}``
* ``{network-role}`` is the network-role of the network
that the port is attached to
- * ``{vmi_index}`` is the instance of the the virtual machine interface
+ * ``{vmi_index}`` is the instance of the virtual machine interface
(e.g., port) on the vm-type
attached to the network of {network-role}
* ``v6_IP`` signifies that an IPv6 address is being configured
@@ -707,7 +707,7 @@ OS::ContrailV2::InstanceIp
* ``{vm-type_index}`` is the instance of the ``{vm-type}``
* ``{network-role}`` is the network-role of the network
that the port is attached to
- * ``{vmi_index}`` is the instance of the the virtual machine interface
+ * ``{vmi_index}`` is the instance of the virtual machine interface
(e.g., port) on the vm-type
attached to the network of ``{network-role}``
* ``IP`` signifies that an IPv4 address is being configured
@@ -732,7 +732,7 @@ OS::ContrailV2::InstanceIp
* ``{vm-type_index}`` is the instance of the ``{vm-type}``
* ``{network-role}`` is the network-role of the network
that the port is attached to
- * ``{vmi_index}`` is the instance of the the virtual machine interface
+ * ``{vmi_index}`` is the instance of the virtual machine interface
(e.g., port) on the vm-type
attached to the network of ``{network-role}``
* ``v6_IP`` signifies that an IPv6 address is being configured
@@ -757,7 +757,7 @@ OS::ContrailV2::InstanceIp
* ``{vm-type_index}`` is the instance of the ``{vm-type}``
* ``{network-role}`` is the network-role of the network
that the port is attached to
- * ``{vmi_index}`` is the instance of the the virtual machine interface
+ * ``{vmi_index}`` is the instance of the virtual machine interface
(e.g., port) on the vm-type
attached to the network of ``{network-role}``
* ``IP`` signifies that an IPv4 address is being configured
@@ -783,7 +783,7 @@ OS::ContrailV2::InstanceIp
* ``{vm-type_index}`` is the instance of the ``{vm-type}``
* ``{network-role}`` is the network-role of the network
that the port is attached to
- * ``{vmi_index}`` is the instance of the the virtual machine interface
+ * ``{vmi_index}`` is the instance of the virtual machine interface
(e.g., port) on the vm-type
attached to the network of ``{network-role}``
* ``v6_IP`` signifies that an IPv6 address is being configured
@@ -970,7 +970,7 @@ OS::ContrailV2::VirtualMachineInterface
* ``{vm-type_index}`` is the instance of the ``{vm-type}``
* ``{network-role}`` is the network-role of the network
that the port (i.e. virtual machine interface) is attached to
- * ``{vmi_index}`` is the instance of the the vmi on the vm-type
+ * ``{vmi_index}`` is the instance of the vmi on the vm-type
attached to the network of ``{network-role}``
.. req::
@@ -992,7 +992,7 @@ OS::ContrailV2::VirtualMachineInterface
* ``{vm-type_index}`` is the instance of the ``{vm-type}``
* ``{network-role}`` is the network-role of the network
that the port (i.e. virtual machine interface) is attached to
- * ``{vmi_index}`` is the instance of the the vmi on the vm-type
+ * ``{vmi_index}`` is the instance of the vmi on the vm-type
attached to the network of ``{network-role}``
.. req::
@@ -1014,7 +1014,7 @@ OS::ContrailV2::VirtualMachineInterface
* ``{vm-type_index}`` is the instance of the ``{vm-type}``
* ``{network-role}`` is the network-role of the network
that the port (i.e. virtual machine interface) is attached to
- * ``{vmi_index}`` is the instance of the the vmi on the vm-type
+ * ``{vmi_index}`` is the instance of the vmi on the vm-type
attached to the network of ``{network-role}``
OS::ContrailV2::VirtualNetwork
diff --git a/docs/Chapter5/Heat/ONAP Heat Resource ID and Parameter Naming Convention/{vm-type}.rst b/docs/Chapter5/Heat/ONAP Heat Resource ID and Parameter Naming Convention/{vm-type}.rst
index 4683a5e..7d6a6c2 100644
--- a/docs/Chapter5/Heat/ONAP Heat Resource ID and Parameter Naming Convention/{vm-type}.rst
+++ b/docs/Chapter5/Heat/ONAP Heat Resource ID and Parameter Naming Convention/{vm-type}.rst
@@ -31,13 +31,13 @@
4.) Network attachments and IP address requirements
- - Each VM in the "class" **MUST** have the the identical number of
+ - Each VM in the "class" **MUST** have the identical number of
ports connecting to the identical networks and requiring the identical
IP address configuration.
The ``{vm-type}`` will be used in a VNF's Heat Orchestration Template's
-* Resource IDs
+* Resource IDs
* Resource property parameter names
Requirements in this document will explain it in further detail.