1 files changed, 173 insertions, 151 deletions

diff --git a/docs/traceability.csv b/docs/traceability.csv
index ead975d..e482167 100755
--- a/docs/traceability.csv
+++ b/docs/traceability.csv
@@ -1,162 +1,194 @@
 Requirement ID,Section,Test Module,Test Name

-R-36772,type,tests.test_heat_template_parameters_contain_required_fields,test_heat_template_parameters_contain_required_fields

-R-98569,"Property: fixed_ips, Map Property: ip_address",tests.test_environment_file_parameters,test_neutron_port_fixedips_ipaddress_parameter_doesnt_exist_in_environment_file

-R-96983,{network-role},tests.test_port_resource_ids,test_port_resource_ids

 R-00977,{network-role},tests.test_nova_servers_vm_types,test_vm_type_network_role_collision

-R-22838,Property: Name,tests.test_environment_file_parameters,test_nova_server_name_parameter_doesnt_exist_in_environment_file

-R-11441,type,tests.test_heat_template_structure,test_parameter_type

-R-99812,Resource Property "name",tests.test_environment_file_parameters,test_non_nova_server_name_parameter_doesnt_exist_in_environment_file

-R-40899,Property: Name,tests.test_unique_name_resources,test_unique_name_resources

-R-74304,ONAP Heat Orchestration Template Filenames,tests.test_heat_pairs_provided,test_heat_pairs_provided

+R-01896,Scope of a Heat Orchestration Template,tests.test_no_unused_parameters_between_env_and_templates,test_no_unused_parameters_between_env_and_templates

+R-02164,External Networks,tests.test_contrail_fqdn,test_contrail_fqdn

+R-02691,workload_context,tests.test_environment_file_parameters,test_nova_server_workload_context_parameter_doesnt_exist_in_environment_file

 R-03324,Environment File Format,tests.test_environment_file_structure,test_environment_file_contains_required_sections

-R-50011,OS::Heat::ResourceGroup Property count,tests.test_environment_file_parameters,test_heat_rg_count_parameter_exists_in_environment_file

-R-05201,External Networks,tests.test_port_resource_ids,test_port_resource_ids

-R-86182,Property: network,tests.test_network_format,test_network_format

+R-04697,"Property: fixed_ips, Map Property: ip_address",tests.test_fixed_ips_include_vm_type_network_role,test_fixed_ips_include_vm_type_network_role

+R-04747,OS::Heat::CloudConfig,tests.test_cloud_config_resource_id,test_cloud_config

+R-05257,"VIP Assignment, External Networks, Supported by Automation",tests.test_forbidden_resources,test_neutron_floating_ip_resource_type

+R-07443,ONAP Volume Module Output Parameters,tests.test_volume_outputs_consumed,test_volume_outputs_consumed

+R-07507,vnf_id,tests.test_server_parameters,test_vnf_id_parameter_type_and_parameter_name

+R-08975,OS::Heat::SoftwareConfig,tests.test_software_config_resource_id,test_software_config_vm_type

+R-09811,vf_module_index,tests.test_required_parameters_no_constraints,test_vf_module_index_parameter_has_no_constraints

+R-10754,"VIP Assignment, External Networks, Supported by Automation",tests.test_neutron_port_addresses,test_neutron_port_floating

+R-10834,properties,tests.test_nested_parameter_args,test_nested_parameter_args

+R-11041,Nested Heat Template Requirements,tests.test_nested_template_parameters,test_nested_template_parameters

 R-11200,ONAP VNF Modularity Overview,tests.test_volume_outputs_consumed,test_volume_outputs_consumed

-R-11168,{network-role},tests.test_port_resource_ids,test_port_resource_ids

-R-27818,"Property: fixed_ips, Map Property: ip_address",tests.test_fixed_ips_include_vm_type_network_role,test_fixed_ips_include_vm_type_network_role

-R-01896,Scope of a Heat Orchestration Template,tests.test_no_unused_parameters_between_env_and_templates,test_no_unused_parameters_between_env_and_templates

+R-11441,type,tests.test_heat_template_structure,test_parameter_type

+R-11690,Resource IDs,tests.test_resource_indices,test_indices_start_at_0_increment

+R-13194,environment_context,tests.test_environment_file_parameters,test_nova_server_environment_context_parameter_doesnt_exist_in_environment_file

+R-15287,"Property: fixed_ips, Map Property: subnet",tests.test_neutron_port_fixed_ips,test_neutron_port_external_fixed_ips

+R-15480,vf_module_name,tests.test_required_parameters_no_constraints,test_vf_module_name_parameter_has_no_constraints

+R-16241,Internal Networks,tests.test_network_format,test_network_has_subnet

+R-16437,OS::ContrailV2::ServiceTemplate,tests.test_contrail_resource_id,test_contrail_servicetemplate_resource_id

+R-16447,resource ID,tests.test_unique_resources_across_all_templates,test_unique_resources_across_all_yaml_files

+R-16968,External Networks,tests.test_network_format,test_network_resource_id_format

+R-17528,Nested Heat Template Requirements,tests.test_nesting_nova_server,test_nesting_nova_server

+R-18008,Property: network,tests.test_neutron_port_network_parameter,test_neutron_port_network_param_is_string

+R-19756,Interface Route Table Prefixes for Contrail InterfaceRoute Table,tests.test_contrail_irt_routes,test_contrail_irt_route_param_type

