diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest')
194 files changed, 1436 insertions, 4135 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/GlobalSubstitutionTypesServiceTemplate.yaml index bcfbf4b1c6..0711fb8ecd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -57,29 +57,21 @@ node_types: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -480,29 +472,21 @@ node_types: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -903,29 +887,21 @@ node_types: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -1273,4 +1249,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/MainServiceTemplate.yaml index a5dbe1e17e..81cefe6a97 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/MainServiceTemplate.yaml @@ -205,4 +205,4 @@ topology_template: - packet_internal_network - abstract_pd_server_0 - abstract_pd_server_1 - - abstract_pd_server_2
\ No newline at end of file + - abstract_pd_server_2 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/Nested_pd_server_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/Nested_pd_server_0ServiceTemplate.yaml index b6e941655f..b1f51f3f57 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/Nested_pd_server_0ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/Nested_pd_server_0ServiceTemplate.yaml @@ -51,25 +51,17 @@ topology_template: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -299,4 +291,4 @@ topology_template: - dependency dependency_pd_server: - pd_server - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/Nested_pd_server_1ServiceTemplate.yaml index f60da6f95c..a6d8533b57 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/Nested_pd_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/Nested_pd_server_1ServiceTemplate.yaml @@ -51,25 +51,17 @@ topology_template: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -299,4 +291,4 @@ topology_template: - dependency dependency_pd_server: - pd_server - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/Nested_pd_server_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/Nested_pd_server_2ServiceTemplate.yaml index e049254613..828bcb6145 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/Nested_pd_server_2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/Nested_pd_server_2ServiceTemplate.yaml @@ -51,25 +51,17 @@ topology_template: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -299,4 +291,4 @@ topology_template: - dependency dependency_pd_server: - pd_server - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml index 2235143661..e928f3bde2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -57,29 +57,21 @@ node_types: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -486,29 +478,21 @@ node_types: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -909,29 +893,21 @@ node_types: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -1279,4 +1255,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/MainServiceTemplate.yaml index 3606a517b7..544cc80eae 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/MainServiceTemplate.yaml @@ -196,8 +196,7 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name - port_pd01_port_network_role_tag: - - oam + port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -241,8 +240,7 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name - port_pd01_port_network_role_tag: - - oam + port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -281,8 +279,7 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name - port_pd01_port_network_role_tag: - - oam + port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -303,4 +300,4 @@ topology_template: - network_policy_server - abstract_pd_server_0 - abstract_pd_server_1 - - abstract_pd_server_2
\ No newline at end of file + - abstract_pd_server_2 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/Nested_pd_server_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/Nested_pd_server_0ServiceTemplate.yaml index eeff915f02..8a8b36018e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/Nested_pd_server_0ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/Nested_pd_server_0ServiceTemplate.yaml @@ -51,25 +51,17 @@ topology_template: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -308,4 +300,4 @@ topology_template: - dependency dependency_pd_server: - pd_server - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/Nested_pd_server_1ServiceTemplate.yaml index f60da6f95c..a6d8533b57 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/Nested_pd_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/Nested_pd_server_1ServiceTemplate.yaml @@ -51,25 +51,17 @@ topology_template: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -299,4 +291,4 @@ topology_template: - dependency dependency_pd_server: - pd_server - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/Nested_pd_server_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/Nested_pd_server_2ServiceTemplate.yaml index e049254613..828bcb6145 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/Nested_pd_server_2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/Nested_pd_server_2ServiceTemplate.yaml @@ -51,25 +51,17 @@ topology_template: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -299,4 +291,4 @@ topology_template: - dependency dependency_pd_server: - pd_server - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/GlobalSubstitutionTypesServiceTemplate.yaml index db3a6848a7..0711fb8ecd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -57,29 +57,21 @@ node_types: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -480,29 +472,21 @@ node_types: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -903,29 +887,21 @@ node_types: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/Nested_pd_server_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/Nested_pd_server_0ServiceTemplate.yaml index b6e941655f..b1f51f3f57 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/Nested_pd_server_0ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/Nested_pd_server_0ServiceTemplate.yaml @@ -51,25 +51,17 @@ topology_template: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -299,4 +291,4 @@ topology_template: - dependency dependency_pd_server: - pd_server - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/Nested_pd_server_1ServiceTemplate.yaml index f60da6f95c..a6d8533b57 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/Nested_pd_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/Nested_pd_server_1ServiceTemplate.yaml @@ -51,25 +51,17 @@ topology_template: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -299,4 +291,4 @@ topology_template: - dependency dependency_pd_server: - pd_server - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/Nested_pd_server_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/Nested_pd_server_2ServiceTemplate.yaml index e049254613..828bcb6145 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/Nested_pd_server_2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/Nested_pd_server_2ServiceTemplate.yaml @@ -51,25 +51,17 @@ topology_template: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -299,4 +291,4 @@ topology_template: - dependency dependency_pd_server: - pd_server - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml index f7162f0255..0c89db4fd9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -927,17 +927,13 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_pcm_port_0_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_1_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string availabilityzone_name: type: string description: availabilityzone name @@ -955,29 +951,21 @@ node_types: required: true status: SUPPORTED port_pcm_port_0_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pcm_port_0_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_1_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_0_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string pcm_server_name: type: string description: PCRF CM server name @@ -1002,11 +990,9 @@ node_types: required: true status: SUPPORTED port_pcm_port_1_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string server_group: type: string required: true @@ -1082,11 +1068,9 @@ node_types: required: true status: SUPPORTED port_pcm_port_1_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer attributes: server_pcm_id: type: string @@ -1526,11 +1510,9 @@ node_types: entry_schema: type: string port_1c1_t2_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string vm_flavor_name: type: string required: true @@ -1606,17 +1588,13 @@ node_types: constraints: - greater_or_equal: 0 port_1c1_t2_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c1_t2_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_1c1_t2_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -1628,11 +1606,9 @@ node_types: entry_schema: type: string port_1c1_t2_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c1_t2_port_name: type: list required: true @@ -1656,29 +1632,21 @@ node_types: entry_schema: type: json port_1c1_t1_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c1_t1_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c1_t1_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c1_t1_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer attributes: 1c1_scalling_instance_1c1_t1_port_tenant_id: type: list @@ -2125,21 +2093,17 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_1a_t2_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string vm_flavor_name: type: string required: true status: SUPPORTED port_1a_t2_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1a_t2_port_network: type: list required: true @@ -2157,11 +2121,9 @@ node_types: entry_schema: type: string port_1a_t1_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string vm_image_name: type: string required: true @@ -2203,23 +2165,17 @@ node_types: constraints: - greater_or_equal: 0 port_1a_t1_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1a_t1_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1a_t1_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_1a_t2_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -2231,17 +2187,13 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.VlanRequirements port_1a_t2_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1a_t2_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer compute_a_single_1a_user_data_format: type: list required: true @@ -2687,17 +2639,13 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_1b_t1_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_1b_t1_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t1_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -2717,17 +2665,13 @@ node_types: required: true status: SUPPORTED port_1b_t2_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t2_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer compute_b_single_1b_user_data_format: type: list required: true @@ -2739,17 +2683,13 @@ node_types: required: true status: SUPPORTED port_1b_t2_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t2_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t2_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -2793,17 +2733,13 @@ node_types: entry_schema: type: json port_1b_t1_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t1_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t1_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -3261,11 +3197,9 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_1c2_t2_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer compute_1c2_catalog_instance_availability_zone: type: list required: true @@ -3273,27 +3207,21 @@ node_types: entry_schema: type: string port_1c2_t2_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c2_t2_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string vm_flavor_name: type: string required: true status: SUPPORTED port_1c2_t2_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c2_t1_port_vlan_requirements: type: list required: true @@ -3309,17 +3237,13 @@ node_types: required: true status: SUPPORTED port_1c2_t1_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_1c2_t1_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c2_t2_port_ip_requirements: type: list required: true @@ -3331,11 +3255,9 @@ node_types: required: true status: SUPPORTED port_1c2_t1_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c2_t2_port_network: type: list required: true @@ -3389,11 +3311,9 @@ node_types: entry_schema: type: string port_1c2_t1_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c2_t1_port_ip_requirements: type: list required: true @@ -3835,11 +3755,9 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_1c2_t2_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer compute_1c2_catalog_instance_availability_zone: type: list required: true @@ -3847,27 +3765,21 @@ node_types: entry_schema: type: string port_1c2_t2_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c2_t2_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string vm_flavor_name: type: string required: true status: SUPPORTED port_1c2_t2_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c2_t1_port_vlan_requirements: type: list required: true @@ -3883,17 +3795,13 @@ node_types: required: true status: SUPPORTED port_1c2_t1_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_1c2_t1_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c2_t2_port_ip_requirements: type: list required: true @@ -3905,11 +3813,9 @@ node_types: required: true status: SUPPORTED port_1c2_t1_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c2_t2_port_network: type: list required: true @@ -3957,11 +3863,9 @@ node_types: entry_schema: type: string port_1c2_t1_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c2_t1_port_ip_requirements: type: list required: true @@ -4403,17 +4307,13 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_1b_t1_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_1b_t1_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t1_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -4433,17 +4333,13 @@ node_types: required: true status: SUPPORTED port_1b_t2_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t2_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer compute_b_single_1b_user_data_format: type: list required: true @@ -4455,17 +4351,13 @@ node_types: required: true status: SUPPORTED port_1b_t2_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t2_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t2_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -4503,11 +4395,9 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_1b_t1_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string compute_b_single_1b_metadata: type: list required: true @@ -4515,11 +4405,9 @@ node_types: entry_schema: type: json port_1b_t1_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t1_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/MainServiceTemplate.yaml index 92c22476ae..d7fa0cedf3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/MainServiceTemplate.yaml @@ -166,8 +166,7 @@ topology_template: compute_1c1_scalling_instance_user_data_format: - RAW2 - RAW1 - port_1c1_t2_port_network_role_tag: - - ppds + port_1c1_t2_port_network_role_tag: ppds vm_flavor_name: get_input: pd_flavor_name port_1c1_t1_port_ip_requirements: @@ -410,8 +409,7 @@ topology_template: is_required: false compute_1c2_catalog_instance_user_data_format: - RAW1 - port_1c2_t1_port_network_role_tag: - - oam + port_1c2_t1_port_network_role_tag: oam port_1c2_t1_port_ip_requirements: - ip_version: 4 ip_count_required: @@ -468,8 +466,7 @@ topology_template: - get_attribute: - abstract_1c2_catalog_instance_0 - 1c2_catalog_instance_instance_name - port_1c2_t1_port_network_role_tag: - - oam + port_1c2_t1_port_network_role_tag: oam port_1c2_t1_port_ip_requirements: - ip_version: 4 ip_count_required: @@ -662,8 +659,7 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_1a_t2_port_network_role_tag: - - ppds + port_1a_t2_port_network_role_tag: ppds vm_flavor_name: get_input: pd_flavor_name port_1a_t2_port_network: @@ -901,8 +897,7 @@ topology_template: - get_attribute: - abstract_a_single_1a - a_single_1a_1a_t1_port_tenant_id - port_1b_t1_port_network_role_tag: - - oam + port_1b_t1_port_network_role_tag: oam port_1b_t1_port_mac_requirements: mac_count_required: is_required: false @@ -1037,4 +1032,4 @@ topology_template: name: def affinity: host targets: - - BE_Affinity_group
\ No newline at end of file + - BE_Affinity_group diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c1_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c1_scalling_instanceServiceTemplate.yaml index 5879c89c59..2469e9cb86 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c1_scalling_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c1_scalling_instanceServiceTemplate.yaml @@ -25,10 +25,8 @@ topology_template: entry_schema: type: string port_1c1_t2_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string vm_flavor_name: type: string required: true @@ -91,15 +89,11 @@ topology_template: constraints: - greater_or_equal: 0 port_1c1_t2_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_1c1_t2_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_1c1_t2_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -109,10 +103,8 @@ topology_template: entry_schema: type: string port_1c1_t2_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_1c1_t2_port_name: type: list required: true @@ -132,25 +124,17 @@ topology_template: entry_schema: type: json port_1c1_t1_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_1c1_t1_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_1c1_t1_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_1c1_t1_port_order: - type: list + type: integer required: true - entry_schema: - type: integer node_templates: 1c1_scalling_instance_1c1_t1_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml index 351bfc739e..f09ccb2ad5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml @@ -12,33 +12,25 @@ node_types: topology_template: inputs: port_1c2_t2_port_order: - type: list + type: integer required: true - entry_schema: - type: integer compute_1c2_catalog_instance_availability_zone: type: list required: true entry_schema: type: string port_1c2_t2_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_1c2_t2_port_network_role: - type: list + type: string required: true - entry_schema: - type: string vm_flavor_name: type: string required: true port_1c2_t2_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_1c2_t1_port_vlan_requirements: type: list required: true @@ -51,15 +43,11 @@ topology_template: type: org.openecomp.datatypes.Naming required: true port_1c2_t1_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_1c2_t1_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_1c2_t2_port_ip_requirements: type: list required: true @@ -69,10 +57,8 @@ topology_template: type: org.openecomp.datatypes.network.MacRequirements required: true port_1c2_t1_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_1c2_t2_port_network: type: list required: true @@ -117,10 +103,8 @@ topology_template: entry_schema: type: string port_1c2_t1_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_1c2_t1_port_ip_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml index 22a98f80ad..2872bb61d3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml @@ -12,33 +12,25 @@ node_types: topology_template: inputs: port_1c2_t2_port_order: - type: list + type: integer required: true - entry_schema: - type: integer compute_1c2_catalog_instance_availability_zone: type: list required: true entry_schema: type: string port_1c2_t2_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_1c2_t2_port_network_role: - type: list + type: string required: true - entry_schema: - type: string vm_flavor_name: type: string required: true port_1c2_t2_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_1c2_t1_port_vlan_requirements: type: list required: true @@ -51,15 +43,11 @@ topology_template: type: org.openecomp.datatypes.Naming required: true port_1c2_t1_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_1c2_t1_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_1c2_t2_port_ip_requirements: type: list required: true @@ -69,10 +57,8 @@ topology_template: type: org.openecomp.datatypes.network.MacRequirements required: true port_1c2_t1_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_1c2_t2_port_network: type: list required: true @@ -112,10 +98,8 @@ topology_template: entry_schema: type: string port_1c2_t1_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_1c2_t1_port_ip_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_a_single_1aServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_a_single_1aServiceTemplate.yaml index d2b08144aa..15e3f83de9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_a_single_1aServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_a_single_1aServiceTemplate.yaml @@ -22,18 +22,14 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_1a_t2_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string vm_flavor_name: type: string required: true port_1a_t2_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_1a_t2_port_network: type: list required: true @@ -48,10 +44,8 @@ topology_template: entry_schema: type: string port_1a_t1_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string vm_image_name: type: string required: true @@ -86,20 +80,14 @@ topology_template: constraints: - greater_or_equal: 0 port_1a_t1_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_1a_t1_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_1a_t1_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_1a_t2_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -109,15 +97,11 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.VlanRequirements port_1a_t2_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_1a_t2_port_order: - type: list + type: integer required: true - entry_schema: - type: integer compute_a_single_1a_user_data_format: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_0ServiceTemplate.yaml index 1e323d88b1..6929834c7e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_0ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_0ServiceTemplate.yaml @@ -12,15 +12,11 @@ node_types: topology_template: inputs: port_1b_t1_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_1b_t1_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_1b_t1_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -36,15 +32,11 @@ topology_template: type: string required: true port_1b_t2_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_1b_t2_port_order: - type: list + type: integer required: true - entry_schema: - type: integer compute_b_single_1b_user_data_format: type: list required: true @@ -54,15 +46,11 @@ topology_template: type: org.openecomp.datatypes.Naming required: true port_1b_t2_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_1b_t2_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_1b_t2_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -94,20 +82,16 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_1b_t1_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string compute_b_single_1b_metadata: type: list required: true entry_schema: type: json port_1b_t1_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_1b_t1_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_1ServiceTemplate.yaml index 089fcb545a..d71a80ab5c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_1ServiceTemplate.yaml @@ -12,15 +12,11 @@ node_types: topology_template: inputs: port_1b_t1_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_1b_t1_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_1b_t1_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -36,15 +32,11 @@ topology_template: type: string required: true port_1b_t2_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_1b_t2_port_order: - type: list + type: integer required: true - entry_schema: - type: integer compute_b_single_1b_user_data_format: type: list required: true @@ -54,15 +46,11 @@ topology_template: type: org.openecomp.datatypes.Naming required: true port_1b_t2_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_1b_t2_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_1b_t2_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -99,15 +87,11 @@ topology_template: entry_schema: type: json port_1b_t1_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_1b_t1_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_1b_t1_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-pcm_v0.1ServiceTemplate.yaml index f96fc7e5b9..0b0de807b9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -12,15 +12,11 @@ node_types: topology_template: inputs: port_pcm_port_0_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_1_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string availabilityzone_name: label: availabilityzone name hidden: false @@ -39,25 +35,17 @@ topology_template: type: string description: PCRF CM image name port_pcm_port_0_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pcm_port_0_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_1_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_0_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string pcm_server_name: label: PCRF CM server name hidden: false @@ -83,10 +71,8 @@ topology_template: type: string description: OAM network name port_pcm_port_1_network_role: - type: list + type: string required: true - entry_schema: - type: string server_group: hidden: false immutable: false @@ -165,10 +151,8 @@ topology_template: type: string description: CPS network mask port_pcm_port_1_order: - type: list + type: integer required: true - entry_schema: - type: integer node_templates: pcm_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml index cd7dff0688..ed4765e621 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -923,17 +923,13 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_pcm_port_0_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_1_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string availabilityzone_name: type: string description: availabilityzone name @@ -951,29 +947,21 @@ node_types: required: true status: SUPPORTED port_pcm_port_0_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pcm_port_0_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_1_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_0_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string pcm_server_name: type: string description: PCRF CM server name @@ -998,11 +986,9 @@ node_types: required: true status: SUPPORTED port_pcm_port_1_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string server_group: type: string required: true @@ -1074,11 +1060,9 @@ node_types: required: true status: SUPPORTED port_pcm_port_1_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer attributes: server_pcm_id: type: string @@ -1518,11 +1502,9 @@ node_types: entry_schema: type: string port_1c1_t2_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string vm_flavor_name: type: string required: true @@ -1598,17 +1580,13 @@ node_types: constraints: - greater_or_equal: 0 port_1c1_t2_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c1_t2_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_1c1_t2_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -1620,11 +1598,9 @@ node_types: entry_schema: type: string port_1c1_t2_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c1_t2_port_name: type: list required: true @@ -1642,29 +1618,21 @@ node_types: required: true status: SUPPORTED port_1c1_t1_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c1_t1_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c1_t1_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c1_t1_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer attributes: 1c1_scalling_instance_instance_name: type: list @@ -2100,21 +2068,17 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_1a_t2_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string vm_flavor_name: type: string required: true status: SUPPORTED port_1a_t2_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1a_t2_port_network: type: list required: true @@ -2132,11 +2096,9 @@ node_types: entry_schema: type: string port_1a_t1_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string vm_image_name: type: string required: true @@ -2178,23 +2140,17 @@ node_types: constraints: - greater_or_equal: 0 port_1a_t1_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1a_t1_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1a_t1_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_1a_t2_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -2206,17 +2162,13 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.VlanRequirements port_1a_t2_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1a_t2_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer compute_a_single_1a_user_data_format: type: list required: true @@ -2662,17 +2614,13 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_1b_t1_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_1b_t1_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t1_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -2692,17 +2640,13 @@ node_types: required: true status: SUPPORTED port_1b_t2_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t2_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer compute_b_single_1b_user_data_format: type: list required: true @@ -2714,17 +2658,13 @@ node_types: required: true status: SUPPORTED port_1b_t2_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t2_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t2_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -2762,17 +2702,13 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_1b_t1_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t1_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t1_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -3230,11 +3166,9 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_1c2_t2_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer compute_1c2_catalog_instance_availability_zone: type: list required: true @@ -3242,27 +3176,21 @@ node_types: entry_schema: type: string port_1c2_t2_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c2_t2_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string vm_flavor_name: type: string required: true status: SUPPORTED port_1c2_t2_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c2_t1_port_vlan_requirements: type: list required: true @@ -3278,17 +3206,13 @@ node_types: required: true status: SUPPORTED port_1c2_t1_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_1c2_t1_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c2_t2_port_ip_requirements: type: list required: true @@ -3300,11 +3224,9 @@ node_types: required: true status: SUPPORTED port_1c2_t1_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c2_t2_port_network: type: list required: true @@ -3352,11 +3274,9 @@ node_types: entry_schema: type: string port_1c2_t1_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c2_t1_port_ip_requirements: type: list required: true @@ -3798,11 +3718,9 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_1c2_t2_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer compute_1c2_catalog_instance_availability_zone: type: list required: true @@ -3810,27 +3728,21 @@ node_types: entry_schema: type: string port_1c2_t2_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c2_t2_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string vm_flavor_name: type: string required: true status: SUPPORTED port_1c2_t2_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c2_t1_port_vlan_requirements: type: list required: true @@ -3846,17 +3758,13 @@ node_types: required: true status: SUPPORTED port_1c2_t1_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_1c2_t1_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c2_t2_port_ip_requirements: type: list required: true @@ -3868,11 +3776,9 @@ node_types: required: true status: SUPPORTED port_1c2_t1_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c2_t2_port_network: type: list required: true @@ -3920,11 +3826,9 @@ node_types: entry_schema: type: string port_1c2_t1_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c2_t1_port_ip_requirements: type: list required: true @@ -4453,11 +4357,9 @@ node_types: entry_schema: type: json port_1b_t1_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_1b_t2_port_vlan_requirements: type: list required: true @@ -4471,11 +4373,9 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_1b_t1_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t1_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -4485,11 +4385,9 @@ node_types: required: true status: SUPPORTED port_1b_t1_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t1_port_ip_requirements: type: list required: true @@ -4501,11 +4399,9 @@ node_types: required: true status: SUPPORTED port_1b_t1_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t1_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -4517,17 +4413,13 @@ node_types: entry_schema: type: string port_1b_t2_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t2_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_1b_t1_port_vlan_requirements: type: list required: true @@ -4551,17 +4443,13 @@ node_types: entry_schema: type: string port_1b_t2_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t2_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string attributes: b_single_1b_instance_name: type: list diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml index f165f9dab4..a3c2dfd6b8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml @@ -138,8 +138,7 @@ topology_template: compute_1c1_scalling_instance_user_data_format: - RAW2 - RAW1 - port_1c1_t2_port_network_role_tag: - - ppds + port_1c1_t2_port_network_role_tag: ppds vm_flavor_name: get_input: pd_flavor_name port_1c1_t1_port_ip_requirements: @@ -315,8 +314,7 @@ topology_template: is_required: false compute_1c2_catalog_instance_user_data_format: - RAW1 - port_1c2_t1_port_network_role_tag: - - oam + port_1c2_t1_port_network_role_tag: oam port_1c2_t1_port_ip_requirements: - ip_version: 4 ip_count_required: @@ -377,8 +375,7 @@ topology_template: - get_attribute: - abstract_1c2_catalog_instance_0 - 1c2_catalog_instance_instance_name - port_1c2_t1_port_network_role_tag: - - oam + port_1c2_t1_port_network_role_tag: oam port_1c2_t1_port_ip_requirements: - ip_version: 4 ip_count_required: @@ -589,8 +586,7 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_1a_t2_port_network_role_tag: - - ppds + port_1a_t2_port_network_role_tag: ppds vm_flavor_name: get_input: pd_flavor_name port_1a_t2_port_network: @@ -800,8 +796,7 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_1b_t1_port_network_role_tag: - - oam + port_1b_t1_port_network_role_tag: oam port_1b_t1_port_mac_requirements: mac_count_required: is_required: false @@ -943,4 +938,4 @@ topology_template: name: def affinity: host targets: - - BE_Affinity_group
\ No newline at end of file + - BE_Affinity_group diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c1_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c1_scalling_instanceServiceTemplate.yaml index fae0d4871a..e318ce1578 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c1_scalling_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c1_scalling_instanceServiceTemplate.yaml @@ -25,10 +25,8 @@ topology_template: entry_schema: type: string port_1c1_t2_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string vm_flavor_name: type: string required: true @@ -91,15 +89,11 @@ topology_template: constraints: - greater_or_equal: 0 port_1c1_t2_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_1c1_t2_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_1c1_t2_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -109,10 +103,8 @@ topology_template: entry_schema: type: string port_1c1_t2_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_1c1_t2_port_name: type: list required: true @@ -127,25 +119,17 @@ topology_template: type: org.openecomp.datatypes.Naming required: true port_1c1_t1_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_1c1_t1_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_1c1_t1_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_1c1_t1_port_order: - type: list + type: integer required: true - entry_schema: - type: integer node_templates: 1c1_scalling_instance_1c1_t1_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml index fd0276496e..a658c2b03c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml @@ -12,33 +12,25 @@ node_types: topology_template: inputs: port_1c2_t2_port_order: - type: list + type: integer required: true - entry_schema: - type: integer compute_1c2_catalog_instance_availability_zone: type: list required: true entry_schema: type: string port_1c2_t2_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_1c2_t2_port_network_role: - type: list + type: string required: true - entry_schema: - type: string vm_flavor_name: type: string required: true port_1c2_t2_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_1c2_t1_port_vlan_requirements: type: list required: true @@ -51,15 +43,11 @@ topology_template: type: org.openecomp.datatypes.Naming required: true port_1c2_t1_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_1c2_t1_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_1c2_t2_port_ip_requirements: type: list required: true @@ -69,10 +57,8 @@ topology_template: type: org.openecomp.datatypes.network.MacRequirements required: true port_1c2_t1_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_1c2_t2_port_network: type: list required: true @@ -112,10 +98,8 @@ topology_template: entry_schema: type: string port_1c2_t1_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_1c2_t1_port_ip_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml index 22a98f80ad..2872bb61d3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml @@ -12,33 +12,25 @@ node_types: topology_template: inputs: port_1c2_t2_port_order: - type: list + type: integer required: true - entry_schema: - type: integer compute_1c2_catalog_instance_availability_zone: type: list required: true entry_schema: type: string port_1c2_t2_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_1c2_t2_port_network_role: - type: list + type: string required: true - entry_schema: - type: string vm_flavor_name: type: string required: true port_1c2_t2_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_1c2_t1_port_vlan_requirements: type: list required: true @@ -51,15 +43,11 @@ topology_template: type: org.openecomp.datatypes.Naming required: true port_1c2_t1_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_1c2_t1_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_1c2_t2_port_ip_requirements: type: list required: true @@ -69,10 +57,8 @@ topology_template: type: org.openecomp.datatypes.network.MacRequirements required: true port_1c2_t1_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_1c2_t2_port_network: type: list required: true @@ -112,10 +98,8 @@ topology_template: entry_schema: type: string port_1c2_t1_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_1c2_t1_port_ip_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_a_single_1aServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_a_single_1aServiceTemplate.yaml index 595d5d01a0..9730b31935 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_a_single_1aServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_a_single_1aServiceTemplate.yaml @@ -17,18 +17,14 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_1a_t2_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string vm_flavor_name: type: string required: true port_1a_t2_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_1a_t2_port_network: type: list required: true @@ -43,10 +39,8 @@ topology_template: entry_schema: type: string port_1a_t1_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string vm_image_name: type: string required: true @@ -81,20 +75,14 @@ topology_template: constraints: - greater_or_equal: 0 port_1a_t1_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_1a_t1_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_1a_t1_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_1a_t2_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -104,15 +92,11 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.VlanRequirements port_1a_t2_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_1a_t2_port_order: - type: list + type: integer required: true - entry_schema: - type: integer compute_a_single_1a_user_data_format: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_0ServiceTemplate.yaml index 28a98f316f..5c28d30768 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_0ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_0ServiceTemplate.yaml @@ -32,10 +32,8 @@ topology_template: entry_schema: type: json port_1b_t1_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_1b_t2_port_vlan_requirements: type: list required: true @@ -47,10 +45,8 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_1b_t1_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_1b_t1_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -58,10 +54,8 @@ topology_template: type: string required: true port_1b_t1_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_1b_t1_port_ip_requirements: type: list required: true @@ -71,10 +65,8 @@ topology_template: type: string required: true port_1b_t1_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_1b_t1_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -84,15 +76,11 @@ topology_template: entry_schema: type: string port_1b_t2_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_1b_t2_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_1b_t1_port_vlan_requirements: type: list required: true @@ -112,15 +100,11 @@ topology_template: entry_schema: type: string port_1b_t2_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_1b_t2_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string node_templates: b_single_1b: type: org.openecomp.resource.vfc.nodes.heat.b_single_1b diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_1ServiceTemplate.yaml index 35b6ab9b4a..85181a63a8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_1ServiceTemplate.yaml @@ -12,15 +12,11 @@ node_types: topology_template: inputs: port_1b_t1_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_1b_t1_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_1b_t1_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -36,15 +32,11 @@ topology_template: type: string required: true port_1b_t2_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_1b_t2_port_order: - type: list + type: integer required: true - entry_schema: - type: integer compute_b_single_1b_user_data_format: type: list required: true @@ -54,15 +46,11 @@ topology_template: type: org.openecomp.datatypes.Naming required: true port_1b_t2_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_1b_t2_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_1b_t2_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -94,15 +82,11 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_1b_t1_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_1b_t1_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_1b_t1_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-pcm_v0.1ServiceTemplate.yaml index 973ca85b4d..6f2b5a7ca4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -12,15 +12,11 @@ node_types: topology_template: inputs: port_pcm_port_0_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_1_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string availabilityzone_name: label: availabilityzone name hidden: false @@ -39,25 +35,17 @@ topology_template: type: string description: PCRF CM image name port_pcm_port_0_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pcm_port_0_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_1_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_0_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string pcm_server_name: label: PCRF CM server name hidden: false @@ -83,10 +71,8 @@ topology_template: type: string description: OAM network name port_pcm_port_1_network_role: - type: list + type: string required: true - entry_schema: - type: string server_group: hidden: false immutable: false @@ -161,10 +147,8 @@ topology_template: type: string description: CPS network mask port_pcm_port_1_order: - type: list + type: integer required: true - entry_schema: - type: integer node_templates: pcm_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml index 958930407c..cb3099c891 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -923,17 +923,13 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_pcm_port_0_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_1_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string availabilityzone_name: type: string description: availabilityzone name @@ -951,29 +947,21 @@ node_types: required: true status: SUPPORTED port_pcm_port_0_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pcm_port_0_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_1_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_0_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string pcm_server_name: type: string description: PCRF CM server name @@ -998,11 +986,9 @@ node_types: required: true status: SUPPORTED port_pcm_port_1_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string server_group: type: string required: true @@ -1074,11 +1060,9 @@ node_types: required: true status: SUPPORTED port_pcm_port_1_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer attributes: server_pcm_id: type: string @@ -1518,11 +1502,9 @@ node_types: entry_schema: type: string port_1c1_t2_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string vm_flavor_name: type: string required: true @@ -1598,17 +1580,13 @@ node_types: constraints: - greater_or_equal: 0 port_1c1_t2_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c1_t2_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_1c1_t2_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -1620,11 +1598,9 @@ node_types: entry_schema: type: string port_1c1_t2_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c1_t2_port_name: type: list required: true @@ -1642,29 +1618,21 @@ node_types: required: true status: SUPPORTED port_1c1_t1_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c1_t1_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c1_t1_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c1_t1_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer attributes: 1c1_scalling_instance_instance_name: type: list @@ -2100,21 +2068,17 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_1a_t2_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string vm_flavor_name: type: string required: true status: SUPPORTED port_1a_t2_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1a_t2_port_network: type: list required: true @@ -2132,11 +2096,9 @@ node_types: entry_schema: type: string port_1a_t1_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string vm_image_name: type: string required: true @@ -2178,23 +2140,17 @@ node_types: constraints: - greater_or_equal: 0 port_1a_t1_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1a_t1_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1a_t1_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_1a_t2_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -2206,17 +2162,13 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.VlanRequirements port_1a_t2_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1a_t2_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer compute_a_single_1a_user_data_format: type: list required: true @@ -2662,17 +2614,13 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_1b_t1_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_1b_t1_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t1_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -2692,17 +2640,13 @@ node_types: required: true status: SUPPORTED port_1b_t2_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t2_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer compute_b_single_1b_user_data_format: type: list required: true @@ -2714,17 +2658,13 @@ node_types: required: true status: SUPPORTED port_1b_t2_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t2_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t2_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -2762,17 +2702,13 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_1b_t1_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t1_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t1_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -3230,11 +3166,9 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_1c2_t2_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer compute_1c2_catalog_instance_availability_zone: type: list required: true @@ -3242,27 +3176,21 @@ node_types: entry_schema: type: string port_1c2_t2_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c2_t2_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string vm_flavor_name: type: string required: true status: SUPPORTED port_1c2_t2_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c2_t1_port_vlan_requirements: type: list required: true @@ -3278,17 +3206,13 @@ node_types: required: true status: SUPPORTED port_1c2_t1_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_1c2_t1_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c2_t2_port_ip_requirements: type: list required: true @@ -3300,11 +3224,9 @@ node_types: required: true status: SUPPORTED port_1c2_t1_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c2_t2_port_network: type: list required: true @@ -3352,11 +3274,9 @@ node_types: entry_schema: type: string port_1c2_t1_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c2_t1_port_ip_requirements: type: list required: true @@ -3798,11 +3718,9 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_1c2_t2_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer compute_1c2_catalog_instance_availability_zone: type: list required: true @@ -3810,27 +3728,21 @@ node_types: entry_schema: type: string port_1c2_t2_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c2_t2_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string vm_flavor_name: type: string required: true status: SUPPORTED port_1c2_t2_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c2_t1_port_vlan_requirements: type: list required: true @@ -3846,17 +3758,13 @@ node_types: required: true status: SUPPORTED port_1c2_t1_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_1c2_t1_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c2_t2_port_ip_requirements: type: list required: true @@ -3868,11 +3776,9 @@ node_types: required: true status: SUPPORTED port_1c2_t1_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c2_t2_port_network: type: list required: true @@ -3920,11 +3826,9 @@ node_types: entry_schema: type: string port_1c2_t1_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c2_t1_port_ip_requirements: type: list required: true @@ -4390,11 +4294,9 @@ node_types: entry_schema: type: json port_1b_t1_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_1b_t2_port_vlan_requirements: type: list required: true @@ -4408,11 +4310,9 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_1b_t1_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t1_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -4422,11 +4322,9 @@ node_types: required: true status: SUPPORTED port_1b_t1_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t1_port_ip_requirements: type: list required: true @@ -4438,11 +4336,9 @@ node_types: required: true status: SUPPORTED port_1b_t1_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t1_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -4454,17 +4350,13 @@ node_types: entry_schema: type: string port_1b_t2_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t2_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_1b_t1_port_vlan_requirements: type: list required: true @@ -4488,17 +4380,13 @@ node_types: entry_schema: type: string port_1b_t2_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t2_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string attributes: b_single_1b_instance_name: type: list diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml index 2b3b7f6275..286c01ca77 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml @@ -134,8 +134,7 @@ topology_template: compute_1c1_scalling_instance_user_data_format: - RAW2 - RAW1 - port_1c1_t2_port_network_role_tag: - - ppds + port_1c1_t2_port_network_role_tag: ppds vm_flavor_name: get_input: pd_flavor_name port_1c1_t1_port_ip_requirements: @@ -294,8 +293,7 @@ topology_template: is_required: false compute_1c2_catalog_instance_user_data_format: - RAW1 - port_1c2_t1_port_network_role_tag: - - oam + port_1c2_t1_port_network_role_tag: oam port_1c2_t1_port_ip_requirements: - ip_version: 4 ip_count_required: @@ -352,8 +350,7 @@ topology_template: - get_attribute: - abstract_1c2_catalog_instance_0 - 1c2_catalog_instance_instance_name - port_1c2_t1_port_network_role_tag: - - oam + port_1c2_t1_port_network_role_tag: oam port_1c2_t1_port_ip_requirements: - ip_version: 4 ip_count_required: @@ -510,8 +507,7 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_1a_t2_port_network_role_tag: - - ppds + port_1a_t2_port_network_role_tag: ppds vm_flavor_name: get_input: pd_flavor_name port_1a_t2_port_network: @@ -713,8 +709,7 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_1b_t1_port_network_role_tag: - - oam + port_1b_t1_port_network_role_tag: oam port_1b_t1_port_mac_requirements: mac_count_required: is_required: false @@ -849,4 +844,4 @@ topology_template: name: def affinity: host targets: - - BE_Affinity_group
\ No newline at end of file + - BE_Affinity_group diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml index fae0d4871a..e318ce1578 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml @@ -25,10 +25,8 @@ topology_template: entry_schema: type: string port_1c1_t2_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string vm_flavor_name: type: string required: true @@ -91,15 +89,11 @@ topology_template: constraints: - greater_or_equal: 0 port_1c1_t2_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_1c1_t2_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_1c1_t2_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -109,10 +103,8 @@ topology_template: entry_schema: type: string port_1c1_t2_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_1c1_t2_port_name: type: list required: true @@ -127,25 +119,17 @@ topology_template: type: org.openecomp.datatypes.Naming required: true port_1c1_t1_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_1c1_t1_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_1c1_t1_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_1c1_t1_port_order: - type: list + type: integer required: true - entry_schema: - type: integer node_templates: 1c1_scalling_instance_1c1_t1_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml index fd0276496e..a658c2b03c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml @@ -12,33 +12,25 @@ node_types: topology_template: inputs: port_1c2_t2_port_order: - type: list + type: integer required: true - entry_schema: - type: integer compute_1c2_catalog_instance_availability_zone: type: list required: true entry_schema: type: string port_1c2_t2_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_1c2_t2_port_network_role: - type: list + type: string required: true - entry_schema: - type: string vm_flavor_name: type: string required: true port_1c2_t2_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_1c2_t1_port_vlan_requirements: type: list required: true @@ -51,15 +43,11 @@ topology_template: type: org.openecomp.datatypes.Naming required: true port_1c2_t1_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_1c2_t1_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_1c2_t2_port_ip_requirements: type: list required: true @@ -69,10 +57,8 @@ topology_template: type: org.openecomp.datatypes.network.MacRequirements required: true port_1c2_t1_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_1c2_t2_port_network: type: list required: true @@ -112,10 +98,8 @@ topology_template: entry_schema: type: string port_1c2_t1_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_1c2_t1_port_ip_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml index 22a98f80ad..2872bb61d3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml @@ -12,33 +12,25 @@ node_types: topology_template: inputs: port_1c2_t2_port_order: - type: list + type: integer required: true - entry_schema: - type: integer compute_1c2_catalog_instance_availability_zone: type: list required: true entry_schema: type: string port_1c2_t2_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_1c2_t2_port_network_role: - type: list + type: string required: true - entry_schema: - type: string vm_flavor_name: type: string required: true port_1c2_t2_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_1c2_t1_port_vlan_requirements: type: list required: true @@ -51,15 +43,11 @@ topology_template: type: org.openecomp.datatypes.Naming required: true port_1c2_t1_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_1c2_t1_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_1c2_t2_port_ip_requirements: type: list required: true @@ -69,10 +57,8 @@ topology_template: type: org.openecomp.datatypes.network.MacRequirements required: true port_1c2_t1_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_1c2_t2_port_network: type: list required: true @@ -112,10 +98,8 @@ topology_template: entry_schema: type: string port_1c2_t1_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_1c2_t1_port_ip_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_a_single_1aServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_a_single_1aServiceTemplate.yaml index 595d5d01a0..9730b31935 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_a_single_1aServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_a_single_1aServiceTemplate.yaml @@ -17,18 +17,14 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_1a_t2_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string vm_flavor_name: type: string required: true port_1a_t2_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_1a_t2_port_network: type: list required: true @@ -43,10 +39,8 @@ topology_template: entry_schema: type: string port_1a_t1_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string vm_image_name: type: string required: true @@ -81,20 +75,14 @@ topology_template: constraints: - greater_or_equal: 0 port_1a_t1_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_1a_t1_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_1a_t1_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_1a_t2_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -104,15 +92,11 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.VlanRequirements port_1a_t2_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_1a_t2_port_order: - type: list + type: integer required: true - entry_schema: - type: integer compute_a_single_1a_user_data_format: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_0ServiceTemplate.yaml index 28a98f316f..5c28d30768 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_0ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_0ServiceTemplate.yaml @@ -32,10 +32,8 @@ topology_template: entry_schema: type: json port_1b_t1_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_1b_t2_port_vlan_requirements: type: list required: true @@ -47,10 +45,8 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_1b_t1_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_1b_t1_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -58,10 +54,8 @@ topology_template: type: string required: true port_1b_t1_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_1b_t1_port_ip_requirements: type: list required: true @@ -71,10 +65,8 @@ topology_template: type: string required: true port_1b_t1_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_1b_t1_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -84,15 +76,11 @@ topology_template: entry_schema: type: string port_1b_t2_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_1b_t2_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_1b_t1_port_vlan_requirements: type: list required: true @@ -112,15 +100,11 @@ topology_template: entry_schema: type: string port_1b_t2_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_1b_t2_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string node_templates: b_single_1b: type: org.openecomp.resource.vfc.nodes.heat.b_single_1b diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_1ServiceTemplate.yaml index 35b6ab9b4a..85181a63a8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_1ServiceTemplate.yaml @@ -12,15 +12,11 @@ node_types: topology_template: inputs: port_1b_t1_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_1b_t1_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_1b_t1_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -36,15 +32,11 @@ topology_template: type: string required: true port_1b_t2_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_1b_t2_port_order: - type: list + type: integer required: true - entry_schema: - type: integer compute_b_single_1b_user_data_format: type: list required: true @@ -54,15 +46,11 @@ topology_template: type: org.openecomp.datatypes.Naming required: true port_1b_t2_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_1b_t2_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_1b_t2_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -94,15 +82,11 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_1b_t1_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_1b_t1_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_1b_t1_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-pcm_v0.1ServiceTemplate.yaml index 973ca85b4d..6f2b5a7ca4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -12,15 +12,11 @@ node_types: topology_template: inputs: port_pcm_port_0_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_1_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string availabilityzone_name: label: availabilityzone name hidden: false @@ -39,25 +35,17 @@ topology_template: type: string description: PCRF CM image name port_pcm_port_0_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pcm_port_0_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_1_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_0_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string pcm_server_name: label: PCRF CM server name hidden: false @@ -83,10 +71,8 @@ topology_template: type: string description: OAM network name port_pcm_port_1_network_role: - type: list + type: string required: true - entry_schema: - type: string server_group: hidden: false immutable: false @@ -161,10 +147,8 @@ topology_template: type: string description: CPS network mask port_pcm_port_1_order: - type: list + type: integer required: true - entry_schema: - type: integer node_templates: pcm_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml index 2f8d03a1f8..4dbd5cfbb6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -993,23 +993,17 @@ node_types: entry_schema: type: string port_1c1_t1_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c1_t1_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c1_t1_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string compute_1c12_scalling_instance_availability_zone: type: list required: true @@ -1023,11 +1017,9 @@ node_types: entry_schema: type: string port_1c1_t1_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer attributes: 1c12_scalling_instance_1c1_t1_port_tenant_id: type: list @@ -1451,23 +1443,17 @@ node_types: entry_schema: type: json port_1c1_t1_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c1_t1_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c1_t1_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c1_t1_port_network: type: list required: true @@ -1475,11 +1461,9 @@ node_types: entry_schema: type: string port_1c1_t1_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer attributes: 1c11_scalling_instance_instance_name: type: list @@ -1831,17 +1815,13 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_pcm_port_0_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_1_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string availabilityzone_name: type: string description: availabilityzone name @@ -1859,29 +1839,21 @@ node_types: required: true status: SUPPORTED port_pcm_port_0_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pcm_port_0_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_1_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_0_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string pcm_server_name: type: string description: PCRF CM server name @@ -1906,11 +1878,9 @@ node_types: required: true status: SUPPORTED port_pcm_port_1_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string server_group: type: string required: true @@ -1986,11 +1956,9 @@ node_types: required: true status: SUPPORTED port_pcm_port_1_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer attributes: server_pcm_id: type: string @@ -2438,17 +2406,13 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_1a_t1_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1a_t1_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string compute_a_single_2a_scheduler_hints: type: list required: true @@ -2456,11 +2420,9 @@ node_types: entry_schema: type: json port_1a_t1_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer compute_a_single_2a_availability_zone: type: list required: true @@ -2482,11 +2444,9 @@ node_types: entry_schema: type: string port_1a_t1_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string compute_a_single_2a_name: type: list required: true @@ -2855,11 +2815,9 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_1c2_t2_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer compute_1c2_catalog_instance_availability_zone: type: list required: true @@ -2867,27 +2825,21 @@ node_types: entry_schema: type: string port_1c2_t2_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c2_t2_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string vm_flavor_name: type: string required: true status: SUPPORTED port_1c2_t2_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c2_t1_port_vlan_requirements: type: list required: true @@ -2903,17 +2855,13 @@ node_types: required: true status: SUPPORTED port_1c2_t1_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_1c2_t1_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c2_t2_port_ip_requirements: type: list required: true @@ -2925,11 +2873,9 @@ node_types: required: true status: SUPPORTED port_1c2_t1_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c2_t2_port_network: type: list required: true @@ -2977,11 +2923,9 @@ node_types: entry_schema: type: string port_1c2_t1_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c2_t1_port_ip_requirements: type: list required: true @@ -3430,21 +3374,17 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_1a_t2_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string vm_flavor_name: type: string required: true status: SUPPORTED port_1a_t2_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1a_t2_port_network: type: list required: true @@ -3462,11 +3402,9 @@ node_types: entry_schema: type: string port_1a_t1_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string vm_image_name: type: string required: true @@ -3508,23 +3446,17 @@ node_types: constraints: - greater_or_equal: 0 port_1a_t1_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1a_t1_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1a_t1_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_1a_t2_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -3536,17 +3468,13 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.VlanRequirements port_1a_t2_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1a_t2_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer compute_a_single_1a_user_data_format: type: list required: true @@ -3992,11 +3920,9 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_1c2_t2_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer compute_1c2_catalog_instance_availability_zone: type: list required: true @@ -4004,27 +3930,21 @@ node_types: entry_schema: type: string port_1c2_t2_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c2_t2_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string vm_flavor_name: type: string required: true status: SUPPORTED port_1c2_t2_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c2_t1_port_vlan_requirements: type: list required: true @@ -4040,17 +3960,13 @@ node_types: required: true status: SUPPORTED port_1c2_t1_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_1c2_t1_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c2_t2_port_ip_requirements: type: list required: true @@ -4062,11 +3978,9 @@ node_types: required: true status: SUPPORTED port_1c2_t1_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c2_t2_port_network: type: list required: true @@ -4114,11 +4028,9 @@ node_types: entry_schema: type: string port_1c2_t1_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c2_t1_port_ip_requirements: type: list required: true @@ -4560,17 +4472,13 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_1b_t1_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_1b_t1_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t1_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -4590,17 +4498,13 @@ node_types: required: true status: SUPPORTED port_1b_t2_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t2_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer compute_b_single_1b_user_data_format: type: list required: true @@ -4612,17 +4516,13 @@ node_types: required: true status: SUPPORTED port_1b_t2_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t2_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t2_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -4660,11 +4560,9 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_1b_t1_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string compute_b_single_1b_metadata: type: list required: true @@ -4672,11 +4570,9 @@ node_types: entry_schema: type: json port_1b_t1_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t1_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -5128,11 +5024,9 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_1c2_t2_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer compute_1c2_catalog_instance_availability_zone: type: list required: true @@ -5140,27 +5034,21 @@ node_types: entry_schema: type: string port_1c2_t2_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c2_t2_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string vm_flavor_name: type: string required: true status: SUPPORTED port_1c2_t2_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c2_t1_port_vlan_requirements: type: list required: true @@ -5176,17 +5064,13 @@ node_types: required: true status: SUPPORTED port_1c2_t1_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_1c2_t1_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c2_t2_port_ip_requirements: type: list required: true @@ -5198,11 +5082,9 @@ node_types: required: true status: SUPPORTED port_1c2_t1_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c2_t2_port_network: type: list required: true @@ -5256,11 +5138,9 @@ node_types: entry_schema: type: string port_1c2_t1_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c2_t1_port_ip_requirements: type: list required: true @@ -5702,11 +5582,9 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_1c2_t2_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer compute_1c2_catalog_instance_availability_zone: type: list required: true @@ -5714,27 +5592,21 @@ node_types: entry_schema: type: string port_1c2_t2_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c2_t2_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string vm_flavor_name: type: string required: true status: SUPPORTED port_1c2_t2_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c2_t1_port_vlan_requirements: type: list required: true @@ -5750,17 +5622,13 @@ node_types: required: true status: SUPPORTED port_1c2_t1_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_1c2_t1_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c2_t2_port_ip_requirements: type: list required: true @@ -5772,11 +5640,9 @@ node_types: required: true status: SUPPORTED port_1c2_t1_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c2_t2_port_network: type: list required: true @@ -5824,11 +5690,9 @@ node_types: entry_schema: type: string port_1c2_t1_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c2_t1_port_ip_requirements: type: list required: true @@ -6265,17 +6129,13 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_1b_t1_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_1b_t1_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t1_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -6307,33 +6167,25 @@ node_types: entry_schema: type: json port_1b_t2_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t2_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_1b_t2_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED port_1b_t2_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t2_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string compute_b_single_2b_availability_zone: type: list required: true @@ -6377,17 +6229,13 @@ node_types: entry_schema: type: string port_1b_t1_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t1_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t1_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -6828,17 +6676,13 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_1b_t1_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_1b_t1_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t1_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -6858,17 +6702,13 @@ node_types: required: true status: SUPPORTED port_1b_t2_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t2_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer compute_b_single_1b_user_data_format: type: list required: true @@ -6880,17 +6720,13 @@ node_types: required: true status: SUPPORTED port_1b_t2_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t2_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t2_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -6934,17 +6770,13 @@ node_types: entry_schema: type: json port_1b_t1_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t1_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t1_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -7402,17 +7234,13 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_1b_t1_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_1b_t1_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t1_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -7438,33 +7266,25 @@ node_types: entry_schema: type: json port_1b_t2_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t2_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_1b_t2_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED port_1b_t2_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t2_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string compute_b_single_2b_availability_zone: type: list required: true @@ -7514,17 +7334,13 @@ node_types: entry_schema: type: string port_1b_t1_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t1_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t1_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml index 2c5b8abe4c..9407798da3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml @@ -354,8 +354,7 @@ topology_template: - get_attribute: - abstract_1c2_catalog_instance_1 - 1c2_catalog_instance_instance_name - port_1c2_t1_port_network_role_tag: - - oam + port_1c2_t1_port_network_role_tag: oam port_1c2_t1_port_ip_requirements: - ip_version: 4 ip_count_required: @@ -412,8 +411,7 @@ topology_template: - get_attribute: - abstract_1c2_catalog_instance_0 - 1c2_catalog_instance_instance_name - port_1c2_t1_port_network_role_tag: - - oam + port_1c2_t1_port_network_role_tag: oam port_1c2_t1_port_ip_requirements: - ip_version: 4 ip_count_required: @@ -537,8 +535,7 @@ topology_template: is_required: false compute_1c2_catalog_instance_user_data_format: - RAW1 - port_1c2_t1_port_network_role_tag: - - oam + port_1c2_t1_port_network_role_tag: oam port_1c2_t1_port_ip_requirements: - ip_version: 4 ip_count_required: @@ -593,8 +590,7 @@ topology_template: is_required: false compute_1c2_catalog_instance_user_data_format: - RAW1 - port_1c2_t1_port_network_role_tag: - - oam + port_1c2_t1_port_network_role_tag: oam port_1c2_t1_port_ip_requirements: - ip_version: 4 ip_count_required: @@ -754,8 +750,7 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_1a_t2_port_network_role_tag: - - ppds + port_1a_t2_port_network_role_tag: ppds vm_flavor_name: get_input: pd_flavor_name port_1a_t2_port_network: @@ -933,8 +928,7 @@ topology_template: - a_single_1a_1a_t1_port_tenant_id compute_b_single_2b_user_data_format: - RAW - port_1b_t1_port_network_role_tag: - - oam + port_1b_t1_port_network_role_tag: oam port_1b_t1_port_mac_requirements: mac_count_required: is_required: false @@ -1563,8 +1557,7 @@ topology_template: - get_attribute: - abstract_a_single_1a - a_single_1a_1a_t1_port_tenant_id - port_1b_t1_port_network_role_tag: - - oam + port_1b_t1_port_network_role_tag: oam port_1b_t1_port_mac_requirements: mac_count_required: is_required: false @@ -2020,4 +2013,4 @@ topology_template: name: def affinity: host targets: - - BE_Affinity_group
\ No newline at end of file + - BE_Affinity_group diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c11_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c11_scalling_instanceServiceTemplate.yaml index 4e16efbe82..4b6aed7260 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c11_scalling_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c11_scalling_instanceServiceTemplate.yaml @@ -71,30 +71,22 @@ topology_template: entry_schema: type: json port_1c1_t1_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_1c1_t1_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_1c1_t1_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_1c1_t1_port_network: type: list required: true entry_schema: type: string port_1c1_t1_port_order: - type: list + type: integer required: true - entry_schema: - type: integer node_templates: 1c11_scalling_instance: type: org.openecomp.resource.vfc.nodes.heat.1c11_scalling_instance diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c12_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c12_scalling_instanceServiceTemplate.yaml index 195f916993..101a1fdbd6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c12_scalling_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c12_scalling_instanceServiceTemplate.yaml @@ -66,20 +66,14 @@ topology_template: entry_schema: type: string port_1c1_t1_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_1c1_t1_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_1c1_t1_port_network_role: - type: list + type: string required: true - entry_schema: - type: string compute_1c12_scalling_instance_availability_zone: type: list required: true @@ -91,10 +85,8 @@ topology_template: entry_schema: type: string port_1c1_t1_port_order: - type: list + type: integer required: true - entry_schema: - type: integer node_templates: 1c12_scalling_instance_1c1_t1_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml index 351bfc739e..f09ccb2ad5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml @@ -12,33 +12,25 @@ node_types: topology_template: inputs: port_1c2_t2_port_order: - type: list + type: integer required: true - entry_schema: - type: integer compute_1c2_catalog_instance_availability_zone: type: list required: true entry_schema: type: string port_1c2_t2_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_1c2_t2_port_network_role: - type: list + type: string required: true - entry_schema: - type: string vm_flavor_name: type: string required: true port_1c2_t2_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_1c2_t1_port_vlan_requirements: type: list required: true @@ -51,15 +43,11 @@ topology_template: type: org.openecomp.datatypes.Naming required: true port_1c2_t1_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_1c2_t1_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_1c2_t2_port_ip_requirements: type: list required: true @@ -69,10 +57,8 @@ topology_template: type: org.openecomp.datatypes.network.MacRequirements required: true port_1c2_t1_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_1c2_t2_port_network: type: list required: true @@ -117,10 +103,8 @@ topology_template: entry_schema: type: string port_1c2_t1_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_1c2_t1_port_ip_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml index 767c177abe..ac0d816705 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml @@ -12,33 +12,25 @@ node_types: topology_template: inputs: port_1c2_t2_port_order: - type: list + type: integer required: true - entry_schema: - type: integer compute_1c2_catalog_instance_availability_zone: type: list required: true entry_schema: type: string port_1c2_t2_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_1c2_t2_port_network_role: - type: list + type: string required: true - entry_schema: - type: string vm_flavor_name: type: string required: true port_1c2_t2_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_1c2_t1_port_vlan_requirements: type: list required: true @@ -51,15 +43,11 @@ topology_template: type: org.openecomp.datatypes.Naming required: true port_1c2_t1_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_1c2_t1_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_1c2_t2_port_ip_requirements: type: list required: true @@ -69,10 +57,8 @@ topology_template: type: org.openecomp.datatypes.network.MacRequirements required: true port_1c2_t1_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_1c2_t2_port_network: type: list required: true @@ -112,10 +98,8 @@ topology_template: entry_schema: type: string port_1c2_t1_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_1c2_t1_port_ip_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_2ServiceTemplate.yaml index 172cfbb589..576a555e41 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_2ServiceTemplate.yaml @@ -12,33 +12,25 @@ node_types: topology_template: inputs: port_1c2_t2_port_order: - type: list + type: integer required: true - entry_schema: - type: integer compute_1c2_catalog_instance_availability_zone: type: list required: true entry_schema: type: string port_1c2_t2_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_1c2_t2_port_network_role: - type: list + type: string required: true - entry_schema: - type: string vm_flavor_name: type: string required: true port_1c2_t2_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_1c2_t1_port_vlan_requirements: type: list required: true @@ -51,15 +43,11 @@ topology_template: type: org.openecomp.datatypes.Naming required: true port_1c2_t1_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_1c2_t1_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_1c2_t2_port_ip_requirements: type: list required: true @@ -69,10 +57,8 @@ topology_template: type: org.openecomp.datatypes.network.MacRequirements required: true port_1c2_t1_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_1c2_t2_port_network: type: list required: true @@ -112,10 +98,8 @@ topology_template: entry_schema: type: string port_1c2_t1_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_1c2_t1_port_ip_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_3ServiceTemplate.yaml index dc503608e4..32a9dee48c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_3ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_3ServiceTemplate.yaml @@ -12,33 +12,25 @@ node_types: topology_template: inputs: port_1c2_t2_port_order: - type: list + type: integer required: true - entry_schema: - type: integer compute_1c2_catalog_instance_availability_zone: type: list required: true entry_schema: type: string port_1c2_t2_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_1c2_t2_port_network_role: - type: list + type: string required: true - entry_schema: - type: string vm_flavor_name: type: string required: true port_1c2_t2_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_1c2_t1_port_vlan_requirements: type: list required: true @@ -51,15 +43,11 @@ topology_template: type: org.openecomp.datatypes.Naming required: true port_1c2_t1_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_1c2_t1_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_1c2_t2_port_ip_requirements: type: list required: true @@ -69,10 +57,8 @@ topology_template: type: org.openecomp.datatypes.network.MacRequirements required: true port_1c2_t1_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_1c2_t2_port_network: type: list required: true @@ -112,10 +98,8 @@ topology_template: entry_schema: type: string port_1c2_t1_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_1c2_t1_port_ip_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_1aServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_1aServiceTemplate.yaml index d2b08144aa..15e3f83de9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_1aServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_1aServiceTemplate.yaml @@ -22,18 +22,14 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_1a_t2_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string vm_flavor_name: type: string required: true port_1a_t2_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_1a_t2_port_network: type: list required: true @@ -48,10 +44,8 @@ topology_template: entry_schema: type: string port_1a_t1_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string vm_image_name: type: string required: true @@ -86,20 +80,14 @@ topology_template: constraints: - greater_or_equal: 0 port_1a_t1_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_1a_t1_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_1a_t1_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_1a_t2_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -109,15 +97,11 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.VlanRequirements port_1a_t2_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_1a_t2_port_order: - type: list + type: integer required: true - entry_schema: - type: integer compute_a_single_1a_user_data_format: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_2aServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_2aServiceTemplate.yaml index b82ccec156..364ee2a7b5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_2aServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_2aServiceTemplate.yaml @@ -32,25 +32,19 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_1a_t1_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_1a_t1_port_network_role: - type: list + type: string required: true - entry_schema: - type: string compute_a_single_2a_scheduler_hints: type: list required: true entry_schema: type: json port_1a_t1_port_order: - type: list + type: integer required: true - entry_schema: - type: integer compute_a_single_2a_availability_zone: type: list required: true @@ -68,10 +62,8 @@ topology_template: entry_schema: type: string port_1a_t1_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string compute_a_single_2a_name: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_0ServiceTemplate.yaml index a33804d6bf..3c27b07ed6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_0ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_0ServiceTemplate.yaml @@ -12,15 +12,11 @@ node_types: topology_template: inputs: port_1b_t1_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_1b_t1_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_1b_t1_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -36,15 +32,11 @@ topology_template: type: string required: true port_1b_t2_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_1b_t2_port_order: - type: list + type: integer required: true - entry_schema: - type: integer compute_b_single_1b_user_data_format: type: list required: true @@ -54,15 +46,11 @@ topology_template: type: org.openecomp.datatypes.Naming required: true port_1b_t2_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_1b_t2_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_1b_t2_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -99,15 +87,11 @@ topology_template: entry_schema: type: json port_1b_t1_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_1b_t1_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_1b_t1_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_1ServiceTemplate.yaml index 32b8575153..d49088c237 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_1ServiceTemplate.yaml @@ -12,15 +12,11 @@ node_types: topology_template: inputs: port_1b_t1_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_1b_t1_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_1b_t1_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -36,15 +32,11 @@ topology_template: type: string required: true port_1b_t2_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_1b_t2_port_order: - type: list + type: integer required: true - entry_schema: - type: integer compute_b_single_1b_user_data_format: type: list required: true @@ -54,15 +46,11 @@ topology_template: type: org.openecomp.datatypes.Naming required: true port_1b_t2_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_1b_t2_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_1b_t2_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -94,20 +82,16 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_1b_t1_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string compute_b_single_1b_metadata: type: list required: true entry_schema: type: json port_1b_t1_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_1b_t1_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_0ServiceTemplate.yaml index 462ec0395a..c268a091cb 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_0ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_0ServiceTemplate.yaml @@ -12,15 +12,11 @@ node_types: topology_template: inputs: port_1b_t1_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_1b_t1_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_1b_t1_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -41,28 +37,20 @@ topology_template: entry_schema: type: json port_1b_t2_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_1b_t2_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_1b_t2_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true port_1b_t2_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_1b_t2_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string compute_b_single_2b_availability_zone: type: list required: true @@ -104,15 +92,11 @@ topology_template: entry_schema: type: string port_1b_t1_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_1b_t1_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_1b_t1_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_1ServiceTemplate.yaml index 3d7c15ce93..c894808e8e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_1ServiceTemplate.yaml @@ -12,15 +12,11 @@ node_types: topology_template: inputs: port_1b_t1_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_1b_t1_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_1b_t1_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -46,28 +42,20 @@ topology_template: entry_schema: type: json port_1b_t2_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_1b_t2_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_1b_t2_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true port_1b_t2_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_1b_t2_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string compute_b_single_2b_availability_zone: type: list required: true @@ -104,15 +92,11 @@ topology_template: entry_schema: type: string port_1b_t1_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_1b_t1_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_1b_t1_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-pcm_v0.1ServiceTemplate.yaml index f96fc7e5b9..0b0de807b9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -12,15 +12,11 @@ node_types: topology_template: inputs: port_pcm_port_0_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_1_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string availabilityzone_name: label: availabilityzone name hidden: false @@ -39,25 +35,17 @@ topology_template: type: string description: PCRF CM image name port_pcm_port_0_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pcm_port_0_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_1_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_0_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string pcm_server_name: label: PCRF CM server name hidden: false @@ -83,10 +71,8 @@ topology_template: type: string description: OAM network name port_pcm_port_1_network_role: - type: list + type: string required: true - entry_schema: - type: string server_group: hidden: false immutable: false @@ -165,10 +151,8 @@ topology_template: type: string description: CPS network mask port_pcm_port_1_order: - type: list + type: integer required: true - entry_schema: - type: integer node_templates: pcm_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml index 977b81a5e5..92ea0fa5e7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -9,17 +9,13 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_pcm_port_0_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_1_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string availabilityzone_name: type: string description: availabilityzone name @@ -37,29 +33,21 @@ node_types: required: true status: SUPPORTED port_pcm_port_0_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pcm_port_0_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_1_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_0_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string pcm_server_name: type: string description: PCRF CM server name @@ -84,11 +72,9 @@ node_types: required: true status: SUPPORTED port_pcm_port_1_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_0_ip_requirements: type: list required: true @@ -156,11 +142,9 @@ node_types: required: true status: SUPPORTED port_pcm_port_1_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer attributes: server_pcm_id: type: string @@ -584,17 +568,13 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_pcm_port_0_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_1_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string availabilityzone_name: type: string description: availabilityzone name @@ -612,29 +592,21 @@ node_types: required: true status: SUPPORTED port_pcm_port_0_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pcm_port_0_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_1_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_0_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string pcm_server_name: type: string description: PCRF CM server name @@ -659,11 +631,9 @@ node_types: required: true status: SUPPORTED port_pcm_port_1_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_0_ip_requirements: type: list required: true @@ -731,11 +701,9 @@ node_types: required: true status: SUPPORTED port_pcm_port_1_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer attributes: server_pcm_id: type: string diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml index 7203c34545..6ca8ae790c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -12,15 +12,11 @@ node_types: topology_template: inputs: port_pcm_port_0_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_1_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string availabilityzone_name: label: availabilityzone name hidden: false @@ -39,25 +35,17 @@ topology_template: type: string description: PCRF CM image name port_pcm_port_0_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pcm_port_0_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_1_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_0_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string pcm_server_name: label: PCRF CM server name hidden: false @@ -83,10 +71,8 @@ topology_template: type: string description: OAM network name port_pcm_port_1_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_0_ip_requirements: type: list required: true @@ -157,10 +143,8 @@ topology_template: type: string description: CPS network mask port_pcm_port_1_order: - type: list + type: integer required: true - entry_schema: - type: integer node_templates: pcm_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml index 2cf7197844..aaf4005f55 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml @@ -12,15 +12,11 @@ node_types: topology_template: inputs: port_pcm_port_0_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_1_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string availabilityzone_name: label: availabilityzone name hidden: false @@ -39,25 +35,17 @@ topology_template: type: string description: PCRF CM image name port_pcm_port_0_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pcm_port_0_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_1_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_0_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string pcm_server_name: label: PCRF CM server name hidden: false @@ -83,10 +71,8 @@ topology_template: type: string description: OAM network name port_pcm_port_1_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_0_ip_requirements: type: list required: true @@ -157,10 +143,8 @@ topology_template: type: string description: CPS network mask port_pcm_port_1_order: - type: list + type: integer required: true - entry_schema: - type: integer node_templates: pcm_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index 3e8521f381..e7c81c3c8a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -9,11 +9,9 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_pcm_port_0_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string p1: type: string description: UID of OAM network @@ -25,11 +23,9 @@ node_types: required: true status: SUPPORTED port_pcm_port_1_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string availabilityzone_name: type: string description: availabilityzone name @@ -47,29 +43,21 @@ node_types: required: true status: SUPPORTED port_pcm_port_0_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pcm_port_0_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_1_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_0_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string pcm_server_name: type: string description: PCRF CM server name @@ -94,11 +82,9 @@ node_types: required: true status: SUPPORTED port_pcm_port_1_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_0_ip_requirements: type: list required: true @@ -166,11 +152,9 @@ node_types: required: true status: SUPPORTED port_pcm_port_1_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer attributes: server_pcm_id: type: string @@ -599,45 +583,35 @@ node_types: required: true status: SUPPORTED port_oam_port_1_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string availabilityzone_name: type: string description: availabilityzone name required: true status: SUPPORTED port_oam_port_0_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_oam_port_1_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string oam_server_name: type: string description: oam server name required: true status: SUPPORTED port_oam_port_0_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_oam_port_1_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_oam_port_1_ip_requirements: type: list required: true @@ -649,17 +623,13 @@ node_types: required: true status: SUPPORTED port_oam_port_1_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_oam_port_0_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_oam_port_1_vlan_requirements: type: list required: true @@ -706,11 +676,9 @@ node_types: required: true status: SUPPORTED port_oam_port_0_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_oam_port_0_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/MainServiceTemplate.yaml index e297848243..b19b647852 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/MainServiceTemplate.yaml @@ -481,4 +481,4 @@ topology_template: description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - - abstract_oam_server_1
\ No newline at end of file + - abstract_oam_server_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-oam_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-oam_v0.1ServiceTemplate.yaml index ccd5ed5c66..ede031ca2d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-oam_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-oam_v0.1ServiceTemplate.yaml @@ -17,10 +17,8 @@ topology_template: type: string description: UID of OAM network port_oam_port_1_network_role: - type: list + type: string required: true - entry_schema: - type: string availabilityzone_name: label: availabilityzone name hidden: false @@ -28,15 +26,11 @@ topology_template: type: string description: availabilityzone name port_oam_port_0_network_role: - type: list + type: string required: true - entry_schema: - type: string port_oam_port_1_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string oam_server_name: label: oam server name hidden: false @@ -44,15 +38,11 @@ topology_template: type: string description: oam server name port_oam_port_0_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_oam_port_1_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_oam_port_1_ip_requirements: type: list required: true @@ -62,15 +52,11 @@ topology_template: type: org.openecomp.datatypes.network.MacRequirements required: true port_oam_port_1_order: - type: list + type: integer required: true - entry_schema: - type: integer port_oam_port_0_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_oam_port_1_vlan_requirements: type: list required: true @@ -122,10 +108,8 @@ topology_template: type: string description: CPS network ip port_oam_port_0_order: - type: list + type: integer required: true - entry_schema: - type: integer port_oam_port_0_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-pcm_v0.1ServiceTemplate.yaml index 6309367294..65d3a2223c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -12,10 +12,8 @@ node_types: topology_template: inputs: port_pcm_port_0_network_role: - type: list + type: string required: true - entry_schema: - type: string p1: hidden: false immutable: false @@ -27,10 +25,8 @@ topology_template: type: string description: UID of OAM network port_pcm_port_1_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string availabilityzone_name: label: availabilityzone name hidden: false @@ -49,25 +45,17 @@ topology_template: type: string description: PCRF CM image name port_pcm_port_0_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pcm_port_0_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_1_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_0_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string pcm_server_name: label: PCRF CM server name hidden: false @@ -93,10 +81,8 @@ topology_template: type: string description: OAM network name port_pcm_port_1_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_0_ip_requirements: type: list required: true @@ -167,10 +153,8 @@ topology_template: type: string description: CPS network mask port_pcm_port_1_order: - type: list + type: integer required: true - entry_schema: - type: integer node_templates: pcm_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index 8bd338194e..e09581bd29 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -9,22 +9,18 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_pcm_port_0_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string metadata: type: string description: metadata required: true status: SUPPORTED port_pcm_port_1_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string availabilityzone_name: type: string description: availabilityzone name @@ -42,29 +38,21 @@ node_types: required: true status: SUPPORTED port_pcm_port_0_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pcm_port_0_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_1_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_0_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string pcm_server_name: type: string description: PCRF CM server name @@ -89,11 +77,9 @@ node_types: required: true status: SUPPORTED port_pcm_port_1_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_0_ip_requirements: type: list required: true @@ -171,11 +157,9 @@ node_types: required: true status: SUPPORTED port_pcm_port_1_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer attributes: server_pcm_id: type: string @@ -599,17 +583,13 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_pcm_port_0_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_1_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string availabilityzone_name: type: string description: availabilityzone name @@ -627,29 +607,21 @@ node_types: required: true status: SUPPORTED port_pcm_port_0_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pcm_port_0_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_1_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_0_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string oam_image_name: type: string description: oam image name @@ -674,11 +646,9 @@ node_types: required: true status: SUPPORTED port_pcm_port_1_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_0_ip_requirements: type: list required: true @@ -746,11 +716,9 @@ node_types: required: true status: SUPPORTED port_pcm_port_1_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer attributes: server_oam_id: type: string diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/MainServiceTemplate.yaml index e2ba8d9fd4..b645ce5805 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/MainServiceTemplate.yaml @@ -395,4 +395,4 @@ topology_template: - abstract_compute - abstract_pcm_server_0 - abstract_oam_server_0 - - abstract_pcm_server_1
\ No newline at end of file + - abstract_pcm_server_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml index 96968c134e..7c6d4473f5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml @@ -12,15 +12,11 @@ node_types: topology_template: inputs: port_pcm_port_0_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_1_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string availabilityzone_name: label: availabilityzone name hidden: false @@ -39,25 +35,17 @@ topology_template: type: string description: oam server name port_pcm_port_0_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pcm_port_0_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_1_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_0_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string oam_image_name: label: image name hidden: false @@ -83,10 +71,8 @@ topology_template: type: string description: OAM network name port_pcm_port_1_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_0_ip_requirements: type: list required: true @@ -157,10 +143,8 @@ topology_template: type: string description: CPS network mask port_pcm_port_1_order: - type: list + type: integer required: true - entry_schema: - type: integer node_templates: server_oam: type: org.openecomp.resource.vfc.nodes.heat.oam_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml index ff362fd06b..31ff0338d5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -12,10 +12,8 @@ node_types: topology_template: inputs: port_pcm_port_0_network_role: - type: list + type: string required: true - entry_schema: - type: string metadata: label: metadata hidden: false @@ -23,10 +21,8 @@ topology_template: type: string description: metadata port_pcm_port_1_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string availabilityzone_name: label: availabilityzone name hidden: false @@ -45,25 +41,17 @@ topology_template: type: string description: PCRF CM image name port_pcm_port_0_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pcm_port_0_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_1_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_0_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string pcm_server_name: label: PCRF CM server name hidden: false @@ -89,10 +77,8 @@ topology_template: type: string description: OAM network name port_pcm_port_1_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_0_ip_requirements: type: list required: true @@ -175,10 +161,8 @@ topology_template: type: string description: CPS network mask port_pcm_port_1_order: - type: list + type: integer required: true - entry_schema: - type: integer node_templates: pcm_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index 54adda6e5b..6131194a95 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -9,22 +9,18 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_pcm_port_0_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string metadata: type: string description: metadata required: true status: SUPPORTED port_pcm_port_1_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string availabilityzone_name: type: string description: availabilityzone name @@ -42,29 +38,21 @@ node_types: required: true status: SUPPORTED port_pcm_port_0_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pcm_port_0_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_1_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_0_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string pcm_server_name: type: string description: PCRF CM server name @@ -89,11 +77,9 @@ node_types: required: true status: SUPPORTED port_pcm_port_1_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_0_ip_requirements: type: list required: true @@ -166,11 +152,9 @@ node_types: required: true status: SUPPORTED port_pcm_port_1_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer attributes: server_pcm_id: type: string @@ -594,17 +578,13 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_pcm_port_0_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_1_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string availabilityzone_name: type: string description: availabilityzone name @@ -622,29 +602,21 @@ node_types: required: true status: SUPPORTED port_pcm_port_0_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pcm_port_0_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_1_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_0_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string oam_image_name: type: string description: oam image name @@ -669,11 +641,9 @@ node_types: required: true status: SUPPORTED port_pcm_port_1_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_0_ip_requirements: type: list required: true @@ -741,11 +711,9 @@ node_types: required: true status: SUPPORTED port_pcm_port_1_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer attributes: server_oam_id: type: string diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/MainServiceTemplate.yaml index 96eb3c5023..d434ddde4e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/MainServiceTemplate.yaml @@ -408,4 +408,4 @@ topology_template: value: get_attribute: - abstract_pcm_server_0 - - server_pcm_id
\ No newline at end of file + - server_pcm_id diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml index 96968c134e..7c6d4473f5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml @@ -12,15 +12,11 @@ node_types: topology_template: inputs: port_pcm_port_0_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_1_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string availabilityzone_name: label: availabilityzone name hidden: false @@ -39,25 +35,17 @@ topology_template: type: string description: oam server name port_pcm_port_0_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pcm_port_0_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_1_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_0_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string oam_image_name: label: image name hidden: false @@ -83,10 +71,8 @@ topology_template: type: string description: OAM network name port_pcm_port_1_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_0_ip_requirements: type: list required: true @@ -157,10 +143,8 @@ topology_template: type: string description: CPS network mask port_pcm_port_1_order: - type: list + type: integer required: true - entry_schema: - type: integer node_templates: server_oam: type: org.openecomp.resource.vfc.nodes.heat.oam_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml index 25e983fe2a..9c59aaee5a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -12,10 +12,8 @@ node_types: topology_template: inputs: port_pcm_port_0_network_role: - type: list + type: string required: true - entry_schema: - type: string metadata: label: metadata hidden: false @@ -23,10 +21,8 @@ topology_template: type: string description: metadata port_pcm_port_1_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string availabilityzone_name: label: availabilityzone name hidden: false @@ -45,25 +41,17 @@ topology_template: type: string description: PCRF CM image name port_pcm_port_0_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pcm_port_0_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_1_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_0_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string pcm_server_name: label: PCRF CM server name hidden: false @@ -89,10 +77,8 @@ topology_template: type: string description: OAM network name port_pcm_port_1_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_0_ip_requirements: type: list required: true @@ -169,10 +155,8 @@ topology_template: type: string description: CPS network mask port_pcm_port_1_order: - type: list + type: integer required: true - entry_schema: - type: integer node_templates: pcm_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml index 83a37609e0..16dda32915 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -9,17 +9,13 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_pcm_port_0_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_1_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string availabilityzone_name: type: string description: availabilityzone name @@ -37,29 +33,21 @@ node_types: required: true status: SUPPORTED port_pcm_port_0_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pcm_port_0_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_1_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_0_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string pcm_server_name: type: string description: PCRF CM server name @@ -84,11 +72,9 @@ node_types: required: true status: SUPPORTED port_pcm_port_1_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_0_ip_requirements: type: list required: true @@ -156,11 +142,9 @@ node_types: required: true status: SUPPORTED port_pcm_port_1_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer attributes: server_pcm_id: type: string @@ -590,11 +574,9 @@ node_types: entry_schema: type: string port_compute_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -620,11 +602,9 @@ node_types: required: true status: SUPPORTED port_compute_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string vm_image_name: type: string required: true @@ -636,11 +616,9 @@ node_types: entry_schema: type: string port_compute_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string compute_compute_metadata: type: list required: true @@ -648,11 +626,9 @@ node_types: entry_schema: type: json port_compute_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_compute_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -1002,4 +978,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/MainServiceTemplate.yaml index 77a2573b21..f0cf923cbc 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/MainServiceTemplate.yaml @@ -208,8 +208,7 @@ topology_template: get_input: compute_image_name port_compute_port_network: - get_input: port_net_name - port_compute_port_network_role_tag: - - port + port_compute_port_network_role_tag: port compute_compute_metadata: - get_attribute: - abstract_pcm_server_0 @@ -240,4 +239,4 @@ topology_template: members: - packet_mirror_network - abstract_compute - - abstract_pcm_server_0
\ No newline at end of file + - abstract_pcm_server_0 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/Nested_computeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/Nested_computeServiceTemplate.yaml index 0695e7dc03..7a9311c041 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/Nested_computeServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/Nested_computeServiceTemplate.yaml @@ -17,10 +17,8 @@ topology_template: entry_schema: type: string port_compute_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -42,10 +40,8 @@ topology_template: type: string required: true port_compute_port_network_role: - type: list + type: string required: true - entry_schema: - type: string vm_image_name: type: string required: true @@ -55,20 +51,16 @@ topology_template: entry_schema: type: string port_compute_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string compute_compute_metadata: type: list required: true entry_schema: type: json port_compute_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_compute_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -317,4 +309,4 @@ topology_template: - link dependency_compute: - compute - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/nested-pcm_v0.1ServiceTemplate.yaml index 7da1206ebe..30417727c3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -12,15 +12,11 @@ node_types: topology_template: inputs: port_pcm_port_0_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_1_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string availabilityzone_name: label: availabilityzone name hidden: false @@ -39,25 +35,17 @@ topology_template: type: string description: PCRF CM image name port_pcm_port_0_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pcm_port_0_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_1_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_0_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string pcm_server_name: label: PCRF CM server name hidden: false @@ -83,10 +71,8 @@ topology_template: type: string description: OAM network name port_pcm_port_1_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_0_ip_requirements: type: list required: true @@ -157,10 +143,8 @@ topology_template: type: string description: CPS network mask port_pcm_port_1_order: - type: list + type: integer required: true - entry_schema: - type: integer node_templates: pcm_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port @@ -461,4 +445,4 @@ topology_template: - dependency dependency_pcm_port_1: - pcm_port_1 - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml index 4214d0dd3f..060e2ed852 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -20,34 +20,26 @@ node_types: required: true status: SUPPORTED port_pcm_1port_0_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string pcm_image_name: type: string description: PCRF CM image name required: true status: SUPPORTED port_pcm_1port_0_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_1port_0_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pcm_2port_1_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_2port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -82,28 +74,22 @@ node_types: required: true status: SUPPORTED port_pcm_2port_1_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string oam_net_gw: type: string description: CPS network gateway required: true status: SUPPORTED port_pcm_1port_0_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_2port_1_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string security_group_name: type: string description: the name of security group @@ -150,11 +136,9 @@ node_types: required: true status: SUPPORTED port_pcm_2port_1_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pcm_2port_1_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/nested-pcm_v0.1ServiceTemplate.yaml index 017b37cd78..71b5124457 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -23,10 +23,8 @@ topology_template: type: string description: availabilityzone name port_pcm_1port_0_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string pcm_image_name: label: image name hidden: false @@ -34,20 +32,14 @@ topology_template: type: string description: PCRF CM image name port_pcm_1port_0_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pcm_1port_0_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pcm_2port_1_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pcm_2port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -81,10 +73,8 @@ topology_template: type: org.openecomp.datatypes.network.MacRequirements required: true port_pcm_2port_1_network_role: - type: list + type: string required: true - entry_schema: - type: string oam_net_gw: label: CPS network gateway hidden: false @@ -92,15 +82,11 @@ topology_template: type: string description: CPS network gateway port_pcm_1port_0_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pcm_2port_1_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string security_group_name: label: security group name hidden: false @@ -152,10 +138,8 @@ topology_template: type: string description: CPS network mask port_pcm_2port_1_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pcm_2port_1_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/GlobalSubstitutionTypesServiceTemplate.yaml index ab2625118b..e084f23280 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -766,4 +766,4 @@ node_types: type: tosca.capabilities.OperatingSystem occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/MainServiceTemplate.yaml index 1dc9eebe59..4f83013978 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/MainServiceTemplate.yaml @@ -249,4 +249,4 @@ topology_template: members: - server_pd_1 - server_pcm_1 - - compute_port_0
\ No newline at end of file + - compute_port_0 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/nested-pcm_v0.1ServiceTemplate.yaml index 65088158c3..d03bd42f52 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -543,4 +543,4 @@ topology_template: - dependency dependency_pcm_port_1: - pcm_port_1 - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml index 61a8efade2..c1c907fb3d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -9,17 +9,13 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_pcm_port_0_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_1_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string availabilityzone_name: type: string description: availabilityzone name @@ -37,29 +33,21 @@ node_types: required: true status: SUPPORTED port_pcm_port_0_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pcm_port_0_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_1_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_0_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string pcm_server_name: type: string description: PCRF CM server name @@ -84,11 +72,9 @@ node_types: required: true status: SUPPORTED port_pcm_port_1_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_0_ip_requirements: type: list required: true @@ -156,11 +142,9 @@ node_types: required: true status: SUPPORTED port_pcm_port_1_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer attributes: server_pcm_id: type: string @@ -584,17 +568,13 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_pcm_port_0_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_1_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string availabilityzone_name: type: string description: availabilityzone name @@ -612,29 +592,21 @@ node_types: required: true status: SUPPORTED port_pcm_port_0_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pcm_port_0_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_1_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_0_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string pcm_server_name: type: string description: PCRF CM server name @@ -659,11 +631,9 @@ node_types: required: true status: SUPPORTED port_pcm_port_1_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_0_ip_requirements: type: list required: true @@ -731,11 +701,9 @@ node_types: required: true status: SUPPORTED port_pcm_port_1_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer attributes: server_pcm_id: type: string @@ -1159,17 +1127,13 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_pcm_port_0_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_1_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string availabilityzone_name: type: string description: availabilityzone name @@ -1187,29 +1151,21 @@ node_types: required: true status: SUPPORTED port_pcm_port_0_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pcm_port_0_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_1_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_0_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string pcm_server_name: type: string description: PCRF CM server name @@ -1234,11 +1190,9 @@ node_types: required: true status: SUPPORTED port_pcm_port_1_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_0_ip_requirements: type: list required: true @@ -1306,11 +1260,9 @@ node_types: required: true status: SUPPORTED port_pcm_port_1_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer attributes: server_pcm_id: type: string diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml index 7203c34545..6ca8ae790c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -12,15 +12,11 @@ node_types: topology_template: inputs: port_pcm_port_0_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_1_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string availabilityzone_name: label: availabilityzone name hidden: false @@ -39,25 +35,17 @@ topology_template: type: string description: PCRF CM image name port_pcm_port_0_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pcm_port_0_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_1_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_0_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string pcm_server_name: label: PCRF CM server name hidden: false @@ -83,10 +71,8 @@ topology_template: type: string description: OAM network name port_pcm_port_1_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_0_ip_requirements: type: list required: true @@ -157,10 +143,8 @@ topology_template: type: string description: CPS network mask port_pcm_port_1_order: - type: list + type: integer required: true - entry_schema: - type: integer node_templates: pcm_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml index 2cf7197844..aaf4005f55 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml @@ -12,15 +12,11 @@ node_types: topology_template: inputs: port_pcm_port_0_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_1_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string availabilityzone_name: label: availabilityzone name hidden: false @@ -39,25 +35,17 @@ topology_template: type: string description: PCRF CM image name port_pcm_port_0_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pcm_port_0_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_1_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_0_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string pcm_server_name: label: PCRF CM server name hidden: false @@ -83,10 +71,8 @@ topology_template: type: string description: OAM network name port_pcm_port_1_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_0_ip_requirements: type: list required: true @@ -157,10 +143,8 @@ topology_template: type: string description: CPS network mask port_pcm_port_1_order: - type: list + type: integer required: true - entry_schema: - type: integer node_templates: pcm_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.3ServiceTemplate.yaml index 6d481423af..fbd02282c7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.3ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.3ServiceTemplate.yaml @@ -12,15 +12,11 @@ node_types: topology_template: inputs: port_pcm_port_0_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_1_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string availabilityzone_name: label: availabilityzone name hidden: false @@ -39,25 +35,17 @@ topology_template: type: string description: PCRF CM image name port_pcm_port_0_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pcm_port_0_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_1_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_0_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string pcm_server_name: label: PCRF CM server name hidden: false @@ -83,10 +71,8 @@ topology_template: type: string description: OAM network name port_pcm_port_1_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_0_ip_requirements: type: list required: true @@ -157,10 +143,8 @@ topology_template: type: string description: CPS network mask port_pcm_port_1_order: - type: list + type: integer required: true - entry_schema: - type: integer node_templates: pcm_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/GlobalSubstitutionTypesServiceTemplate.yaml index 038d880cd0..86e18691a6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -9,17 +9,13 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_pcm_port_0_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_1_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string availabilityzone_name: type: string description: availabilityzone name @@ -37,29 +33,21 @@ node_types: required: true status: SUPPORTED port_pcm_port_0_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pcm_port_0_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_1_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_0_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string pcm_server_name: type: string description: PCRF CM server name @@ -84,11 +72,9 @@ node_types: required: true status: SUPPORTED port_pcm_port_1_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_0_ip_requirements: type: list required: true @@ -156,11 +142,9 @@ node_types: required: true status: SUPPORTED port_pcm_port_1_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer attributes: server_pcm_id: type: string @@ -584,17 +568,13 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_pcm_port_0_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_1_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string availabilityzone_name: type: string description: availabilityzone name @@ -612,29 +592,21 @@ node_types: required: true status: SUPPORTED port_pcm_port_0_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pcm_port_0_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_1_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_0_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string pcm_server_name: type: string description: PCRF CM server name @@ -659,11 +631,9 @@ node_types: required: true status: SUPPORTED port_pcm_port_1_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_0_ip_requirements: type: list required: true @@ -731,11 +701,9 @@ node_types: required: true status: SUPPORTED port_pcm_port_1_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer attributes: server_pcm_id: type: string diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/MainServiceTemplate.yaml index 85e96b69aa..8d68beb0a5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/MainServiceTemplate.yaml @@ -189,4 +189,4 @@ topology_template: - compute_port_0 - abstract_pcm_server_0 - abstract_pcm_server_1 - - abstract_pcm_server_1_0
\ No newline at end of file + - abstract_pcm_server_1_0 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.1ServiceTemplate.yaml index 5d82785583..30417727c3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -12,15 +12,11 @@ node_types: topology_template: inputs: port_pcm_port_0_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_1_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string availabilityzone_name: label: availabilityzone name hidden: false @@ -39,25 +35,17 @@ topology_template: type: string description: PCRF CM image name port_pcm_port_0_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pcm_port_0_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_1_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_0_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string pcm_server_name: label: PCRF CM server name hidden: false @@ -83,10 +71,8 @@ topology_template: type: string description: OAM network name port_pcm_port_1_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_0_ip_requirements: type: list required: true @@ -157,10 +143,8 @@ topology_template: type: string description: CPS network mask port_pcm_port_1_order: - type: list + type: integer required: true - entry_schema: - type: integer node_templates: pcm_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.2ServiceTemplate.yaml index 2742d5d605..7abe24c770 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.2ServiceTemplate.yaml @@ -12,15 +12,11 @@ node_types: topology_template: inputs: port_pcm_port_0_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_1_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string availabilityzone_name: label: availabilityzone name hidden: false @@ -39,25 +35,17 @@ topology_template: type: string description: PCRF CM image name port_pcm_port_0_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pcm_port_0_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_1_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_0_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string pcm_server_name: label: PCRF CM server name hidden: false @@ -83,10 +71,8 @@ topology_template: type: string description: OAM network name port_pcm_port_1_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_0_ip_requirements: type: list required: true @@ -157,10 +143,8 @@ topology_template: type: string description: CPS network mask port_pcm_port_1_order: - type: list + type: integer required: true - entry_schema: - type: integer node_templates: pcm_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml index 508e2c0c5e..35bb849e6f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -9,17 +9,13 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_pcm_port_0_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_1_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string availabilityzone_name: type: string description: availabilityzone name @@ -37,29 +33,21 @@ node_types: required: true status: SUPPORTED port_pcm_port_0_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pcm_port_0_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_1_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_0_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string pcm_server_name: type: string description: PCRF CM server name @@ -84,11 +72,9 @@ node_types: required: true status: SUPPORTED port_pcm_port_1_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_0_ip_requirements: type: list required: true @@ -156,11 +142,9 @@ node_types: required: true status: SUPPORTED port_pcm_port_1_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer attributes: server_pcm_id: type: string diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/MainServiceTemplate.yaml index bb37b60eba..7c18440ad7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/MainServiceTemplate.yaml @@ -193,4 +193,4 @@ topology_template: - compute_port_0 - abstract_compute - abstract_pcm_server_0 - - abstract_pcm_server_1
\ No newline at end of file + - abstract_pcm_server_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml index 5d82785583..30417727c3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -12,15 +12,11 @@ node_types: topology_template: inputs: port_pcm_port_0_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_1_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string availabilityzone_name: label: availabilityzone name hidden: false @@ -39,25 +35,17 @@ topology_template: type: string description: PCRF CM image name port_pcm_port_0_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pcm_port_0_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_1_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_0_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string pcm_server_name: label: PCRF CM server name hidden: false @@ -83,10 +71,8 @@ topology_template: type: string description: OAM network name port_pcm_port_1_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_0_ip_requirements: type: list required: true @@ -157,10 +143,8 @@ topology_template: type: string description: CPS network mask port_pcm_port_1_order: - type: list + type: integer required: true - entry_schema: - type: integer node_templates: pcm_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml index 5895576cce..a1c235a298 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -63,29 +63,21 @@ node_types: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/MainServiceTemplate.yaml index 3977cda77a..9bcbf7f265 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/MainServiceTemplate.yaml @@ -93,4 +93,4 @@ topology_template: heat_file: ../Artifacts/hot-mog-0108-bs1271.yml description: heat template that creates MOG stack members: - - abstract_pd_server
\ No newline at end of file + - abstract_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/Nested_pd_serverServiceTemplate.yaml index 848d275147..9d1ce05ca0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/Nested_pd_serverServiceTemplate.yaml @@ -56,25 +56,17 @@ topology_template: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index 04f247ddfe..d2f6cfb03d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -63,29 +63,21 @@ node_types: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/MainServiceTemplate.yaml index 0ef109205e..53569c04ff 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/MainServiceTemplate.yaml @@ -117,4 +117,4 @@ topology_template: - network_policy_server_pd_01 - network_policy_server_pd_02 - network_policy_port0 - - abstract_pd_server
\ No newline at end of file + - abstract_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml index 92f4074364..69f28f1262 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml @@ -56,25 +56,17 @@ topology_template: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/GlobalSubstitutionTypesServiceTemplate.yaml index 1b491a0aae..d4331dac27 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -63,29 +63,21 @@ node_types: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/MainServiceTemplate.yaml index 02d0a4d90e..cfa575c19f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/MainServiceTemplate.yaml @@ -115,4 +115,4 @@ topology_template: description: heat template that creates MOG stack members: - network_policy_server - - abstract_pd_server
\ No newline at end of file + - abstract_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/Nested_pd_serverServiceTemplate.yaml index f2732b88e8..77ab1d8833 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/Nested_pd_serverServiceTemplate.yaml @@ -56,25 +56,17 @@ topology_template: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/GlobalSubstitutionTypesServiceTemplate.yaml index 94f32824bb..712c687aad 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -57,29 +57,21 @@ node_types: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/MainServiceTemplate.yaml index e953b9343d..b35fcd2d30 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/MainServiceTemplate.yaml @@ -87,4 +87,4 @@ topology_template: heat_file: ../Artifacts/hot-mog-0108-bs1271.yml description: heat template that creates MOG stack members: - - abstract_pd_server
\ No newline at end of file + - abstract_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/Nested_pd_serverServiceTemplate.yaml index 40d90a974a..baaf517328 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/Nested_pd_serverServiceTemplate.yaml @@ -51,25 +51,17 @@ topology_template: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index 46624ffd98..0d04a1e8fc 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -69,29 +69,21 @@ node_types: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/MainServiceTemplate.yaml index 9264448874..32b9d608b7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/MainServiceTemplate.yaml @@ -128,4 +128,4 @@ topology_template: members: - jsa_security_group - resource_with_dependOn - - abstract_pd_server
\ No newline at end of file + - abstract_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml index 4b78ba7b74..138ca69892 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml @@ -61,25 +61,17 @@ topology_template: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml index 5895576cce..a1c235a298 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -63,29 +63,21 @@ node_types: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/MainServiceTemplate.yaml index 289e675679..62c9c11383 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/MainServiceTemplate.yaml @@ -151,4 +151,4 @@ topology_template: members: - packet_mirror_network - pd01_volume - - abstract_pd_server
\ No newline at end of file + - abstract_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml index 848d275147..9d1ce05ca0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml @@ -56,25 +56,17 @@ topology_template: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml index 6d23833522..ddf141a6e9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -69,29 +69,21 @@ node_types: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/MainServiceTemplate.yaml index 93d119882a..9bb3ae9ec4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/MainServiceTemplate.yaml @@ -108,4 +108,4 @@ topology_template: name: Policy_BE_Affinity affinity: host targets: - - BE_Affinity_group
\ No newline at end of file + - BE_Affinity_group diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/Nested_pd_serverServiceTemplate.yaml index a3c069ec1e..293451239a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/Nested_pd_serverServiceTemplate.yaml @@ -61,25 +61,17 @@ topology_template: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index c7178397f2..837e03c8ed 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -63,29 +63,21 @@ node_types: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/MainServiceTemplate.yaml index 718d6e9427..8e24e4618b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/MainServiceTemplate.yaml @@ -112,4 +112,4 @@ topology_template: value: get_attribute: - abstract_pd_server - - pd_server_accessIPv6
\ No newline at end of file + - pd_server_accessIPv6 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml index 033f1bb05e..7a768a2d65 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml @@ -56,25 +56,17 @@ topology_template: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml index 2ef7b49f7e..ef0e8f7dba 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -63,29 +63,21 @@ node_types: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -444,11 +436,9 @@ node_types: entry_schema: type: string port_ps01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string compute_ps_server_availability_zone: type: list required: true @@ -480,21 +470,17 @@ node_types: required: true status: SUPPORTED port_ps01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer vm_image_name: type: string required: true status: SUPPORTED port_ps01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_ps01_port_replacement_policy: type: list required: true @@ -518,11 +504,9 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_ps01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_ps01_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/MainServiceTemplate.yaml index 7d67ee664d..2c5b6f86b9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/MainServiceTemplate.yaml @@ -164,4 +164,4 @@ topology_template: description: heat template that creates MOG stack members: - abstract_pd_server - - abstract_ps_server
\ No newline at end of file + - abstract_ps_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_pd_serverServiceTemplate.yaml index 848d275147..9d1ce05ca0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_pd_serverServiceTemplate.yaml @@ -56,25 +56,17 @@ topology_template: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_ps_serverServiceTemplate.yaml index e0afd0ef14..ca933c2d05 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_ps_serverServiceTemplate.yaml @@ -17,10 +17,8 @@ topology_template: entry_schema: type: string port_ps01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string compute_ps_server_availability_zone: type: list required: true @@ -47,18 +45,14 @@ topology_template: type: string required: true port_ps01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer vm_image_name: type: string required: true port_ps01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_ps01_port_replacement_policy: type: list required: true @@ -78,10 +72,8 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_ps01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_ps01_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/GlobalSubstitutionTypesServiceTemplate.yaml index a40e88e52c..0764496a7f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -63,29 +63,21 @@ node_types: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -450,11 +442,9 @@ node_types: entry_schema: type: string port_ps01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string compute_ps_server_availability_zone: type: list required: true @@ -486,21 +476,17 @@ node_types: required: true status: SUPPORTED port_ps01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer vm_image_name: type: string required: true status: SUPPORTED port_ps01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_ps01_port_replacement_policy: type: list required: true @@ -524,11 +510,9 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_ps01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_ps01_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/MainServiceTemplate.yaml index 4f92e3ee1c..dfb0641787 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/MainServiceTemplate.yaml @@ -168,4 +168,4 @@ topology_template: description: heat template that creates MOG stack members: - abstract_pd_server - - abstract_ps_server
\ No newline at end of file + - abstract_ps_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_pd_serverServiceTemplate.yaml index 24150fe29c..84d41a7ba3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_pd_serverServiceTemplate.yaml @@ -56,25 +56,17 @@ topology_template: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_ps_serverServiceTemplate.yaml index 5f9292db0b..f336c3e1de 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_ps_serverServiceTemplate.yaml @@ -17,10 +17,8 @@ topology_template: entry_schema: type: string port_ps01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string compute_ps_server_availability_zone: type: list required: true @@ -47,18 +45,14 @@ topology_template: type: string required: true port_ps01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer vm_image_name: type: string required: true port_ps01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_ps01_port_replacement_policy: type: list required: true @@ -78,10 +72,8 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_ps01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_ps01_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml index 7beb5beb5b..b484bfb791 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -41,23 +41,17 @@ node_types: required: true status: SUPPORTED port_pd02_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd02_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd02_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -85,33 +79,25 @@ node_types: entry_schema: type: string port_pd02_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd02_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED port_pd01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd02_port_ip_requirements: type: list required: true @@ -119,11 +105,9 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/MainServiceTemplate.yaml index cb7fd89b59..43820275b4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/MainServiceTemplate.yaml @@ -435,8 +435,7 @@ topology_template: is_required: false vm_flavor_name: get_input: pd_flavor_name - port_pd02_port_network_role_tag: - - oam + port_pd02_port_network_role_tag: oam port_pd01_port_mac_requirements: mac_count_required: is_required: false @@ -456,8 +455,7 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network_role_tag: - - oam + port_pd01_port_network_role_tag: oam port_pd02_port_network: - get_input: oam_net_name compute_pd_server_user_data_format: @@ -477,4 +475,4 @@ topology_template: heat_file: ../Artifacts/hot-mog-0108-bs1271.yml description: heat template that creates MOG stack members: - - abstract_pd_server
\ No newline at end of file + - abstract_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/Nested_pd_serverServiceTemplate.yaml index f66e9f46ce..f066fe3962 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/Nested_pd_serverServiceTemplate.yaml @@ -38,20 +38,14 @@ topology_template: type: string required: true port_pd02_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd02_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd02_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -74,38 +68,28 @@ topology_template: entry_schema: type: string port_pd02_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd02_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true port_pd01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd02_port_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml index 71ecda1cf9..b88f5d84f4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -25,11 +25,9 @@ node_types: entry_schema: type: string port_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -51,11 +49,9 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.VlanRequirements port_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string vm_flavor_name: type: string required: true @@ -73,11 +69,9 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string vm_image_name: type: string required: true @@ -99,11 +93,9 @@ node_types: entry_schema: type: string port_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer compute_smp_scheduler_hints: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/MainServiceTemplate.yaml index f171a22f9e..c325682f1b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/MainServiceTemplate.yaml @@ -129,4 +129,4 @@ topology_template: name: def affinity: host targets: - - BE_Affinity_group
\ No newline at end of file + - BE_Affinity_group diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/Nested_smpServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/Nested_smpServiceTemplate.yaml index 53479a1785..61eebac0d2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/Nested_smpServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/Nested_smpServiceTemplate.yaml @@ -25,10 +25,8 @@ topology_template: entry_schema: type: string port_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -47,10 +45,8 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.VlanRequirements port_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string vm_flavor_name: type: string required: true @@ -65,10 +61,8 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_port_network_role: - type: list + type: string required: true - entry_schema: - type: string vm_image_name: type: string required: true @@ -86,10 +80,8 @@ topology_template: entry_schema: type: string port_port_order: - type: list + type: integer required: true - entry_schema: - type: integer compute_smp_scheduler_hints: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index e945040f2d..087649ff59 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -37,11 +37,9 @@ node_types: entry_schema: type: json port_pd02_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -63,11 +61,9 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd02_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -97,17 +93,13 @@ node_types: required: true status: SUPPORTED port_pd02_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd02_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd02_port_vlan_requirements: type: list required: true @@ -127,27 +119,21 @@ node_types: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd02_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED port_pd01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd02_port_ip_requirements: type: list required: true @@ -155,11 +141,9 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd02_port_network: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/MainServiceTemplate.yaml index 134050d238..077dfc9a04 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/MainServiceTemplate.yaml @@ -108,8 +108,7 @@ topology_template: get_input: pd_flavor_name port_pd01_port_security_groups: - - jsa_security_group - port_pd02_port_network_role_tag: - - oam + port_pd02_port_network_role_tag: oam port_pd01_port_mac_requirements: mac_count_required: is_required: false @@ -138,8 +137,7 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network_role_tag: - - oam + port_pd01_port_network_role_tag: oam port_pd02_port_network: - get_input: oam_net_name service_template_filter: @@ -159,4 +157,4 @@ topology_template: members: - resources_with_dependOn - jsa_security_group - - abstract_pd_server
\ No newline at end of file + - abstract_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml index b488a50f55..6890c3608c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml @@ -35,10 +35,8 @@ topology_template: entry_schema: type: json port_pd02_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -56,10 +54,8 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd02_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -84,15 +80,11 @@ topology_template: type: org.openecomp.datatypes.Naming required: true port_pd02_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd02_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd02_port_vlan_requirements: type: list required: true @@ -109,33 +101,25 @@ topology_template: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd02_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true port_pd01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd02_port_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd02_port_network: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml index 9fc8547b50..9be0ebfb48 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -31,11 +31,9 @@ node_types: required: true status: SUPPORTED port_pd02_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -57,11 +55,9 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd02_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -91,17 +87,13 @@ node_types: required: true status: SUPPORTED port_pd02_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd02_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd02_port_vlan_requirements: type: list required: true @@ -115,27 +107,21 @@ node_types: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd02_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED port_pd01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd02_port_ip_requirements: type: list required: true @@ -143,11 +129,9 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd02_port_network: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/MainServiceTemplate.yaml index 7588e0236b..482b76338e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/MainServiceTemplate.yaml @@ -170,4 +170,4 @@ topology_template: members: - packet_mirror_network - pd01_volume - - abstract_pd_server
\ No newline at end of file + - abstract_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml index 2a5afbff47..89092eec9e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml @@ -30,10 +30,8 @@ topology_template: type: string required: true port_pd02_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -51,10 +49,8 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd02_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -79,15 +75,11 @@ topology_template: type: org.openecomp.datatypes.Naming required: true port_pd02_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd02_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd02_port_vlan_requirements: type: list required: true @@ -99,33 +91,25 @@ topology_template: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd02_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true port_pd01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd02_port_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd02_port_network: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index 331b527ddb..3bdd9e6fc1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -31,11 +31,9 @@ node_types: entry_schema: type: json port_pd01_port_0_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string compute_pd_server_availability_zone: type: list required: true @@ -59,39 +57,29 @@ node_types: required: true status: SUPPORTED port_pd01_port_1_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_0_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_1_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string vm_image_name: type: string required: true status: SUPPORTED port_pd01_port_1_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_0_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_1_network: type: list required: true @@ -105,11 +93,9 @@ node_types: entry_schema: type: string port_pd01_port_0_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_1_ip_requirements: type: list required: true @@ -125,11 +111,9 @@ node_types: constraints: - greater_or_equal: 0 port_pd01_port_1_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/MainServiceTemplate.yaml index cbda5466e7..055edbcb85 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/MainServiceTemplate.yaml @@ -121,14 +121,12 @@ topology_template: get_input: pd_flavor_name vm_image_name: get_input: pd_image_name - port_pd01_port_1_network_role_tag: - - oam + port_pd01_port_1_network_role_tag: oam port_pd01_port_1_network: - get_input: oam_net_name compute_pd_server_user_data_format: - RAW - port_pd01_port_0_network_role_tag: - - oam + port_pd01_port_0_network_role_tag: oam port_pd01_port_1_ip_requirements: - ip_version: 4 ip_count_required: @@ -159,4 +157,4 @@ topology_template: members: - resources_with_dependOn - jsa_security_group - - abstract_pd_server
\ No newline at end of file + - abstract_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml index 87e04942c0..b112335790 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml @@ -30,10 +30,8 @@ topology_template: entry_schema: type: json port_pd01_port_0_network_role: - type: list + type: string required: true - entry_schema: - type: string compute_pd_server_availability_zone: type: list required: true @@ -53,33 +51,23 @@ topology_template: type: string required: true port_pd01_port_1_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_0_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_1_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string vm_image_name: type: string required: true port_pd01_port_1_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_0_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_1_network: type: list required: true @@ -91,10 +79,8 @@ topology_template: entry_schema: type: string port_pd01_port_0_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_1_ip_requirements: type: list required: true @@ -108,10 +94,8 @@ topology_template: constraints: - greater_or_equal: 0 port_pd01_port_1_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml index 2d2089d7be..50a0b6a382 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -25,11 +25,9 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_0_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string compute_pd_server_availability_zone: type: list required: true @@ -53,39 +51,29 @@ node_types: required: true status: SUPPORTED port_pd01_port_1_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_0_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_1_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string vm_image_name: type: string required: true status: SUPPORTED port_pd01_port_1_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_0_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_1_network: type: list required: true @@ -99,11 +87,9 @@ node_types: entry_schema: type: string port_pd01_port_0_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_1_ip_requirements: type: list required: true @@ -119,11 +105,9 @@ node_types: constraints: - greater_or_equal: 0 port_pd01_port_1_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml index 4fd079f393..5931d1278c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml @@ -182,4 +182,4 @@ topology_template: - packet_mirror_network - pd01_volume - packet_internal_network - - abstract_pd_server
\ No newline at end of file + - abstract_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml index 5fc367779c..2de5078689 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml @@ -25,10 +25,8 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_0_network_role: - type: list + type: string required: true - entry_schema: - type: string compute_pd_server_availability_zone: type: list required: true @@ -48,33 +46,23 @@ topology_template: type: string required: true port_pd01_port_1_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_0_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_1_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string vm_image_name: type: string required: true port_pd01_port_1_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_0_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_1_network: type: list required: true @@ -86,10 +74,8 @@ topology_template: entry_schema: type: string port_pd01_port_0_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_1_ip_requirements: type: list required: true @@ -103,10 +89,8 @@ topology_template: constraints: - greater_or_equal: 0 port_pd01_port_1_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/GlobalSubstitutionTypesServiceTemplate.yaml index fb81c9e7ed..023b48b2a7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -41,23 +41,17 @@ node_types: required: true status: SUPPORTED port_pd02_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd02_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd02_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -85,33 +79,25 @@ node_types: entry_schema: type: string port_pd02_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd02_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED port_pd01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd02_port_ip_requirements: type: list required: true @@ -119,11 +105,9 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -560,17 +544,13 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_pcm_port_0_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_1_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string availabilityzone_name: type: string description: availabilityzone name @@ -593,29 +573,21 @@ node_types: required: true status: SUPPORTED port_pcm_port_0_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pcm_port_0_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_1_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_0_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string pcm_server_name: type: string description: PCRF CM server name @@ -640,11 +612,9 @@ node_types: required: true status: SUPPORTED port_pcm_port_1_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_0_ip_requirements: type: list required: true @@ -717,11 +687,9 @@ node_types: required: true status: SUPPORTED port_pcm_port_1_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer attributes: server_pcm_id: type: string diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml index 1da54ccd72..48d9735fb9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml @@ -466,8 +466,7 @@ topology_template: is_required: false vm_flavor_name: get_input: pd_flavor_name - port_pd02_port_network_role_tag: - - oam + port_pd02_port_network_role_tag: oam port_pd01_port_mac_requirements: mac_count_required: is_required: false @@ -487,8 +486,7 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network_role_tag: - - oam + port_pd01_port_network_role_tag: oam port_pd02_port_network: - get_input: oam_net_name compute_pd_server_user_data_format: @@ -509,4 +507,4 @@ topology_template: description: heat template that creates MOG stack members: - abstract_pd_server - - abstract_pcm_server_0
\ No newline at end of file + - abstract_pcm_server_0 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/Nested_pd_serverServiceTemplate.yaml index f66e9f46ce..f066fe3962 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/Nested_pd_serverServiceTemplate.yaml @@ -38,20 +38,14 @@ topology_template: type: string required: true port_pd02_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd02_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd02_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -74,38 +68,28 @@ topology_template: entry_schema: type: string port_pd02_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd02_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true port_pd01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd02_port_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/nested-pcm_v0.1ServiceTemplate.yaml index 5530999168..73aad65219 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -12,15 +12,11 @@ node_types: topology_template: inputs: port_pcm_port_0_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_1_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string availabilityzone_name: label: availabilityzone name hidden: false @@ -45,25 +41,17 @@ topology_template: type: string description: CPS network ip port_pcm_port_0_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pcm_port_0_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_1_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_0_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string pcm_server_name: label: PCRF CM server name hidden: false @@ -89,10 +77,8 @@ topology_template: type: string description: OAM network name port_pcm_port_1_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_0_ip_requirements: type: list required: true @@ -169,10 +155,8 @@ topology_template: type: string description: CPS network mask port_pcm_port_1_order: - type: list + type: integer required: true - entry_schema: - type: integer node_templates: pcm_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml index 754b59c1a7..5278a654c0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -25,17 +25,13 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_0_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_0_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_1_ip_requirements: type: list required: true @@ -63,11 +59,9 @@ node_types: entry_schema: type: string port_pd01_port_1_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer vm_flavor_name: type: string required: true @@ -77,17 +71,13 @@ node_types: required: true status: SUPPORTED port_pd01_port_1_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_0_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_1_vlan_requirements: type: list required: true @@ -99,11 +89,9 @@ node_types: required: true status: SUPPORTED port_pd01_port_1_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string vm_image_name: type: string required: true @@ -113,11 +101,9 @@ node_types: required: true status: SUPPORTED port_pd01_port_1_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_0_vlan_requirements: type: list required: true @@ -125,11 +111,9 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.VlanRequirements port_pd01_port_0_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_1_network: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/MainServiceTemplate.yaml index 1aa61885d9..4715d0e7a8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/MainServiceTemplate.yaml @@ -435,8 +435,7 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_0_network_role_tag: - - oam + port_pd01_port_0_network_role_tag: oam port_pd01_port_1_ip_requirements: - ip_version: 4 ip_count_required: @@ -456,8 +455,7 @@ topology_template: is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_1_network_role_tag: - - oam + port_pd01_port_1_network_role_tag: oam port_pd01_port_1_network: - get_input: oam_net_name compute_pd_server_user_data_format: @@ -477,4 +475,4 @@ topology_template: heat_file: ../Artifacts/hot-mog-0108-bs1271.yml description: heat template that creates MOG stack members: - - abstract_pd_server
\ No newline at end of file + - abstract_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/Nested_pd_serverServiceTemplate.yaml index 17c2a7bed2..72b3354e04 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/Nested_pd_serverServiceTemplate.yaml @@ -25,15 +25,11 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_0_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_0_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_1_ip_requirements: type: list required: true @@ -57,10 +53,8 @@ topology_template: entry_schema: type: string port_pd01_port_1_order: - type: list + type: integer required: true - entry_schema: - type: integer vm_flavor_name: type: string required: true @@ -68,15 +62,11 @@ topology_template: type: org.openecomp.datatypes.Naming required: true port_pd01_port_1_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_0_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_1_vlan_requirements: type: list required: true @@ -86,10 +76,8 @@ topology_template: type: org.openecomp.datatypes.network.MacRequirements required: true port_pd01_port_1_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string vm_image_name: type: string required: true @@ -97,20 +85,16 @@ topology_template: type: org.openecomp.datatypes.Naming required: true port_pd01_port_1_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements port_pd01_port_0_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_1_network: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index 4cb3976455..f78767abf9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -41,23 +41,17 @@ node_types: required: true status: SUPPORTED port_pd02_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd02_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd02_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -85,33 +79,25 @@ node_types: entry_schema: type: string port_pd02_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd02_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED port_pd01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd02_port_ip_requirements: type: list required: true @@ -119,11 +105,9 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml index bc00a0f1db..20504bcba2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml @@ -435,8 +435,7 @@ topology_template: is_required: false vm_flavor_name: get_input: pd_flavor_name - port_pd02_port_network_role_tag: - - oam + port_pd02_port_network_role_tag: oam port_pd01_port_mac_requirements: mac_count_required: is_required: false @@ -456,8 +455,7 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network_role_tag: - - oam + port_pd01_port_network_role_tag: oam port_pd02_port_network: - get_input: oam_net_name compute_pd_server_user_data_format: @@ -496,4 +494,4 @@ topology_template: value: get_attribute: - abstract_pd_server - - pd_server_accessIPv4
\ No newline at end of file + - pd_server_accessIPv4 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml index 099ad6c4cf..cab0a4485f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml @@ -38,20 +38,14 @@ topology_template: type: string required: true port_pd02_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd02_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd02_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -74,38 +68,28 @@ topology_template: entry_schema: type: string port_pd02_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd02_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true port_pd01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd02_port_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index b3672770f4..27c09dd6f4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -41,23 +41,17 @@ node_types: required: true status: SUPPORTED port_pd02_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd02_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd02_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -85,33 +79,25 @@ node_types: entry_schema: type: string port_pd02_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd02_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED port_pd01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd02_port_ip_requirements: type: list required: true @@ -119,11 +105,9 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/MainServiceTemplate.yaml index d5fd0f2287..697a93c4d2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/MainServiceTemplate.yaml @@ -435,8 +435,7 @@ topology_template: is_required: false vm_flavor_name: get_input: pd_flavor_name - port_pd02_port_network_role_tag: - - oam + port_pd02_port_network_role_tag: oam port_pd01_port_mac_requirements: mac_count_required: is_required: false @@ -456,8 +455,7 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network_role_tag: - - oam + port_pd01_port_network_role_tag: oam port_pd02_port_network: - get_input: oam_net_name compute_pd_server_user_data_format: @@ -493,4 +491,4 @@ topology_template: members: - network_policy_port - network_policy_server - - abstract_pd_server
\ No newline at end of file + - abstract_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/Nested_pd_serverServiceTemplate.yaml index 957e59f341..21e31509e7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/Nested_pd_serverServiceTemplate.yaml @@ -38,20 +38,14 @@ topology_template: type: string required: true port_pd02_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd02_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd02_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -74,38 +68,28 @@ topology_template: entry_schema: type: string port_pd02_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd02_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true port_pd01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd02_port_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml index 7beb5beb5b..b484bfb791 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -41,23 +41,17 @@ node_types: required: true status: SUPPORTED port_pd02_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd02_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd02_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -85,33 +79,25 @@ node_types: entry_schema: type: string port_pd02_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd02_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED port_pd01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd02_port_ip_requirements: type: list required: true @@ -119,11 +105,9 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/MainServiceTemplate.yaml index 113873099f..a33dea1421 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/MainServiceTemplate.yaml @@ -437,8 +437,7 @@ topology_template: get_attribute: - network_policy_server - name - port_pd02_port_network_role_tag: - - oam + port_pd02_port_network_role_tag: oam port_pd01_port_mac_requirements: mac_count_required: is_required: false @@ -485,4 +484,4 @@ topology_template: description: heat template that creates MOG stack members: - network_policy_server - - abstract_pd_server
\ No newline at end of file + - abstract_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml index f66e9f46ce..f066fe3962 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml @@ -38,20 +38,14 @@ topology_template: type: string required: true port_pd02_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd02_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd02_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -74,38 +68,28 @@ topology_template: entry_schema: type: string port_pd02_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd02_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true port_pd01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd02_port_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml index 754b59c1a7..5278a654c0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -25,17 +25,13 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_0_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_0_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_1_ip_requirements: type: list required: true @@ -63,11 +59,9 @@ node_types: entry_schema: type: string port_pd01_port_1_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer vm_flavor_name: type: string required: true @@ -77,17 +71,13 @@ node_types: required: true status: SUPPORTED port_pd01_port_1_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_0_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_1_vlan_requirements: type: list required: true @@ -99,11 +89,9 @@ node_types: required: true status: SUPPORTED port_pd01_port_1_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string vm_image_name: type: string required: true @@ -113,11 +101,9 @@ node_types: required: true status: SUPPORTED port_pd01_port_1_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_0_vlan_requirements: type: list required: true @@ -125,11 +111,9 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.VlanRequirements port_pd01_port_0_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_1_network: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/MainServiceTemplate.yaml index 489dcbaa7e..07ce00a6e0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/MainServiceTemplate.yaml @@ -87,8 +87,6 @@ topology_template: is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_1_network_role_tag: - - oam port_pd01_port_1_network: - get_input: oam_net_name compute_pd_server_user_data_format: @@ -114,4 +112,4 @@ topology_template: description: heat template that creates MOG stack members: - network_policy_server - - abstract_pd_server
\ No newline at end of file + - abstract_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml index 17c2a7bed2..72b3354e04 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml @@ -25,15 +25,11 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_0_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_0_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_1_ip_requirements: type: list required: true @@ -57,10 +53,8 @@ topology_template: entry_schema: type: string port_pd01_port_1_order: - type: list + type: integer required: true - entry_schema: - type: integer vm_flavor_name: type: string required: true @@ -68,15 +62,11 @@ topology_template: type: org.openecomp.datatypes.Naming required: true port_pd01_port_1_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_0_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_1_vlan_requirements: type: list required: true @@ -86,10 +76,8 @@ topology_template: type: org.openecomp.datatypes.network.MacRequirements required: true port_pd01_port_1_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string vm_image_name: type: string required: true @@ -97,20 +85,16 @@ topology_template: type: org.openecomp.datatypes.Naming required: true port_pd01_port_1_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements port_pd01_port_0_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_1_network: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index 5f072b923b..5b0d254fda 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -25,17 +25,13 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_0_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_0_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_1_ip_requirements: type: list required: true @@ -63,11 +59,9 @@ node_types: entry_schema: type: string port_pd01_port_1_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer vm_flavor_name: type: string required: true @@ -77,17 +71,13 @@ node_types: required: true status: SUPPORTED port_pd01_port_1_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_0_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_1_vlan_requirements: type: list required: true @@ -99,11 +89,9 @@ node_types: required: true status: SUPPORTED port_pd01_port_1_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string vm_image_name: type: string required: true @@ -113,11 +101,9 @@ node_types: required: true status: SUPPORTED port_pd01_port_1_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_0_vlan_requirements: type: list required: true @@ -125,11 +111,9 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.VlanRequirements port_pd01_port_0_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_1_network: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/MainServiceTemplate.yaml index 561a5e2a7e..8b195d042a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/MainServiceTemplate.yaml @@ -435,8 +435,7 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_0_network_role_tag: - - oam + port_pd01_port_0_network_role_tag: oam port_pd01_port_1_ip_requirements: - ip_version: 4 ip_count_required: @@ -456,8 +455,7 @@ topology_template: is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_1_network_role_tag: - - oam + port_pd01_port_1_network_role_tag: oam port_pd01_port_1_network: - get_input: oam_net_name compute_pd_server_user_data_format: @@ -501,4 +499,4 @@ topology_template: - network_policy_port0 - network_policy_server - network_policy_port1 - - abstract_pd_server
\ No newline at end of file + - abstract_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml index 6780cde331..a55c9d4f43 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml @@ -25,15 +25,11 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_0_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_0_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_1_ip_requirements: type: list required: true @@ -57,10 +53,8 @@ topology_template: entry_schema: type: string port_pd01_port_1_order: - type: list + type: integer required: true - entry_schema: - type: integer vm_flavor_name: type: string required: true @@ -68,15 +62,11 @@ topology_template: type: org.openecomp.datatypes.Naming required: true port_pd01_port_1_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_0_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_1_vlan_requirements: type: list required: true @@ -86,10 +76,8 @@ topology_template: type: org.openecomp.datatypes.network.MacRequirements required: true port_pd01_port_1_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string vm_image_name: type: string required: true @@ -97,20 +85,16 @@ topology_template: type: org.openecomp.datatypes.Naming required: true port_pd01_port_1_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements port_pd01_port_0_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_1_network: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index c5b6091a2b..0ef3218a86 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -25,17 +25,13 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_0_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_0_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_1_ip_requirements: type: list required: true @@ -63,11 +59,9 @@ node_types: entry_schema: type: string port_pd01_port_1_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer vm_flavor_name: type: string required: true @@ -77,17 +71,13 @@ node_types: required: true status: SUPPORTED port_pd01_port_1_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_0_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_1_vlan_requirements: type: list required: true @@ -99,11 +89,9 @@ node_types: required: true status: SUPPORTED port_pd01_port_1_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string vm_image_name: type: string required: true @@ -113,11 +101,9 @@ node_types: required: true status: SUPPORTED port_pd01_port_1_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_0_vlan_requirements: type: list required: true @@ -125,11 +111,9 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.VlanRequirements port_pd01_port_0_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_1_network: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml index 09a422b406..4295d6f211 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml @@ -435,8 +435,7 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_0_network_role_tag: - - oam + port_pd01_port_0_network_role_tag: oam port_pd01_port_1_ip_requirements: - ip_version: 4 ip_count_required: @@ -456,8 +455,7 @@ topology_template: is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_1_network_role_tag: - - oam + port_pd01_port_1_network_role_tag: oam port_pd01_port_1_network: - get_input: oam_net_name compute_pd_server_user_data_format: @@ -496,4 +494,4 @@ topology_template: value: get_attribute: - abstract_pd_server - - pd_server_accessIPv4
\ No newline at end of file + - pd_server_accessIPv4 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml index 7f61688aa3..0ab61b87f4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml @@ -25,15 +25,11 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_0_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_0_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_1_ip_requirements: type: list required: true @@ -57,10 +53,8 @@ topology_template: entry_schema: type: string port_pd01_port_1_order: - type: list + type: integer required: true - entry_schema: - type: integer vm_flavor_name: type: string required: true @@ -68,15 +62,11 @@ topology_template: type: org.openecomp.datatypes.Naming required: true port_pd01_port_1_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_0_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_1_vlan_requirements: type: list required: true @@ -86,10 +76,8 @@ topology_template: type: org.openecomp.datatypes.network.MacRequirements required: true port_pd01_port_1_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string vm_image_name: type: string required: true @@ -97,20 +85,16 @@ topology_template: type: org.openecomp.datatypes.Naming required: true port_pd01_port_1_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements port_pd01_port_0_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_1_network: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml index cf65048b1c..753e1c5654 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -69,29 +69,21 @@ node_types: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -503,17 +495,13 @@ node_types: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string compute_oam_server_user_data_format: type: list required: true @@ -527,17 +515,13 @@ node_types: entry_schema: type: string port_pd01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -962,29 +946,21 @@ node_types: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml index 540ba148b0..82259a7a1a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml @@ -229,8 +229,7 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name - port_pd01_port_network_role_tag: - - oam + port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -327,8 +326,7 @@ topology_template: - get_input: - oam_server_names - 0 - port_pd01_port_network_role_tag: - - oam + port_pd01_port_network_role_tag: oam compute_oam_server_scheduler_hints: - group: BE_Affinity_group service_template_filter: @@ -471,4 +469,4 @@ topology_template: name: def affinity: host targets: - - BE_Affinity_group
\ No newline at end of file + - BE_Affinity_group diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_oam_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_oam_serverServiceTemplate.yaml index 86140ff463..edf8bd21d5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_oam_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_oam_serverServiceTemplate.yaml @@ -51,15 +51,11 @@ topology_template: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string compute_oam_server_user_data_format: type: list required: true @@ -71,15 +67,11 @@ topology_template: entry_schema: type: string port_pd01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_pd_serverServiceTemplate.yaml index 7f289a549c..19c74bf61a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_pd_serverServiceTemplate.yaml @@ -61,25 +61,17 @@ topology_template: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_ps_serverServiceTemplate.yaml index 1b1ba2fa31..c9443f5c9d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_ps_serverServiceTemplate.yaml @@ -66,25 +66,17 @@ topology_template: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml index dad62cb57f..ca9a33c87d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -57,29 +57,21 @@ node_types: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -474,17 +466,13 @@ node_types: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string compute_oam_server_user_data_format: type: list required: true @@ -498,17 +486,13 @@ node_types: entry_schema: type: string port_pd01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -909,29 +893,21 @@ node_types: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/MainServiceTemplate.yaml index bd59583f2b..927e672add 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/MainServiceTemplate.yaml @@ -198,8 +198,7 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name - port_pd01_port_network_role_tag: - - oam + port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -280,8 +279,7 @@ topology_template: - get_input: - oam_server_names - 0 - port_pd01_port_network_role_tag: - - oam + port_pd01_port_network_role_tag: oam service_template_filter: substitute_service_template: Nested_oam_serverServiceTemplate.yaml count: 1 @@ -305,4 +303,4 @@ topology_template: - network_policy_server - abstract_pd_server - abstract_ps_server - - abstract_oam_server
\ No newline at end of file + - abstract_oam_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_oam_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_oam_serverServiceTemplate.yaml index 7f0cba4c4a..4c65966d38 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_oam_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_oam_serverServiceTemplate.yaml @@ -46,15 +46,11 @@ topology_template: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string compute_oam_server_user_data_format: type: list required: true @@ -66,15 +62,11 @@ topology_template: entry_schema: type: string port_pd01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_pd_serverServiceTemplate.yaml index 4e52db4495..fc9395c618 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_pd_serverServiceTemplate.yaml @@ -51,25 +51,17 @@ topology_template: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_ps_serverServiceTemplate.yaml index f0d3d289c8..71cb4b5c2a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_ps_serverServiceTemplate.yaml @@ -56,25 +56,17 @@ topology_template: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/GlobalSubstitutionTypesServiceTemplate.yaml index 590f311c75..44ad0fecd5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -51,29 +51,21 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -468,29 +460,21 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -891,29 +875,21 @@ node_types: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml index 2d1315c354..46f451d8a2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml @@ -211,8 +211,7 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name - port_pd01_port_network_role_tag: - - oam + port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -307,4 +306,4 @@ topology_template: - network_policy_server - abstract_pd_server_0 - abstract_pd_server_1 - - abstract_pd_server_2
\ No newline at end of file + - abstract_pd_server_2 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_0ServiceTemplate.yaml index 599756d390..a44d0824ee 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_0ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_0ServiceTemplate.yaml @@ -46,25 +46,17 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_1ServiceTemplate.yaml index 5ed2bb6462..f923c1d445 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_1ServiceTemplate.yaml @@ -46,25 +46,17 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_2ServiceTemplate.yaml index 6dd9433313..828bcb6145 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_2ServiceTemplate.yaml @@ -51,25 +51,17 @@ topology_template: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml index 1f2d24b189..74f9812851 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -57,29 +57,21 @@ node_types: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -480,29 +472,21 @@ node_types: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -855,23 +839,17 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_pd01_port_2_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_3_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_3_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer index_value: type: integer description: Index value of this substitution service template runtime instance @@ -903,11 +881,9 @@ node_types: required: true status: SUPPORTED port_pd01_port_2_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_3_ip_requirements: type: list required: true @@ -925,27 +901,21 @@ node_types: entry_schema: type: string port_pd01_port_2_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_2_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string vm_image_name: type: string required: true status: SUPPORTED port_pd01_port_3_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_2_network: type: list required: true @@ -967,11 +937,9 @@ node_types: required: true status: SUPPORTED port_pd01_port_3_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string compute_pd_server_user_data_format: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml index 20bc8900a3..f50bc8b417 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml @@ -185,8 +185,7 @@ topology_template: get_attribute: - network_policy_server - name - port_pd01_port_2_network_role_tag: - - oam + port_pd01_port_2_network_role_tag: oam port_pd01_port_3_ip_requirements: - ip_version: 4 ip_count_required: @@ -205,8 +204,7 @@ topology_template: port_pd01_port_2_mac_requirements: mac_count_required: is_required: false - port_pd01_port_3_network_role_tag: - - oam + port_pd01_port_3_network_role_tag: oam compute_pd_server_user_data_format: - RAW port_pd01_port_2_ip_requirements: @@ -256,8 +254,7 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name - port_pd01_port_network_role_tag: - - oam + port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -318,4 +315,4 @@ topology_template: - network_policy_server - abstract_pd_server_0 - abstract_pd_server_1 - - abstract_pd_server_2
\ No newline at end of file + - abstract_pd_server_2 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_0ServiceTemplate.yaml index 707bfc960d..b1f51f3f57 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_0ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_0ServiceTemplate.yaml @@ -51,25 +51,17 @@ topology_template: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_1ServiceTemplate.yaml index 340d30e52a..a6d8533b57 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_1ServiceTemplate.yaml @@ -51,25 +51,17 @@ topology_template: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_2ServiceTemplate.yaml index 1a38b715e5..81642671ab 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_2ServiceTemplate.yaml @@ -12,20 +12,14 @@ node_types: topology_template: inputs: port_pd01_port_2_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_3_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_3_order: - type: list + type: integer required: true - entry_schema: - type: integer index_value: type: integer description: Index value of this substitution service template runtime instance @@ -52,10 +46,8 @@ topology_template: type: string required: true port_pd01_port_2_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_3_ip_requirements: type: list required: true @@ -70,23 +62,17 @@ topology_template: entry_schema: type: string port_pd01_port_2_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_2_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string vm_image_name: type: string required: true port_pd01_port_3_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_2_network: type: list required: true @@ -104,10 +90,8 @@ topology_template: type: org.openecomp.datatypes.Naming required: true port_pd01_port_3_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string compute_pd_server_user_data_format: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml index b181fa11d4..b5daf7ce6f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -57,29 +57,21 @@ node_types: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -444,11 +436,9 @@ node_types: entry_schema: type: string port_ps01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string compute_ps_server_availability_zone: type: list required: true @@ -480,21 +470,17 @@ node_types: required: true status: SUPPORTED port_ps01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer vm_image_name: type: string required: true status: SUPPORTED port_ps01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_ps01_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -512,11 +498,9 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_ps01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_ps01_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/MainServiceTemplate.yaml index 5b70f82a07..69ccca59d7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/MainServiceTemplate.yaml @@ -378,8 +378,7 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name - port_pd01_port_network_role_tag: - - oam + port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -420,8 +419,7 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_ps01_port_network_role_tag: - - oam + port_ps01_port_network_role_tag: oam service_template_filter: substitute_service_template: Nested_ps_serverServiceTemplate.yaml count: 1 @@ -438,4 +436,4 @@ topology_template: description: heat template that creates MOG stack members: - abstract_pd_server - - abstract_ps_server
\ No newline at end of file + - abstract_ps_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml index 94e2b1451c..38b011e2e3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml @@ -51,25 +51,17 @@ topology_template: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_ps_serverServiceTemplate.yaml index fdb4c585fe..4d002e7f4b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_ps_serverServiceTemplate.yaml @@ -17,10 +17,8 @@ topology_template: entry_schema: type: string port_ps01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string compute_ps_server_availability_zone: type: list required: true @@ -47,18 +45,14 @@ topology_template: type: string required: true port_ps01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer vm_image_name: type: string required: true port_ps01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_ps01_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -73,10 +67,8 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_ps01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_ps01_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/GlobalSubstitutionTypesServiceTemplate.yaml index 1f66eb3d7a..8080962bc4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -57,29 +57,21 @@ node_types: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -438,11 +430,9 @@ node_types: entry_schema: type: string port_ps01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string compute_ps_server_availability_zone: type: list required: true @@ -474,21 +464,17 @@ node_types: required: true status: SUPPORTED port_ps01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer vm_image_name: type: string required: true status: SUPPORTED port_ps01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_ps01_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -506,11 +492,9 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_ps01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_ps01_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/MainServiceTemplate.yaml index 577954e72a..d3a239a575 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/MainServiceTemplate.yaml @@ -376,8 +376,7 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name - port_pd01_port_network_role_tag: - - oam + port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -416,8 +415,7 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_ps01_port_network_role_tag: - - oam + port_ps01_port_network_role_tag: oam service_template_filter: substitute_service_template: Nested_ps_serverServiceTemplate.yaml count: 1 @@ -434,4 +432,4 @@ topology_template: description: heat template that creates MOG stack members: - abstract_pd_server - - abstract_ps_server
\ No newline at end of file + - abstract_ps_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_pd_serverServiceTemplate.yaml index 4e52db4495..fc9395c618 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_pd_serverServiceTemplate.yaml @@ -51,25 +51,17 @@ topology_template: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_ps_serverServiceTemplate.yaml index 6050581dc8..80443ab8da 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_ps_serverServiceTemplate.yaml @@ -17,10 +17,8 @@ topology_template: entry_schema: type: string port_ps01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string compute_ps_server_availability_zone: type: list required: true @@ -47,18 +45,14 @@ topology_template: type: string required: true port_ps01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer vm_image_name: type: string required: true port_ps01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_ps01_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -73,10 +67,8 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_ps01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_ps01_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true |