Add the following requirements to Section 6. ONAP VNF Modularity

R-610010: A VNF’s Heat Orchestration Template’s Base Module MAY declare zero, one, or more than one OS::Nova::Server resources

R-610020: If a VNF’s Heat Orchestration Template’s Base Module contains two or more OS::Nova::Server resources, the OS::Nova::Server resources MAY define the same

{vm-type} (as defined in R-01455) or MAY define different {vm-type}

. Note that
There is no constraint on the number of unique

{vm-type} defined in the base module.
There is no constraint on the number of OS::Nova::Server resources that define the same {vm-type}

in the base module

R-610030: A VNF’s Heat Orchestration Template’s Incremental Module MUST declare one or more OS::Nova::Server resources

R-610040: If a VNF’s Heat Orchestration Template’s Incremental Module contains two or more OS::Nova::Server resources, the OS::Nova::Server resources MAY define the same

{vm-type} (as defined in R-01455) or MAY define different {vm-type}

. Note that
There is no constraint on the number of unique

{vm-type} defined in the incremental module.
There is no constraint on the number of OS::Nova::Server resources that define the same {vm-type}

in the incremental module

R-610050: A VNF’s Heat Orchestration Template’s OS::Nova::Server resource unique

{vm-type}

(as defined in R-01455) MAY exist in the VNF’s Heat Orchestration Template’s Base Module and/or one or more of the VNF’s Heat Orchestration Template’s Incremental Modules.

Also add reference to Requirement: R-17528 in 9.1.1 Nested Heat Template Requirements¶