+R-20065,OS::ContrailV2::PortTuple,tests.test_contrail_resource_id,test_contrail_porttuple_resource_id

+R-20308,environment_context,tests.test_nova_servers_environment_context,test_environment_context

+R-20453,OS::Neutron::Port,tests.test_port_resource_ids,test_port_resource_ids

+R-20856,vnf_id,tests.test_environment_file_parameters,test_nova_server_vnf_id_parameter_doesnt_exist_in_environment_file

+R-20947,OS::ContrailV2::InstanceIp,tests.test_contrail_instance_ip_resource_id,test_contrail_instance_ip_resource_id_subint

+R-22288,"Property: fixed_ips, Map Property: subnet",tests.test_environment_file_parameters,test_neutron_port_fixedips_subnet_parameter_doesnt_exist_in_environment_file

+R-22688,Internal Networks,tests.test_neutron_port_internal_network,test_neutron_port_internal_network

+R-22838,Property: Name,tests.test_environment_file_parameters,test_nova_server_name_parameter_doesnt_exist_in_environment_file

+R-23311,Property: availability_zone,tests.test_server_parameters,test_availability_zone_parameter_type

+R-23503,"Property: fixed_ips, Map Property: ip_address",tests.test_fixed_ips_include_vm_type_network_role,test_fixed_ips_include_vm_type_network_role

+R-23664,resources,tests.test_heat_template_structure,test_heat_template_structure_contains_resources

+R-25720,OS::Neutron::Net,tests.test_neutron_net_resource_id,test_neutron_net_resource_id

+R-25877,<param name>,tests.test_heat_parameter_section,test_parameter_names

+R-26124,default,tests.test_no_unused_parameters_between_env_and_templates,test_no_unused_parameters_between_env_and_templates

 R-26351,OS::Neutron::Port,tests.test_port_resource_ids,test_port_resource_ids

+R-270358,ONAP Heat Cinder Volumes,tests.test_volume_templates,test_volume_templates_contains_cinder_or_resource_group

+R-27078,heat_template_version,tests.test_heat_template_structure,test_heat_template_structure_contains_heat_template_version

+R-27818,"Property: fixed_ips, Map Property: ip_address",tests.test_fixed_ips_include_vm_type_network_role,test_fixed_ips_include_vm_type_network_role

+R-28222,Interface Route Table Prefixes for Contrail InterfaceRoute Table,tests.test_contrail_irt_routes,test_contrail_irt_route_param_format

+R-28795,"Property: fixed_ips, Map Property: ip_address",tests.test_environment_file_parameters,test_neutron_port_internal_fixedips_ipaddress_parameter_exists_in_environment_file

+R-29751,OS::Nova::Server,tests.test_nova_server_resource_id,test_nova_server_resource_id

+R-29765,"Property: fixed_ips, Map Property: ip_address",tests.test_fixed_ips_include_vm_type_network_role,test_fixed_ips_include_vm_type_network_role

 R-29872,Property: network,tests.test_environment_file_parameters,test_nova_server_network_parameter_doesnt_exist_in_environment_file

-R-99646,ONAP Heat Orchestration Template Filenames,tests.test_get_file_only_reference_local_files,test_get_file_only_reference_local_files

-R-98450,Property: availability_zone,tests.test_availability_zone,test_availability_zone_naming

-R-57282,Property: image,tests.test_nova_servers_resource_ids,test_nova_servers_valid_resource_ids

-R-37028,ONAP VNF Modularity Overview,tests.test_base_template_names,test_base_template_names

-R-51430,Property: Name,tests.test_nova_servers_vm_types,test_nova_server_name_parameter

-R-81725,ONAP VNF Modularity Overview,tests.test_env_and_yaml_same_name,test_env_and_yaml_same_name

-R-83412,"VIP Assignment, External Networks, Supported by Automation",tests.test_environment_file_parameters,test_neutron_port_aap_ip_parameter_doesnt_exist_in_environment_file

-R-91125,Property: image,tests.test_environment_file_parameters,test_nova_server_image_parameter_exists_in_environment_file

-R-80829,"Property: fixed_ips, Map Property: subnet_id",tests.test_environment_file_parameters,test_neutron_port_fixedips_subnet_parameter_doesnt_exist_in_environment_file

-R-90206,"Property: fixed_ips, Map Property: ip_address",tests.test_environment_file_parameters,test_neutron_port_fixedips_ipaddress_parameter_doesnt_exist_in_environment_file

-R-74978,workload_context,tests.test_nova_servers_workload_context,test_workload_context

-R-87485,ONAP Heat Orchestration Template Filenames,tests.test_base_template_names,test_base_template_names

+R-30753,OS::ContrailV2::NetworkIpam,tests.test_contrail_resource_id,test_contrail_networkipam_resource_id

+R-30804,OS::Heat::MultipartMime,tests.test_multipart_mime_resource_id,test_multipart_mime

+R-31141,Cinder Volume Modules,tests.test_heat_pairs_provided,test_heat_pairs_provided

+R-32394,{vm-type},tests.test_vm_type_case,test_vm_type_case

+R-34037,"Property: fixed_ips, Map Property: ip_address",tests.test_fixed_ips_include_vm_type_network_role,test_fixed_ips_include_vm_type_network_role

+R-34055,workload_context,tests.test_required_parameters_no_constraints,test_workload_context_parameter_has_no_constraints

+R-348813,ONAP VNF On-Boarding,tests.test_no_image_files,test_no_image_files_included

 R-35414,parameters,tests.test_heat_template_structure,test_heat_template_structure_contains_parameters

-R-11690,Resource IDs,tests.test_nova_servers_index,test_indices

-R-81339,Base Modules,tests.test_base_template_names,test_base_template_names

-R-90279,parameters,tests.test_no_unused_parameters_between_env_and_templates,test_no_unused_parameters_between_env_and_templates

-R-95303,YAML Format,tests.test_initial_configuration,test_00_valid_yaml

-R-75141,resource ID,tests.test_resource_ids_alphanumeric_only,test_alphanumeric_resource_ids_only

+R-35666,Internal Networks,tests.test_network_format,test_network_resource_id_format

+R-35735,"VIP Assignment, External Networks, Supported by Automation",tests.test_allowed_address_pairs_include_vm_type_network_role,test_allowed_address_pairs_include_vm_type_network_role

 R-36542,vnf_name,tests.test_environment_file_parameters,test_nova_server_vnf_name_parameter_doesnt_exist_in_environment_file

-R-55218,vnf_id,tests.test_required_parameters_no_constraints,test_required_parameters_no_constraints

-R-20308,environment_context,tests.test_nova_servers_environment_context,test_environment_context

-R-67231,Environment File Format,tests.test_env_no_resource_registry,test_env_no_resource_registry

-R-46839,{vm-type},tests.test_vm_type_resource_id,test_vm_type_resource_id

-R-54171,Property: Name,tests.test_nova_servers_vm_types,test_nova_server_name_parameter

-R-76057,Nested Heat file,tests.test_base_template_names,test_base_template_names

-R-92193,External Networks,tests.test_environment_file_parameters,test_network_fqdn_parameter_doesnt_exist_in_environment_file

-R-41492,"VIP Assignment, External Networks, Supported by Automation",tests.test_allowed_address_pairs_include_vm_type_network_role,test_allowed_address_pairs_include_vm_type_network_role

+R-36772,type,tests.test_heat_template_parameters_contain_required_fields,test_heat_template_parameters_contain_required_fields

+R-37028,ONAP VNF Modularity Overview,tests.test_base_template_names,test_base_template_names

+R-37039,vf_module_index,tests.test_environment_file_parameters,test_nova_server_vf_module_index_parameter_doesnt_exist_in_environment_file

+R-37437,vnf_id,tests.test_servers_have_required_metadata,test_servers_have_required_metadata

+R-38236,"Property: fixed_ips, Map Property: subnet",tests.test_neutron_port_fixed_ips,test_neutron_port_fixed_ips

 R-38474,ONAP VNF Modularity Overview,tests.test_env_and_yaml_same_name,test_env_and_yaml_same_name

-R-07443,ONAP Volume Module Output Parameters,tests.test_volume_outputs_consumed,test_volume_outputs_consumed

-R-98407,{vm-type},tests.test_vm_type_syntax,test_vm_type_syntax

-R-26506,{network-role},tests.test_port_resource_ids,test_port_resource_ids

-R-71493,vf_module_id,tests.test_servers_have_required_metadata,test_servers_have_required_metadata

-R-93177,Property: network,tests.test_network_format_use_get_param_or_get_resource,test_network_format_use_get_param_or_get_resource

-R-59568,Property: availability_zone,tests.test_environment_file_parameters,test_nova_server_az_parameter_doesnt_exist_in_environment_file

-R-25877,<param name>,tests.test_heat_parameter_section,test_parameter_names

-R-80374,vf_module_name,tests.test_environment_file_parameters,test_nova_server_vf_module_name_parameter_doesnt_exist_in_environment_file

-R-30804,OS::Heat::MultipartMime,tests.test_multipart_mime_resource_id,test_multipart_mime

-R-87817,Property: Name,tests.test_nova_servers_vm_types,test_nova_server_name_parameter

-R-97201,"Property: fixed_ips, Map Property: ip_address",tests.test_environment_file_parameters,test_neutron_port_fixedips_ipaddress_parameter_doesnt_exist_in_environment_file

+R-39067,vf_module_name,tests.test_server_parameters,test_vf_module_name_parameter_type_and_parameter_name

 R-39402,description,tests.test_heat_template_structure,test_heat_template_structure_contains_description

-R-91342,Base Modules,tests.test_heat_pairs_provided,test_heat_pairs_provided

-R-72871,vf_module_id,tests.test_environment_file_parameters,test_nova_server_vf_module_id_parameter_doesnt_exist_in_environment_file

-R-97199,metadata,tests.test_servers_metadata_use_get_param,test_servers_metadata_use_get_param

-R-85235,"Property: fixed_ips, Map Property: ip_address",tests.test_fixed_ips_include_vm_type_network_role,test_fixed_ips_include_vm_type_network_role

-R-72483,vnf_name,tests.test_servers_have_required_metadata,test_servers_have_required_metadata

-R-71152,Property: image,tests.test_nova_servers_vm_types,test_nova_server_image_parameter

-R-56438,ONAP Heat Orchestration Template Filenames,tests.test_heat_pairs_provided,test_heat_pairs_provided

-R-23664,resources,tests.test_heat_template_structure,test_heat_template_structure_contains_resources

-R-78380,"Property: fixed_ips, Map Property: ip_address",tests.test_fixed_ips_include_vm_type_network_role,test_fixed_ips_include_vm_type_network_role

-R-22288,"Property: fixed_ips, Map Property: subnet_id",tests.test_environment_file_parameters,test_neutron_port_fixedips_subnet_parameter_doesnt_exist_in_environment_file

-R-71577,"Property: fixed_ips, Map Property: ip_address",tests.test_fixed_ips_include_vm_type_network_role,test_fixed_ips_include_vm_type_network_role

-R-37437,vnf_id,tests.test_servers_have_required_metadata,test_servers_have_required_metadata

-R-93030,"Property: fixed_ips, Map Property: ip_address",tests.test_environment_file_parameters,test_neutron_port_fixedips_ipaddress_parameter_doesnt_exist_in_environment_file

-R-87247,Incremental Modules,tests.test_base_template_names,test_base_template_names

+R-39841,"Property: fixed_ips, Map Property: ip_address",tests.test_environment_file_parameters,test_neutron_port_external_fixedips_ipaddress_parameter_doesnt_exist_in_environment_file

+R-40499,Property: flavor,tests.test_nova_servers_resource_ids,test_nova_servers_valid_resource_ids

+R-40971,"Property: fixed_ips, Map Property: ip_address",tests.test_fixed_ips_include_vm_type_network_role,test_fixed_ips_include_vm_type_network_role

+R-41492,"VIP Assignment, External Networks, Supported by Automation",tests.test_allowed_address_pairs_include_vm_type_network_role,test_allowed_address_pairs_include_vm_type_network_role

+R-41888,Heat Files Support (get_file),tests.test_get_file_only_reference_local_files,test_get_file_no_url_retrieval

+R-41956,"VIP Assignment, External Networks, Supported by Automation",tests.test_neutron_port_addresses,test_neutron_port_external_ipaddress_v6

 R-44001,description,tests.test_heat_template_parameters_contain_required_fields,test_heat_template_parameters_contain_required_fields

-R-83418,"VIP Assignment, External Networks, Supported by Automation",tests.test_environment_file_parameters,test_neutron_port_aap_ip_parameter_doesnt_exist_in_environment_file

-R-39841,"Property: fixed_ips, Map Property: ip_address",tests.test_environment_file_parameters,test_neutron_port_fixedips_ipaddress_parameter_doesnt_exist_in_environment_file

-R-44318,vnf_name,tests.test_required_parameters_no_constraints,test_required_parameters_no_constraints

-R-69431,Property: flavor,tests.test_environment_file_parameters,test_nova_server_flavor_parameter_exists_in_environment_file

-R-88863,constraints,tests.test_heat_numeric_parameters,test_numeric_parameter

+R-44318,vnf_name,tests.test_required_parameters_no_constraints,test_vnf_name_parameter_has_no_constraints

+R-45188,Property: flavor,tests.test_nova_servers_vm_types,test_nova_server_flavor_parameter

+R-46128,OS::ContrailV2::InstanceIp,tests.test_contrail_instance_ip_resource_id,test_contrail_instance_ip_resource_id_external

+R-46839,{vm-type},tests.test_vm_type_resource_id,test_vm_type_resource_id

 R-48067,{vm-type},tests.test_nova_servers_vm_types,test_vm_type_network_role_collision

-R-86285,Environment File Format,tests.test_heat_pairs_provided,test_heat_pairs_provided

-R-83677,"Property: fixed_ips, Map Property: subnet_id",tests.test_environment_file_parameters,test_neutron_port_fixedips_subnet_parameter_doesnt_exist_in_environment_file

-R-20453,OS::Neutron::Port,tests.test_port_resource_ids,test_port_resource_ids

-R-16447,resource ID,tests.test_unique_resources_across_all_templates,test_unique_resources_across_all_yaml_files

+R-481670,Property: flavor,tests.test_nova_servers_vm_types_use_get_param,test_vm_type_assignments_on_nova_servers_only_use_get_param

+R-50011,OS::Heat::ResourceGroup Property count,tests.test_environment_file_parameters,test_heat_rg_count_parameter_exists_in_environment_file

 R-50436,Property: flavor,tests.test_nova_servers_vm_types,test_nova_server_flavor_parameter

-R-82732,Cinder Volume Modules,tests.test_volume_outputs_consumed,test_volume_module_name_matches_incremental_or_base_module

-R-69634,"Property: fixed_ips, Map Property: subnet_id",tests.test_environment_file_parameters,test_neutron_port_fixedips_subnet_parameter_doesnt_exist_in_environment_file

-R-40499,Property: flavor,tests.test_nova_servers_resource_ids,test_nova_servers_valid_resource_ids

-R-98374,vf_module_id,tests.test_required_parameters_no_constraints,test_required_parameters_no_constraints

-R-84322,{network-role},tests.test_port_resource_ids,test_port_resource_ids

-R-93496,"Property: fixed_ips, Map Property: ip_address",tests.test_environment_file_parameters,test_neutron_port_fixedips_ipaddress_parameter_doesnt_exist_in_environment_file

-R-20856,vnf_id,tests.test_environment_file_parameters,test_nova_server_vnf_id_parameter_doesnt_exist_in_environment_file

-R-68936,Internal Networks,tests.test_port_resource_ids,test_port_resource_ids

-R-31141,Cinder Volume Modules,tests.test_heat_pairs_provided,test_heat_pairs_provided

-R-98905,"Property: fixed_ips, Map Property: ip_address",tests.test_environment_file_parameters,test_neutron_port_fixedips_ipaddress_parameter_doesnt_exist_in_environment_file

-R-76682,Interface Route Table Prefixes for Contrail InterfaceRoute Table,tests.test_environment_file_parameters,test_contrail_route_prefixes_parameter_doesnt_exist_in_environment_file

-R-62590,"Property: fixed_ips, Map Property: ip_address",tests.test_environment_file_parameters,test_neutron_port_fixedips_ipaddress_parameter_doesnt_exist_in_environment_file

-R-69014,External Networks,tests.test_port_resource_ids,test_port_resource_ids

-R-04747,OS::Heat::CloudConfig,tests.test_cloud_config_resource_id,test_cloud_config

-R-29765,"Property: fixed_ips, Map Property: ip_address",tests.test_fixed_ips_include_vm_type_network_role,test_fixed_ips_include_vm_type_network_role

-R-45188,Property: flavor,tests.test_nova_servers_vm_types,test_nova_server_flavor_parameter

-R-27078,heat_template_version,tests.test_heat_template_structure,test_heat_template_structure_contains_heat_template_version

+R-50468,OS::ContrailV2::VirtualMachineInterface,tests.test_contrail_vmi_resource_id,test_contrail_instance_ip_resource_id_internal

+R-50816,vf_module_index,tests.test_servers_metadata_use_get_param,test_servers_vf_module_index_metadata_use_get_param

+R-511776,ONAP VNF On-Boarding,tests.test_files_in_flat_dir,test_files_in_flat_dir

+R-51430,Property: Name,tests.test_nova_servers_vm_types,test_nova_server_name_parameter

+R-53310,OS::ContrailV2::InstanceIp,tests.test_contrail_instance_ip_resource_id,test_contrail_instance_ip_resource_id_external

 R-53433,ONAP VNF Modularity Overview,tests.test_env_and_yaml_same_name,test_env_and_yaml_same_name

-R-94509,Incremental Modules,tests.test_heat_pairs_provided,test_heat_pairs_provided

-R-26124,default,tests.test_no_unused_parameters_between_env_and_templates,test_no_unused_parameters_between_env_and_templates

-R-87123,"Property: fixed_ips, Map Property: ip_address",tests.test_environment_file_parameters,test_neutron_port_fixedips_ipaddress_parameter_doesnt_exist_in_environment_file

-R-02691,workload_context,tests.test_environment_file_parameters,test_nova_server_workload_context_parameter_doesnt_exist_in_environment_file

+R-53952,type,tests.test_no_http_resources,test_no_http_resources

+R-54171,Property: Name,tests.test_nova_server_name_parameters_start_at_0,test_nova_server_name_parameter_starts_at

+R-54340,vf_module_index,tests.test_server_parameters,test_vf_module_index_parameter_type_and_parameter_name

+R-54458,OS::ContrailV2::VirtualMachineInterface,tests.test_contrail_vmi_resource_id,test_contrail_instance_ip_resource_id_subint

+R-55218,vnf_id,tests.test_required_parameters_no_constraints,test_vnf_id_parameter_has_no_constraints

+R-55306,vf_module_index,tests.test_volume_templates,test_no_vf_module_index_in_cinder

+R-56183,environment_context,tests.test_required_parameters_no_constraints,test_environment_context_parameter_has_no_constraints

+R-56438,ONAP Heat Orchestration Template Filenames,tests.test_heat_pairs_provided,test_heat_pairs_provided

+R-57282,Property: image,tests.test_nova_servers_resource_ids,test_nova_servers_valid_resource_ids

+R-58670,Property: image,tests.test_nova_servers_vm_types,test_nova_server_image_parameter

+R-59568,Property: availability_zone,tests.test_environment_file_parameters,test_nova_server_az_parameter_doesnt_exist_in_environment_file

+R-599443,ONAP Heat Support of Environment Files,tests.test_env_parameters_defined_in_template,test_env_params_are_defined_in_template

+R-60011,Nested Heat Template Requirements,tests.test_nesting_level,test_nesting_level

+R-62187,OS::ContrailV2::InstanceIp,tests.test_contrail_instance_ip_resource_id,test_contrail_instance_ip_resource_id_internal

+R-62428,vnf_name,tests.test_server_parameters,test_vnf_name_parameter_type_and_parameter_name

+R-62590,"Property: fixed_ips, Map Property: ip_address",tests.test_environment_file_parameters,test_neutron_port_external_fixedips_ipaddress_parameter_doesnt_exist_in_environment_file

+R-62802,"Property: fixed_ips, Map Property: subnet",tests.test_neutron_port_fixed_ips,test_neutron_port_external_fixed_ips

 R-62983,Property: network,tests.test_network_format,test_network_format

-R-40971,"Property: fixed_ips, Map Property: ip_address",tests.test_fixed_ips_include_vm_type_network_role,test_fixed_ips_include_vm_type_network_role

-R-00011,constraints,tests.test_nested_parameters,test_nested_parameter

-R-98748,"VIP Assignment, External Networks, Supported by Automation",tests.test_allowed_address_pairs_include_vm_type_network_role,test_allowed_address_pairs_include_vm_type_network_role

-R-34037,"Property: fixed_ips, Map Property: ip_address",tests.test_fixed_ips_include_vm_type_network_role,test_fixed_ips_include_vm_type_network_role

+R-663631,Property: Name,tests.test_nova_servers_vm_types_use_get_param,test_vm_type_assignments_on_nova_servers_only_use_get_param

+R-67231,Environment File Format,tests.test_env_no_resource_registry,test_env_no_resource_registry

+R-67597,vm_role,tests.test_required_parameters_no_constraints,test_vm_role_parameter_has_no_constraints

+R-68023,vf_module_name,tests.test_servers_metadata_use_get_param,test_servers_vf_module_name_metadata_use_get_param

+R-69431,Property: flavor,tests.test_environment_file_parameters,test_nova_server_flavor_parameter_exists_in_environment_file

+R-69634,"Property: fixed_ips, Map Property: subnet",tests.test_environment_file_parameters,test_neutron_port_fixedips_subnet_parameter_doesnt_exist_in_environment_file

+R-70276,Nested Heat file,tests.test_filename_is_vmtype_dot_yaml,test_filename_is_vmtype_dot_yaml

+R-71152,Property: image,tests.test_nova_servers_vm_types,test_nova_server_image_parameter

+R-71493,vf_module_id,tests.test_servers_have_required_metadata,test_servers_have_required_metadata

+R-71577,"Property: fixed_ips, Map Property: ip_address",tests.test_fixed_ips_include_vm_type_network_role,test_fixed_ips_include_vm_type_network_role

+R-71699,type,tests.test_no_http_resources,test_no_http_resources

+R-72483,vnf_name,tests.test_servers_have_required_metadata,test_servers_have_required_metadata

+R-72871,vf_module_id,tests.test_environment_file_parameters,test_nova_server_vf_module_id_parameter_doesnt_exist_in_environment_file

+R-74304,ONAP Heat Orchestration Template Filenames,tests.test_heat_pairs_provided,test_heat_pairs_provided

+R-74978,workload_context,tests.test_nova_servers_workload_context,test_workload_context

+R-75141,resource ID,tests.test_resource_ids_alphanumeric_only,test_alphanumeric_resource_ids_only

+R-76014,OS::ContrailV2::ServiceHealthCheck,tests.test_contrail_resource_id,test_contrail_servicehealthcheck_resource_id

+R-76057,Nested Heat file,tests.test_base_template_names,test_base_template_names

+R-76160,"Property: fixed_ips, Map Property: subnet",tests.test_neutron_port_fixed_ips,test_neutron_port_internal_fixed_ips

+R-76449,"VIP Assignment, External Networks, Supported by Automation",tests.test_forbidden_resources,test_neutron_floating_ip_association_resource_type

+R-76682,Interface Route Table Prefixes for Contrail InterfaceRoute Table,tests.test_environment_file_parameters,test_contrail_route_prefixes_parameter_doesnt_exist_in_environment_file

+R-76718,Heat Files Support (get_file),tests.test_get_file_only_reference_local_files,test_get_file_only_reference_local_files

+R-78380,"Property: fixed_ips, Map Property: ip_address",tests.test_fixed_ips_include_vm_type_network_role,test_fixed_ips_include_vm_type_network_role

+R-80374,vf_module_name,tests.test_environment_file_parameters,test_nova_server_vf_module_name_parameter_doesnt_exist_in_environment_file

+R-80829,"Property: fixed_ips, Map Property: subnet",tests.test_environment_file_parameters,test_neutron_port_fixedips_subnet_parameter_doesnt_exist_in_environment_file

+R-81214,OS::ContrailV2::InterfaceRouteTable,tests.test_contrail_resource_id,test_contrail_interfaceroutetable_resource_id

+R-81339,Base Modules,tests.test_base_template_names,test_base_template_names

+R-81725,ONAP VNF Modularity Overview,tests.test_env_and_yaml_same_name,test_env_and_yaml_same_name

+R-82134,vf_module_id,tests.test_server_parameters,test_vf_module_id_parameter_type_and_parameter_name

+R-82732,Cinder Volume Modules,tests.test_volume_outputs_consumed,test_volume_module_name_matches_incremental_or_base_module

+R-83412,"VIP Assignment, External Networks, Supported by Automation",tests.test_environment_file_parameters,test_neutron_port_aap_ip_parameter_doesnt_exist_in_environment_file

+R-83418,"VIP Assignment, External Networks, Supported by Automation",tests.test_environment_file_parameters,test_neutron_port_aap_ip_parameter_doesnt_exist_in_environment_file

+R-83677,"Property: fixed_ips, Map Property: subnet",tests.test_environment_file_parameters,test_neutron_port_fixedips_subnet_parameter_doesnt_exist_in_environment_file

+R-84123,"Property: fixed_ips, Map Property: subnet",tests.test_neutron_port_fixed_ips,test_neutron_port_internal_fixed_ips

+R-85235,"Property: fixed_ips, Map Property: ip_address",tests.test_fixed_ips_include_vm_type_network_role,test_fixed_ips_include_vm_type_network_role

+R-85734,Resource Property “name”,tests.test_non_server_name,test_non_server_name

+R-86182,Property: network,tests.test_network_format,test_network_format

+R-86285,Environment File Format,tests.test_heat_pairs_provided,test_heat_pairs_provided

+R-87123,"Property: fixed_ips, Map Property: ip_address",tests.test_environment_file_parameters,test_neutron_port_external_fixedips_ipaddress_parameter_doesnt_exist_in_environment_file

+R-87247,Incremental Modules,tests.test_base_template_names,test_base_template_names

+R-87485,ONAP Heat Orchestration Template Filenames,tests.test_base_template_names,test_base_template_names

+R-87563,OS::ContrailV2::InstanceIp,tests.test_contrail_instance_ip_resource_id,test_contrail_instance_ip_resource_id_internal

+R-87817,Property: Name,tests.test_nova_servers_vm_types,test_nova_server_name_parameter

+R-88540,OS::ContrailV2::InstanceIp,tests.test_contrail_instance_ip_resource_id,test_contrail_instance_ip_resource_id_subint

+R-89913,ONAP Volume Module Output Parameters,tests.test_volume_templates_outputs,test_volume_templates_contains_outputs

+R-901331,Property: image,tests.test_nova_servers_vm_types_use_get_param,test_vm_type_assignments_on_nova_servers_only_use_get_param

+R-90152,resources,tests.test_initial_configuration,test_06_heat_template_resource_section_has_resources

+R-90206,"Property: fixed_ips, Map Property: ip_address",tests.test_environment_file_parameters,test_neutron_port_internal_fixedips_ipaddress_parameter_exists_in_environment_file

+R-90279,parameters,tests.test_all_parameters_used_in_template,test_all_parameters_used_in_template

 R-90526,default,tests.test_heat_parameter_section,test_default_values

-R-23503,"Property: fixed_ips, Map Property: ip_address",tests.test_fixed_ips_include_vm_type_network_role,test_fixed_ips_include_vm_type_network_role

-R-13194,environment_context,tests.test_environment_file_parameters,test_nova_server_environment_context_parameter_doesnt_exist_in_environment_file

-R-04697,"Property: fixed_ips, Map Property: ip_address",tests.test_fixed_ips_include_vm_type_network_role,test_fixed_ips_include_vm_type_network_role

-R-28795,"Property: fixed_ips, Map Property: ip_address",tests.test_environment_file_parameters,test_neutron_port_fixedips_ipaddress_parameter_doesnt_exist_in_environment_file

-R-32025,Internal Networks,tests.test_port_resource_ids,test_port_resource_ids

-R-35735,"VIP Assignment, External Networks, Supported by Automation",tests.test_allowed_address_pairs_include_vm_type_network_role,test_allowed_address_pairs_include_vm_type_network_role

-,,tests.test_initial_configuration,test_02_all_referenced_resources_exists

-,,tests.test_initial_configuration,test_02_all_referenced_resources_exists

-,,tests.test_initial_configuration,test_01_valid_nesting

-,,tests.test_initial_configuration,test_01_valid_nesting

-,,tests.test_initial_configuration,test_03_all_get_param_have_defined_parameter

-,,tests.test_initial_configuration,test_03_all_get_param_have_defined_parameter

+R-91125,Property: image,tests.test_environment_file_parameters,test_nova_server_image_parameter_exists_in_environment_file

+R-91342,Base Modules,tests.test_heat_pairs_provided,test_heat_pairs_provided

+R-91810,"VIP Assignment, External Networks, Supported by Automation",tests.test_neutron_port_addresses,test_neutron_port_external_ipaddress

+R-92193,External Networks,tests.test_environment_file_parameters,test_network_fqdn_parameter_doesnt_exist_in_environment_file

+R-92635,ONAP Heat Orchestration Template Format,tests.test_initial_configuration,test_02_no_duplicate_keys_in_file

+R-93030,"Property: fixed_ips, Map Property: ip_address",tests.test_environment_file_parameters,test_neutron_port_external_fixedips_ipaddress_parameter_doesnt_exist_in_environment_file

+R-93177,Property: network,tests.test_network_format_use_get_param_or_get_resource,test_network_format_use_get_param_or_get_resource

+R-93496,"Property: fixed_ips, Map Property: ip_address",tests.test_environment_file_parameters,test_neutron_port_internal_fixedips_ipaddress_parameter_exists_in_environment_file

+R-94509,Incremental Modules,tests.test_heat_pairs_provided,test_heat_pairs_provided

+R-95303,YAML Format,tests.test_get_attr_usage,test_08_validate_get_attr_usage

+R-95430,vm_role,tests.test_server_parameters,test_vm_role_parameter_type_and_parameter_name

+R-96253,OS::ContrailV2::VirtualMachineInterface,tests.test_contrail_vmi_resource_id,test_contrail_instance_ip_resource_id_external

+R-97201,"Property: fixed_ips, Map Property: ip_address",tests.test_environment_file_parameters,test_neutron_port_internal_fixedips_ipaddress_parameter_exists_in_environment_file

+R-98374,vf_module_id,tests.test_required_parameters_no_constraints,test_vf_module_id_parameter_has_no_constraints

+R-98407,{vm-type},tests.test_vm_type_syntax,test_vm_type_syntax

+R-98450,Property: availability_zone,tests.test_availability_zone,test_availability_zone_naming

+R-98569,"Property: fixed_ips, Map Property: ip_address",tests.test_environment_file_parameters,test_neutron_port_internal_fixedips_ipaddress_parameter_exists_in_environment_file

+R-98748,"VIP Assignment, External Networks, Supported by Automation",tests.test_allowed_address_pairs_include_vm_type_network_role,test_allowed_address_pairs_include_vm_type_network_role

+R-98905,"Property: fixed_ips, Map Property: ip_address",tests.test_environment_file_parameters,test_neutron_port_external_fixedips_ipaddress_parameter_doesnt_exist_in_environment_file

+R-99110,OS::ContrailV2::VirtualNetwork,tests.test_contrail_vn_resource_id,test_neutron_net_resource_id

+R-99646,ONAP Heat Orchestration Template Filenames,tests.test_files_in_flat_dir,test_files_in_flat_dir

+R-99812,Resource Property “name”,tests.test_environment_file_parameters,test_non_nova_server_name_parameter_doesnt_exist_in_environment_file

+,,tests.test_initial_configuration,test_03_all_referenced_resources_exists

+,,tests.test_initial_configuration,test_03_all_referenced_resources_exists

+,,tests.test_initial_configuration,test_04_valid_nesting

+,,tests.test_initial_configuration,test_04_valid_nesting

+,,tests.test_initial_configuration,test_05_all_get_param_have_defined_parameter

+,,tests.test_initial_configuration,test_05_all_get_param_have_defined_parameter

 ,,tests.test_nova_servergroup_policies,test_nova_servergroup_policies

 ,,tests.test_nova_servergroup_policies,test_nova_servergroup_policies

-,,tests.test_nova_servers_vm_types_use_get_param,test_vm_type_assignments_on_nova_servers_only_use_get_param

-,,tests.test_nova_servers_vm_types_use_get_param,test_vm_type_assignments_on_nova_servers_only_use_get_param

-,,tests.test_nova_servers_vm_types_use_get_param,test_vm_type_assignments_on_nova_servers_only_use_get_param

-,,tests.test_required_parameters_specified_in_env_files,test_required_parameters_provided_in_env_file

-,,tests.test_required_parameters_specified_in_env_files,test_required_parameters_provided_in_env_file

-,,tests.test_required_parameters_specified_in_env_files,test_required_parameters_provided_in_env_file

-,,tests.test_required_parameters_specified_in_heat_templates,test_required_parameters_provided_in_heat_template

-,,tests.test_required_parameters_specified_in_heat_templates,test_required_parameters_provided_in_heat_template

-,,tests.test_required_parameters_specified_in_heat_templates,test_required_parameters_provided_in_heat_template

-,,tests.test_servers_have_optional_metadata,test_servers_have_optional_metadata

-,,tests.test_servers_have_optional_metadata,test_servers_have_optional_metadata

-,,tests.test_servers_have_optional_metadata,test_servers_have_optional_metadata

-,,tests.test_servers_have_optional_metadata,test_servers_have_optional_metadata

-,,tests.test_servers_have_optional_metadata,test_servers_have_optional_metadata

-,,tests.test_servers_have_optional_metadata,test_servers_have_optional_metadata

-,,tests.test_servers_have_optional_metadata,test_servers_have_optional_metadata

-,,tests.test_subnet_format,test_subnet_format

-,,tests.test_subnet_format,test_subnet_format

-,,tests.test_subnet_format,test_subnet_format

-,,tests.test_subnet_format_use_get_param_or_get_resource,test_subnet_format_use_get_param_or_get_resource

-,,tests.test_subnet_format_use_get_param_or_get_resource,test_subnet_format_use_get_param_or_get_resource

-,,tests.test_subnet_format_use_get_param_or_get_resource,test_subnet_format_use_get_param_or_get_resource

-,,tests.test_unique_name_str_replace_use_params_in_tmpl,test_unique_name_str_replace_use_req_params_in_tmpl

-,,tests.test_unique_name_str_replace_use_params_in_tmpl,test_unique_name_str_replace_use_req_params_in_tmpl

-,,tests.test_unique_name_str_replace_use_req_params,test_unique_name_str_replace_use_req_params

-,,tests.test_unique_name_str_replace_use_req_params,test_unique_name_str_replace_use_req_params

-,,tests.test_unique_resources_across_template,test_unique_resources_across_yaml_file

-,,tests.test_unique_resources_across_template,test_unique_resources_across_yaml_file

-,,tests.test_volume_format_outputs,test_volume_format_outputs

-,,tests.test_volume_format_outputs,test_volume_format_outputs

-,,tests.test_volume_format_outputs,test_volume_format_outputs

+,,tests.test_volume_module_naming,test_detected_volume_module_follows_naming_convention

 ,,tests.test_volume_resource_ids,test_volume_resource_ids

 ,,tests.test_volume_resource_ids,test_volume_resource_ids

 ,,tests.test_volume_resource_ids,test_volume_resource_ids

@@ -169,13 +201,3 @@ R-35735,"VIP Assignment, External Networks, Supported by Automation",tests.test_
 ,,tests.test_volume_resource_ids,test_volume_resource_ids

 ,,tests.test_volume_resource_ids,test_volume_resource_ids

 ,,tests.test_volume_resource_ids,test_volume_resource_ids

-,,tests.test_volume_templates,test_volume_templates_only_contains_cinder

-,,tests.test_volume_templates,test_volume_templates_only_contains_cinder

-,,tests.test_volume_templates_outputs,test_volume_templates_contains_outputs

-,,tests.test_volume_templates_outputs,test_volume_templates_contains_outputs

-,,tests.test_volume_templates_outputs_resources,test_volume_templates_outputs_match_resources

-,,tests.test_volume_templates_outputs_resources,test_volume_templates_outputs_match_resources

-,,tests.test_volume_templates_outputs_resources,test_volume_templates_outputs_match_resources

-,,tests.test_volume_templates_outputs_resources,test_volume_templates_outputs_match_resources

-,,tests.test_volume_templates_outputs_resources,test_volume_templates_outputs_match_resources

-,,tests.test_volume_templates_outputs_resources,test_volume_templates_outputs_match_resources