diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities')
15 files changed, 2937 insertions, 2937 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/in/hot-mog-0108-bs1271.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/in/hot-mog-0108-bs1271.yml index c063cfdd26..433dedea7b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/in/hot-mog-0108-bs1271.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/in/hot-mog-0108-bs1271.yml @@ -60,8 +60,8 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: 1a_t1_port_0} - - port: {get_resource: 1a_t2_port_0} + - port: {get_resource: a_single_1a_0_t1_port_0} + - port: {get_resource: a_single_1a_0_t2_port_0} user_data_format: RAW scheduler_hints: { group: { get_resource: BE_Affinity } } metadata: { connectivityTo1A : {get_attr : [2a_single_1A_2, instance_name]}, @@ -89,7 +89,7 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: 1a_t1_port_1} + - port: {get_resource: a_single_2a_0_t1_port_0} user_data_format: RAW scheduler_hints: { group: { get_resource: BE_Affinity } } metadata: { connectivityTo1A : {get_attr : [1a_single_1A_1, instance_name]}, @@ -110,15 +110,15 @@ resources: } - 1a_t1_port_0: + a_single_1a_0_t1_port_0: type: OS::Neutron::Port properties: network: {get_resource: a_single_1a_network} - 1a_t2_port_0: + a_single_1a_0_t2_port_0: type: OS::Neutron::Port properties: network: {get_param: ppds_net_name} - 1a_t1_port_1: + a_single_2a_0_t1_port_0: type: OS::Neutron::Port properties: network: {get_resource: a_single_1a_network} @@ -138,18 +138,18 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: 1b_t1_port_01} - - port: {get_resource: 1b_t2_port_01} + - port: {get_resource: b_single_1b_0_t1_port_0} + - port: {get_resource: b_single_1b_0_t2_port_0} user_data_format: RAW scheduler_hints: { group: { get_resource: BE_Affinity } } metadata: { connectivityTo1A_1 : {get_attr : [1a_single_1A_1, instance_name]}, connectivityTo1A_2 : {get_attr : [2a_single_1A_2, instance_name]}, connectivityTo1B01_2 : {get_attr : [1b01_single_1B_2, instance_name]}, connectivityTo1B02_2 : {get_attr : [1b02_single_1B_2, instance_name]}, - connectivityTo1C1_T1_01 : {get_attr : [1c1_t1_port_01, tenant_id]}, - connectivityTo1C1_T1_02 : {get_attr : [1c1_t1_port_02, tenant_id]}, - connectivityTo1C1_T1_11 : {get_attr : [1c1_t1_port_11, tenant_id]}, - connectivityTo1C1_T1_12 : {get_attr : [1c1_t1_port_12, tenant_id]}, + connectivityTo1C1_T1_01 : {get_attr : [1c11_scalling_instance_0_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_02 : {get_attr : [1c11_scalling_instance_1_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_11 : {get_attr : [1c12_scalling_instance_0_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_12 : {get_attr : [1c12_scalling_instance_1_t1_port_0, tenant_id]}, connectivityTo1C2_1_1 : {get_attr : [1c201_catalog_instance_1C21, instance_name]}, connectivityTo1C2_2_1 : {get_attr : [2c202_catalog_instance_1C21, instance_name]}, connectivityTo1C2_1_2 : {get_attr : [1c201_catalog_instance_1C22, instance_name]}, @@ -160,12 +160,12 @@ resources: connectivityToNoUnifiedNested_2 : {get_attr : [nestedNoUnified_2, portId]} } - 1b_t1_port_01: + b_single_1b_0_t1_port_0: type: OS::Neutron::Port properties: network: {get_attr: [1b01_single_1B_1, accessIPv6]} - 1b_t2_port_01: + b_single_1b_0_t2_port_0: type: OS::Neutron::Port properties: network: {get_resource: b_single_1b_network_1} @@ -184,18 +184,18 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: 1b_t1_port_11} - - port: {get_resource: 1b_t2_port_11} + - port: {get_resource: b_single_1b_1_t1_port_0} + - port: {get_resource: b_single_1b_1_t2_port_0} user_data_format: RAW scheduler_hints: { group: { get_resource: BE_Affinity } } - 1b_t1_port_11: + b_single_1b_1_t1_port_0: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} - value_specs: {get_attr: [1a_t1_port_0, tenant_id]} + value_specs: {get_attr: [a_single_1a_0_t1_port_0, tenant_id]} - 1b_t2_port_11: + b_single_1b_1_t2_port_0: type: OS::Neutron::Port properties: network: {get_resource: b_single_1b_network_1} @@ -208,18 +208,18 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: 1b_t1_port_02} - - port: {get_resource: 1b_t2_port_02} + - port: {get_resource: b_single_2b_0_t1_port_0} + - port: {get_resource: b_single_2b_0_t2_port_0} user_data_format: RAW scheduler_hints: { group: { get_resource: BE_Affinity } } metadata: { connectivityTo1A_1 : {get_attr : [1a_single_1A_1, instance_name]}, connectivityTo1A_2 : {get_attr : [2a_single_1A_2, instance_name]}, connectivityTo1B01_1 : {get_attr : [1b01_single_1B_1, instance_name]}, connectivityTo1B02_1 : {get_attr : [1b02_single_1B_1, instance_name]}, - connectivityTo1C1_T1_01 : {get_attr : [1c1_t1_port_01, tenant_id]}, - connectivityTo1C1_T1_02 : {get_attr : [1c1_t1_port_02, tenant_id]}, - connectivityTo1C1_T1_11 : {get_attr : [1c1_t1_port_11, tenant_id]}, - connectivityTo1C1_T1_12 : {get_attr : [1c1_t1_port_12, tenant_id]}, + connectivityTo1C1_T1_01 : {get_attr : [1c11_scalling_instance_0_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_02 : {get_attr : [1c11_scalling_instance_1_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_11 : {get_attr : [1c12_scalling_instance_0_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_12 : {get_attr : [1c12_scalling_instance_1_t1_port_0, tenant_id]}, connectivityTo1C2_1_1 : {get_attr : [1c201_catalog_instance_1C21, instance_name]}, connectivityTo1C2_2_1 : {get_attr : [2c202_catalog_instance_1C21, instance_name]}, connectivityTo1C2_1_2 : {get_attr : [1c201_catalog_instance_1C22, instance_name]}, @@ -230,12 +230,12 @@ resources: connectivityToNoUnifiedNested_2 : {get_attr : [nestedNoUnified_2, portId]} } - 1b_t1_port_02: + b_single_2b_0_t1_port_0: type: OS::Neutron::Port properties: network: {get_attr: [1b01_single_1B_2, accessIPv6]} - 1b_t2_port_02: + b_single_2b_0_t2_port_0: type: OS::Neutron::Port properties: network: {get_resource: b_single_1b_network_2} @@ -254,18 +254,18 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: 1b_t1_port_12} - - port: {get_resource: 1b_t2_port_12} + - port: {get_resource: b_single_2b_1_t1_port_0} + - port: {get_resource: b_single_2b_1_t2_port_0} user_data_format: RAW scheduler_hints: { group: { get_resource: BE_Affinity } } - 1b_t1_port_12: + b_single_2b_1_t1_port_0: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} - value_specs: {get_attr: [1a_t1_port_0, tenant_id]} + value_specs: {get_attr: [a_single_1a_0_t1_port_0, tenant_id]} - 1b_t2_port_12: + b_single_2b_1_t2_port_0: type: OS::Neutron::Port properties: network: {get_resource: b_single_1b_network_2} @@ -280,7 +280,7 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: 1c1_t1_port_01} + - port: {get_resource: 1c11_scalling_instance_0_t1_port_0} user_data_format: RAW1 scheduler_hints: { group: { get_resource: BE_Affinity } } metadata: { connectivityTo1A_1 : {get_attr : [1a_single_1A_1, instance_name]}, @@ -289,9 +289,9 @@ resources: connectivityTo1B02_1 : {get_attr : [1b02_single_1B_1, instance_name]}, connectivityTo1B01_2 : {get_attr : [1b01_single_1B_2, instance_name]}, connectivityTo1B02_2 : {get_attr : [1b02_single_1B_2, instance_name]}, - connectivityTo1C1_T1_02 : {get_attr : [1c1_t1_port_02, tenant_id]}, - connectivityTo1C1_T1_11 : {get_attr : [1c1_t1_port_11, tenant_id]}, - connectivityTo1C1_T1_12 : {get_attr : [1c1_t1_port_12, tenant_id]}, + connectivityTo1C1_T1_02 : {get_attr : [1c11_scalling_instance_1_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_11 : {get_attr : [1c12_scalling_instance_0_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_12 : {get_attr : [1c12_scalling_instance_1_t1_port_0, tenant_id]}, connectivityTo1C2_1_1 : {get_attr : [1c201_catalog_instance_1C21, instance_name]}, connectivityTo1C2_2_1 : {get_attr : [2c202_catalog_instance_1C21, instance_name]}, connectivityTo1C2_1_2 : {get_attr : [1c201_catalog_instance_1C22, instance_name]}, @@ -302,12 +302,12 @@ resources: connectivityToNoUnifiedNested_2 : {get_attr : [nestedNoUnified_2, portId]} } - 1c1_t1_port_01: + 1c11_scalling_instance_0_t1_port_0: type: OS::Neutron::Port properties: network: {get_resource: 1c1_scalling_instance_network} fixed_ips: [{"ip_address": {get_param: [myIPs, 1]}}] - name: 1c1_t1_port_01 + name: 1c11_scalling_instance_0_t1_port_0 1c1_t2_port_01: type: OS::Neutron::Port properties: @@ -329,7 +329,7 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: 1c1_t1_port_02} + - port: {get_resource: 1c11_scalling_instance_1_t1_port_0} user_data_format: RAW1 scheduler_hints: { group: { get_resource: BE_Affinity } } metadata: { connectivityTo1A_1 : {get_attr : [1a_single_1A_1, instance_name]}, @@ -338,9 +338,9 @@ resources: connectivityTo1B02_1 : {get_attr : [1b02_single_1B_1, instance_name]}, connectivityTo1B01_2 : {get_attr : [1b01_single_1B_2, instance_name]}, connectivityTo1B02_2 : {get_attr : [1b02_single_1B_2, instance_name]}, - connectivityTo1C1_T1_02 : {get_attr : [1c1_t1_port_02, tenant_id]}, - connectivityTo1C1_T1_11 : {get_attr : [1c1_t1_port_11, tenant_id]}, - connectivityTo1C1_T1_12 : {get_attr : [1c1_t1_port_12, tenant_id]}, + connectivityTo1C1_T1_02 : {get_attr : [1c11_scalling_instance_1_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_11 : {get_attr : [1c12_scalling_instance_0_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_12 : {get_attr : [1c12_scalling_instance_1_t1_port_0, tenant_id]}, connectivityTo1C2_1_1 : {get_attr : [1c201_catalog_instance_1C21, instance_name]}, connectivityTo1C2_2_1 : {get_attr : [2c202_catalog_instance_1C21, instance_name]}, connectivityTo1C2_1_2 : {get_attr : [1c201_catalog_instance_1C22, instance_name]}, @@ -351,12 +351,12 @@ resources: connectivityToNoUnifiedNested_2 : {get_attr : [nestedNoUnified_2, portId]} } - 1c1_t1_port_11: + 1c12_scalling_instance_0_t1_port_0: type: OS::Neutron::Port properties: network: {get_resource: 1c1_scalling_instance_network} fixed_ips: [{"ip_address": {get_param: [myIPs, 1]}}] - name: 1c1_t1_port_11 + name: 1c12_scalling_instance_0_t1_port_0 1c1_t2_port_11: type: OS::Neutron::Port @@ -373,7 +373,7 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: 1c1_t1_port_11} + - port: {get_resource: 1c12_scalling_instance_0_t1_port_0} user_data_format: RAW1 scheduler_hints: { group: { get_resource: BE_Affinity } } metadata: { connectivityTo1A_1 : {get_attr : [1a_single_1A_1, instance_name]}, @@ -382,9 +382,9 @@ resources: connectivityTo1B02_1 : {get_attr : [1b02_single_1B_1, instance_name]}, connectivityTo1B01_2 : {get_attr : [1b01_single_1B_2, instance_name]}, connectivityTo1B02_2 : {get_attr : [1b02_single_1B_2, instance_name]}, - connectivityTo1C1_T1_01 : {get_attr : [1c1_t1_port_01, tenant_id]}, - connectivityTo1C1_T1_11 : {get_attr : [1c1_t1_port_11, tenant_id]}, - connectivityTo1C1_T1_12 : {get_attr : [1c1_t1_port_12, tenant_id]}, + connectivityTo1C1_T1_01 : {get_attr : [1c11_scalling_instance_0_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_11 : {get_attr : [1c12_scalling_instance_0_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_12 : {get_attr : [1c12_scalling_instance_1_t1_port_0, tenant_id]}, connectivityTo1C2_1_1 : {get_attr : [1c201_catalog_instance_1C21, instance_name]}, connectivityTo1C2_2_1 : {get_attr : [2c202_catalog_instance_1C21, instance_name]}, connectivityTo1C2_1_2 : {get_attr : [1c201_catalog_instance_1C22, instance_name]}, @@ -395,12 +395,12 @@ resources: connectivityToNoUnifiedNested_2 : {get_attr : [nestedNoUnified_2, portId]} } - 1c1_t1_port_02: + 1c11_scalling_instance_1_t1_port_0: type: OS::Neutron::Port properties: network: {get_resource: 1c1_scalling_instance_network} fixed_ips: [{"ip_address": {get_param: [myIPs, 1]}}] - name: 1c1_t1_port_02 + name: 1c11_scalling_instance_1_t1_port_0 1c1_t2_port_02: type: OS::Neutron::Port properties: @@ -416,7 +416,7 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: 1c1_t1_port_12} + - port: {get_resource: 1c12_scalling_instance_1_t1_port_0} user_data_format: RAW1 scheduler_hints: { group: { get_resource: BE_Affinity } } metadata: { connectivityTo1A_1 : {get_attr : [1a_single_1A_1, instance_name]}, @@ -425,9 +425,9 @@ resources: connectivityTo1B02_1 : {get_attr : [1b02_single_1B_1, instance_name]}, connectivityTo1B01_2 : {get_attr : [1b01_single_1B_2, instance_name]}, connectivityTo1B02_2 : {get_attr : [1b02_single_1B_2, instance_name]}, - connectivityTo1C1_T1_01 : {get_attr : [1c1_t1_port_01, tenant_id]}, - connectivityTo1C1_T1_11 : {get_attr : [1c1_t1_port_11, tenant_id]}, - connectivityTo1C1_T1_12 : {get_attr : [1c1_t1_port_12, tenant_id]}, + connectivityTo1C1_T1_01 : {get_attr : [1c11_scalling_instance_0_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_11 : {get_attr : [1c12_scalling_instance_0_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_12 : {get_attr : [1c12_scalling_instance_1_t1_port_0, tenant_id]}, connectivityTo1C2_1_1 : {get_attr : [1c201_catalog_instance_1C21, instance_name]}, connectivityTo1C2_2_1 : {get_attr : [2c202_catalog_instance_1C21, instance_name]}, connectivityTo1C2_1_2 : {get_attr : [1c201_catalog_instance_1C22, instance_name]}, @@ -438,12 +438,12 @@ resources: connectivityToNoUnifiedNested_2 : {get_attr : [nestedNoUnified_2, portId]} } - 1c1_t1_port_12: + 1c12_scalling_instance_1_t1_port_0: type: OS::Neutron::Port properties: network: {get_resource: 1c1_scalling_instance_network} fixed_ips: [{"ip_address": {get_param: [myIPs, 1]}}] - name: 1c1_t1_port_12 + name: 1c12_scalling_instance_1_t1_port_0 1c1_t2_port_12: type: OS::Neutron::Port @@ -462,8 +462,8 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: 1c201_port_02} - - port: {get_resource: 2c202_port_02} + - port: {get_resource: 1c2_catalog_instance_0_201_port_0} + - port: {get_resource: 1c2_catalog_instance_0_202_port_0} user_data_format: RAW1 scheduler_hints: { group: { get_resource: BE_Affinity } } metadata: { connectivityTo1A_1 : {get_attr : [1a_single_1A_1, instance_name]}, @@ -472,10 +472,10 @@ resources: connectivityTo1B02_1 : {get_attr : [1b02_single_1B_1, instance_name]}, connectivityTo1B01_2 : {get_attr : [1b01_single_1B_2, instance_name]}, connectivityTo1B02_2 : {get_attr : [1b02_single_1B_2, instance_name]}, - connectivityTo1C1_T1_01 : {get_attr : [1c1_t1_port_01, tenant_id]}, - connectivityTo1C1_T1_02 : {get_attr : [1c1_t1_port_02, tenant_id]}, - connectivityTo1C1_T1_11 : {get_attr : [1c1_t1_port_11, tenant_id]}, - connectivityTo1C1_T1_12 : {get_attr : [1c1_t1_port_12, tenant_id]}, + connectivityTo1C1_T1_01 : {get_attr : [1c11_scalling_instance_0_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_02 : {get_attr : [1c11_scalling_instance_1_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_11 : {get_attr : [1c12_scalling_instance_0_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_12 : {get_attr : [1c12_scalling_instance_1_t1_port_0, tenant_id]}, connectivityTo1C2_2_1 : {get_attr : [2c202_catalog_instance_1C21, instance_name]}, connectivityTo1C2_1_2 : {get_attr : [1c201_catalog_instance_1C22, instance_name]}, connectivityTo1C2_2_2 : {get_attr : [2c202_catalog_instance_1C22, instance_name]}, @@ -484,14 +484,14 @@ resources: connectivityToNoUnifiedNested_1 : {get_attr : [nestedNoUnified_1, portId]}, connectivityToNoUnifiedNested_2 : {get_attr : [nestedNoUnified_2, portId]} } - diskConfig: {get_attr: [1c201_port_02, tenant_id]} + diskConfig: {get_attr: [1c2_catalog_instance_0_201_port_0, tenant_id]} personality: {get_attr: [[1a_single_1A_1, instance_name]]} - 1c201_port_02: + 1c2_catalog_instance_0_201_port_0: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} - 2c202_port_02: + 1c2_catalog_instance_0_202_port_0: type: OS::Neutron::Port properties: network: {get_resource: 1c2_catalog_instance_network} @@ -510,17 +510,17 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: 1c201_port_11} - - port: {get_resource: 2c202_port_11} + - port: {get_resource: 1c2_catalog_instance_1_201_port_0} + - port: {get_resource: 1c2_catalog_instance_1_202_port_0} user_data_format: {get_attr: [1c201_catalog_instance_1C21, instance_name]} scheduler_hints: { group: { get_resource: BE_Affinity } } - diskConfig: {get_attr: [1c201_port_02, tenant_id]} + diskConfig: {get_attr: [1c2_catalog_instance_0_201_port_0, tenant_id]} - 1c201_port_11: + 1c2_catalog_instance_1_201_port_0: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} - 2c202_port_11: + 1c2_catalog_instance_1_202_port_0: type: OS::Neutron::Port properties: network: {get_resource: 1c2_catalog_instance_network} @@ -533,8 +533,8 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: 1c201_port_022} - - port: {get_resource: 2c202_port_022} + - port: {get_resource: 2c2_catalog_instance_0_201_port_0} + - port: {get_resource: 2c2_catalog_instance_0_202_port_0} user_data_format: RAW1 scheduler_hints: { group: { get_resource: BE_Affinity } } metadata: { connectivityTo1A_1 : {get_attr : [1a_single_1A_1, instance_name]}, @@ -543,10 +543,10 @@ resources: connectivityTo1B02_1 : {get_attr : [1b02_single_1B_1, instance_name]}, connectivityTo1B01_2 : {get_attr : [1b01_single_1B_2, instance_name]}, connectivityTo1B02_2 : {get_attr : [1b02_single_1B_2, instance_name]}, - connectivityTo1C1_T1_01 : {get_attr : [1c1_t1_port_01, tenant_id]}, - connectivityTo1C1_T1_02 : {get_attr : [1c1_t1_port_02, tenant_id]}, - connectivityTo1C1_T1_11 : {get_attr : [1c1_t1_port_11, tenant_id]}, - connectivityTo1C1_T1_12 : {get_attr : [1c1_t1_port_12, tenant_id]}, + connectivityTo1C1_T1_01 : {get_attr : [1c11_scalling_instance_0_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_02 : {get_attr : [1c11_scalling_instance_1_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_11 : {get_attr : [1c12_scalling_instance_0_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_12 : {get_attr : [1c12_scalling_instance_1_t1_port_0, tenant_id]}, connectivityTo1C2_1_1 : {get_attr : [1c201_catalog_instance_1C21, instance_name]}, connectivityTo1C2_2_1 : {get_attr : [2c202_catalog_instance_1C21, instance_name]}, connectivityTo1C2_1_2 : {get_attr : [1c201_catalog_instance_1C22, instance_name]}, @@ -556,11 +556,11 @@ resources: connectivityToNoUnifiedNested_2 : {get_attr : [nestedNoUnified_2, portId]} } - 1c201_port_022: + 2c2_catalog_instance_0_201_port_0: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} - 2c202_port_022: + 2c2_catalog_instance_0_202_port_0: type: OS::Neutron::Port properties: network: {get_resource: 1c2_catalog_instance_network} @@ -573,16 +573,16 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: 1c201_port_12} - - port: {get_resource: 2c202_port_12} + - port: {get_resource: 2c2_catalog_instance_1_201_port_0} + - port: {get_resource: 2c2_catalog_instance_1_202_port_0} user_data_format: {get_attr: [1c201_catalog_instance_1C22, instance_name]} scheduler_hints: { group: { get_resource: BE_Affinity } } - 1c201_port_12: + 2c2_catalog_instance_1_201_port_0: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} - 2c202_port_12: + 2c2_catalog_instance_1_202_port_0: type: OS::Neutron::Port properties: network: {get_resource: 1c2_catalog_instance_network} @@ -604,10 +604,10 @@ resources: connectivityTo1B02_1 : {get_attr : [1b02_single_1B_1, instance_name]}, connectivityTo1B01_2 : {get_attr : [1b01_single_1B_2, instance_name]}, connectivityTo1B02_2 : {get_attr : [1b02_single_1B_2, instance_name]}, - connectivityTo1C1_T1_01 : {get_attr : [1c1_t1_port_01, tenant_id]}, - connectivityTo1C1_T1_02 : {get_attr : [1c1_t1_port_02, tenant_id]}, - connectivityTo1C1_T1_11 : {get_attr : [1c1_t1_port_11, tenant_id]}, - connectivityTo1C1_T1_12 : {get_attr : [1c1_t1_port_12, tenant_id]}, + connectivityTo1C1_T1_01 : {get_attr : [1c11_scalling_instance_0_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_02 : {get_attr : [1c11_scalling_instance_1_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_11 : {get_attr : [1c12_scalling_instance_0_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_12 : {get_attr : [1c12_scalling_instance_1_t1_port_0, tenant_id]}, connectivityTo1C2_1_1 : {get_attr : [1c201_catalog_instance_1C21, instance_name]}, connectivityTo1C2_2_1 : {get_attr : [2c202_catalog_instance_1C21, instance_name]}, connectivityTo1C2_1_2 : {get_attr : [1c201_catalog_instance_1C22, instance_name]}, @@ -639,10 +639,10 @@ resources: connectivityTo1B02_1 : {get_attr : [1b02_single_1B_1, instance_name]}, connectivityTo1B01_2 : {get_attr : [1b01_single_1B_2, instance_name]}, connectivityTo1B02_2 : {get_attr : [1b02_single_1B_2, instance_name]}, - connectivityTo1C1_T1_01 : {get_attr : [1c1_t1_port_01, tenant_id]}, - connectivityTo1C1_T1_02 : {get_attr : [1c1_t1_port_02, tenant_id]}, - connectivityTo1C1_T1_11 : {get_attr : [1c1_t1_port_11, tenant_id]}, - connectivityTo1C1_T1_12 : {get_attr : [1c1_t1_port_12, tenant_id]}, + connectivityTo1C1_T1_01 : {get_attr : [1c11_scalling_instance_0_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_02 : {get_attr : [1c11_scalling_instance_1_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_11 : {get_attr : [1c12_scalling_instance_0_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_12 : {get_attr : [1c12_scalling_instance_1_t1_port_0, tenant_id]}, connectivityTo1C2_1_1 : {get_attr : [1c201_catalog_instance_1C21, instance_name]}, connectivityTo1C2_2_1 : {get_attr : [2c202_catalog_instance_1C21, instance_name]}, connectivityTo1C2_1_2 : {get_attr : [1c201_catalog_instance_1C22, instance_name]}, @@ -668,10 +668,10 @@ resources: connectivityTo1B02_1 : {get_attr : [1b02_single_1B_1, instance_name]}, connectivityTo1B01_2 : {get_attr : [1b01_single_1B_2, instance_name]}, connectivityTo1B02_2 : {get_attr : [1b02_single_1B_2, instance_name]}, - connectivityTo1C1_T1_01 : {get_attr : [1c1_t1_port_01, tenant_id]}, - connectivityTo1C1_T1_02 : {get_attr : [1c1_t1_port_02, tenant_id]}, - connectivityTo1C1_T1_11 : {get_attr : [1c1_t1_port_11, tenant_id]}, - connectivityTo1C1_T1_12 : {get_attr : [1c1_t1_port_12, tenant_id]}, + connectivityTo1C1_T1_01 : {get_attr : [1c11_scalling_instance_0_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_02 : {get_attr : [1c11_scalling_instance_1_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_11 : {get_attr : [1c12_scalling_instance_0_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_12 : {get_attr : [1c12_scalling_instance_1_t1_port_0, tenant_id]}, connectivityTo1C2_1_1 : {get_attr : [1c201_catalog_instance_1C21, instance_name]}, connectivityTo1C2_2_1 : {get_attr : [2c202_catalog_instance_1C21, instance_name]}, connectivityTo1C2_1_2 : {get_attr : [1c201_catalog_instance_1C22, instance_name]}, @@ -696,10 +696,10 @@ resources: connectivityTo1B02_1 : {get_attr : [1b02_single_1B_1, instance_name]}, connectivityTo1B01_2 : {get_attr : [1b01_single_1B_2, instance_name]}, connectivityTo1B02_2 : {get_attr : [1b02_single_1B_2, instance_name]}, - connectivityTo1C1_T1_01 : {get_attr : [1c1_t1_port_01, tenant_id]}, - connectivityTo1C1_T1_02 : {get_attr : [1c1_t1_port_02, tenant_id]}, - connectivityTo1C1_T1_11 : {get_attr : [1c1_t1_port_11, tenant_id]}, - connectivityTo1C1_T1_12 : {get_attr : [1c1_t1_port_12, tenant_id]}, + connectivityTo1C1_T1_01 : {get_attr : [1c11_scalling_instance_0_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_02 : {get_attr : [1c11_scalling_instance_1_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_11 : {get_attr : [1c12_scalling_instance_0_t1_port_0, tenant_id]}, + connectivityTo1C1_T1_12 : {get_attr : [1c12_scalling_instance_1_t1_port_0, tenant_id]}, connectivityTo1C2_1_1 : {get_attr : [1c201_catalog_instance_1C21, instance_name]}, connectivityTo1C2_2_1 : {get_attr : [2c202_catalog_instance_1C21, instance_name]}, connectivityTo1C2_1_2 : {get_attr : [1c201_catalog_instance_1C22, instance_name]}, @@ -735,8 +735,8 @@ resources: - nestedNoUnified_2 - 4p_nested_1 - 4p_nested_2 - - 1c201_port_11 - - 1c201_port_02 + - 1c2_catalog_instance_1_201_port_0 + - 1c2_catalog_instance_0_201_port_0 - 1c201_catalog_instance_1C21 - 2c202_catalog_instance_1C21 - 1c201_catalog_instance_1C22 @@ -749,11 +749,11 @@ resources: - 1c1_t2_port_12 - 1b01_single_1B_1 - 1b02_single_1B_1 - - 1b_t1_port_01 - - 1b_t1_port_11 + - b_single_1b_0_t1_port_0 + - b_single_1b_1_t1_port_0 - 1a_single_1A_1 - 2a_single_1A_2 - - 1a_t1_port_0 + - a_single_1a_0_t1_port_0 properties: name: get_param: net_name @@ -762,12 +762,12 @@ resources: type: OS::Neutron::Net properties: name: { get_attr: [nestedNoUnified_1, portId, {get_attr: [4p_nested_2, server_pcm_id]}]} - dhcp_agent_ids: { get_attr: [1c201_port_11, tenant_id, {get_attr: [1c201_port_02, tenant_id, {get_attr: [1c201_catalog_instance_1C22, instance_name, {get_attr: [2c202_catalog_instance_1C21,instance_name]}]}]}]} + dhcp_agent_ids: { get_attr: [1c2_catalog_instance_1_201_port_0, tenant_id, {get_attr: [1c2_catalog_instance_0_201_port_0, tenant_id, {get_attr: [1c201_catalog_instance_1C22, instance_name, {get_attr: [2c202_catalog_instance_1C21,instance_name]}]}]}]} tenant_id: { get_attr:[1c101_scalling_instance_1C11, instance_name, {get_attr:[1c102_scalling_instance_1C11, instance_name, {get_attr:[1c1_t2_port_02, tenant_id, {get_attr:[1c1_t2_port_11, tenant_id]}, {get_attr:[1c1_t2_port_12, tenant_id]}, {get_attr:[1c102_scalling_instance_1C12, instance_name]}]}]}]} - value_specs: {get_attr:[1b01_single_1B_1, instance_name, get_attr:[1b02_single_1B_1,instance_name, {get_attr:[1b_t1_port_01, tenant_id, {get_attr:[1b_t1_port_11, tenant_id]}]}]] } + value_specs: {get_attr:[1b01_single_1B_1, instance_name, get_attr:[1b02_single_1B_1,instance_name, {get_attr:[b_single_1b_0_t1_port_0, tenant_id, {get_attr:[b_single_1b_1_t1_port_0, tenant_id]}]}]] } qos_policy: {get_attr:[1a_single_1A_1, instance_name]} - admin_state_up: {get_attr:[1a_t1_port_0, tenant_id]} + admin_state_up: {get_attr:[a_single_1a_0_t1_port_0, tenant_id]} BE_Affinity: type: OS::Nova::ServerGroup @@ -779,14 +779,14 @@ outputs: out1: value: { get_attr: [nestedNoUnified_1, portId, {get_attr: [4p_nested_2, server_pcm_id]}]} out2: - value: { get_attr: [1c201_port_11, tenant_id, {get_attr: [1c201_port_02, tenant_id, {get_attr: [1c201_catalog_instance_1C22, instance_name, {get_attr: [2c202_catalog_instance_1C21,instance_name]}]}]}]} + value: { get_attr: [1c2_catalog_instance_1_201_port_0, tenant_id, {get_attr: [1c2_catalog_instance_0_201_port_0, tenant_id, {get_attr: [1c201_catalog_instance_1C22, instance_name, {get_attr: [2c202_catalog_instance_1C21,instance_name]}]}]}]} out3: value: { get_attr:[1c101_scalling_instance_1C11, instance_name, {get_attr:[1c102_scalling_instance_1C11, instance_name, {get_attr:[1c1_t2_port_02, tenant_id,{get_attr:[1c1_t2_port_11, tenant_id]}, {get_attr:[1c1_t2_port_12, tenant_id]}, {get_attr:[1c102_scalling_instance_1C12, instance_name]}]}]}]} out4: - value: {get_attr:[1b01_single_1B_1, instance_name, get_attr:[1b02_single_1B_1,instance_name, {get_attr:[1b_t1_port_01, tenant_id, {get_attr:[1b_t1_port_11, tenant_id]}]}]] } + value: {get_attr:[1b01_single_1B_1, instance_name, get_attr:[1b02_single_1B_1,instance_name, {get_attr:[b_single_1b_0_t1_port_0, tenant_id, {get_attr:[b_single_1b_1_t1_port_0, tenant_id]}]}]] } out5: value: {get_attr:[1a_single_1A_1, instance_name]} out6: - value: {get_attr:[1a_t1_port_0, tenant_id]} + value: {get_attr:[a_single_1a_0_t1_port_0, tenant_id]} out7: value: {get_attr:[2a_single_1A_2, instance_name]}
\ No newline at end of file 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 3821ce10e5..54fa35bba8 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 @@ -950,36 +950,20 @@ node_types: org.openecomp.resource.abstract.nodes.1c12_scalling_instance: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_1c1_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED compute_1c12_scalling_instance_scheduler_hints: type: list required: true status: SUPPORTED entry_schema: type: json - port_1c1_t1_port_fixed_ips: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps compute_1c12_scalling_instance_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_1c1_t1_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1c1_t1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_1c12_scalling_instance_t1_port_0_network_role: + type: string required: true status: SUPPORTED index_value: @@ -990,6 +974,10 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 + port_1c12_scalling_instance_t1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED vm_flavor_name: type: string required: true @@ -1000,77 +988,76 @@ node_types: status: SUPPORTED entry_schema: type: string - port_1c1_t1_port_related_networks: + port_1c12_scalling_instance_t1_port_0_name: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1c1_t1_port_ip_requirements: + type: string + port_1c12_scalling_instance_t1_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_1c12_scalling_instance_t1_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_1c1_t1_port_name: + port_1c12_scalling_instance_t1_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_1c12_scalling_instance_t1_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_1c1_t1_port_subnetpoolid: + vm_image_name: type: string required: true status: SUPPORTED - port_1c1_t1_port_network_role_tag: - type: string + port_1c12_scalling_instance_t1_port_0_ip_requirements: + type: list required: true status: SUPPORTED - port_1c1_t1_port_network_role: - type: string + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_1c12_scalling_instance_t1_port_0_vlan_requirements: + type: list required: true status: SUPPORTED - compute_1c12_scalling_instance_availability_zone: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_1c12_scalling_instance_t1_port_0_order: + type: integer + required: true + status: SUPPORTED + port_1c12_scalling_instance_t1_port_0_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: string - port_1c1_t1_port_network: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + compute_1c12_scalling_instance_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_1c1_t1_port_order: - type: integer + port_1c12_scalling_instance_t1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED attributes: - 1c12_scalling_instance_1c1_t1_port_tenant_id: + 1c12_scalling_instance_1c12_scalling_instance_t1_port_0_tenant_id: type: string status: SUPPORTED 1c12_scalling_instance_instance_name: type: string status: SUPPORTED requirements: - - dependency_1c12_scalling_instance_1c1_t1_port: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - link_1c12_scalling_instance_1c1_t1_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - dependency_1c12_scalling_instance: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -1085,20 +1072,38 @@ node_types: occurrences: - 0 - UNBOUNDED + - dependency_1c12_scalling_instance_1c12_scalling_instance_t1_port_0: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_1c12_scalling_instance_1c12_scalling_instance_t1_port_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 capabilities: - cpu_1c12_scalling_instance: + network.incoming.packets_1c12_scalling_instance_1c12_scalling_instance_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.bytes_1c12_scalling_instance: + cpu_1c12_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_1c12_scalling_instance_1c1_t1_port: + attachment_1c12_scalling_instance_1c12_scalling_instance_t1_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + disk.device.write.bytes_1c12_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1116,13 +1121,9 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_1c12_scalling_instance_1c1_t1_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - forwarder_1c12_scalling_instance_1c1_t1_port: - type: org.openecomp.capabilities.Forwarder + network.outgoing.bytes.rate_1c12_scalling_instance_1c12_scalling_instance_t1_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -1132,7 +1133,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_1c12_scalling_instance_1c1_t1_port: + network.incoming.bytes_1c12_scalling_instance_1c12_scalling_instance_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1170,6 +1171,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_1c12_scalling_instance_1c12_scalling_instance_t1_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.device.usage_1c12_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1182,7 +1188,7 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_1c12_scalling_instance_1c1_t1_port: + binding_1c12_scalling_instance_1c12_scalling_instance_t1_port_0: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -1190,24 +1196,19 @@ node_types: occurrences: - 0 - UNBOUNDED - network.incoming.packets_1c12_scalling_instance_1c1_t1_port: + network.incoming.packets.rate_1c12_scalling_instance_1c12_scalling_instance_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_1c12_scalling_instance_1c1_t1_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - disk.latency_1c12_scalling_instance: + network.outgoing.packets.rate_1c12_scalling_instance_1c12_scalling_instance_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_1c12_scalling_instance_1c1_t1_port: + disk.latency_1c12_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1256,13 +1257,13 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.requests_1c12_scalling_instance: + network.outpoing.packets_1c12_scalling_instance_1c12_scalling_instance_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_1c12_scalling_instance_1c1_t1_port: + disk.write.requests_1c12_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1333,43 +1334,42 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_1c12_scalling_instance_1c1_t1_port: + disk.device.write.requests.rate_1c12_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.requests.rate_1c12_scalling_instance: + disk.device.write.requests_1c12_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_1c12_scalling_instance_1c1_t1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_1c12_scalling_instance_1c12_scalling_instance_t1_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - disk.device.write.requests_1c12_scalling_instance: + disk.allocation_1c12_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outpoing.packets_1c12_scalling_instance_1c1_t1_port: + network.incoming.bytes.rate_1c12_scalling_instance_1c12_scalling_instance_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.allocation_1c12_scalling_instance: + disk.root.size_1c12_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.root.size_1c12_scalling_instance: + network.outgoing.bytes_1c12_scalling_instance_1c12_scalling_instance_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1993,24 +1993,8 @@ node_types: org.openecomp.resource.abstract.nodes.1c11_scalling_instance: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_1c1_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_1c1_t1_port_fixed_ips: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_1c1_t1_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1c1_t1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_1c11_scalling_instance_t1_port_0_network_role: + type: string required: true status: SUPPORTED index_value: @@ -2021,6 +2005,12 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 + port_1c11_scalling_instance_t1_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true @@ -2043,91 +2033,101 @@ node_types: status: SUPPORTED entry_schema: type: string - port_1c1_t1_port_related_networks: + port_1c11_scalling_instance_t1_port_0_name: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1c1_t1_port_ip_requirements: + type: string + port_1c11_scalling_instance_t1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_1c11_scalling_instance_t1_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.VlanRequirements + port_1c11_scalling_instance_t1_port_0_order: + type: integer + required: true + status: SUPPORTED vm_image_name: type: string required: true status: SUPPORTED - port_1c1_t1_port_name: - type: list + port_1c11_scalling_instance_t1_port_0_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: string compute_1c11_scalling_instance_scheduler_hints: type: list required: true status: SUPPORTED entry_schema: type: json - port_1c1_t1_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_1c1_t1_port_network_role_tag: - type: string + port_1c11_scalling_instance_t1_port_0_ip_requirements: + type: list required: true status: SUPPORTED - port_1c1_t1_port_network_role: + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_1c11_scalling_instance_t1_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_1c1_t1_port_network: + port_1c11_scalling_instance_t1_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_1c1_t1_port_order: - type: integer + port_1c11_scalling_instance_t1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_1c11_scalling_instance_t1_port_0_fixed_ips: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps attributes: 1c11_scalling_instance_instance_name: type: string status: SUPPORTED - 1c11_scalling_instance_1c1_t1_port_tenant_id: + 1c11_scalling_instance_1c11_scalling_instance_t1_port_0_tenant_id: type: string status: SUPPORTED requirements: - - dependency_1c11_scalling_instance: + - dependency_1c11_scalling_instance_1c11_scalling_instance_t1_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_1c11_scalling_instance: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - link_1c11_scalling_instance_1c11_scalling_instance_t1_port_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - - 0 - - UNBOUNDED - - dependency_1c11_scalling_instance_1c1_t1_port: + - 1 + - 1 + - dependency_1c11_scalling_instance: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_1c11_scalling_instance_1c1_t1_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo + - local_storage_1c11_scalling_instance: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo occurrences: - - 1 - - 1 + - 0 + - UNBOUNDED capabilities: disk.device.usage_1c11_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer @@ -2135,18 +2135,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_1c11_scalling_instance_1c1_t1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets.rate_1c11_scalling_instance_1c1_t1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.allocation_1c11_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2199,24 +2187,32 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_1c11_scalling_instance_1c1_t1_port: + vcpus_1c11_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - vcpus_1c11_scalling_instance: + memory_1c11_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory_1c11_scalling_instance: + network.incoming.packets.rate_1c11_scalling_instance_1c11_scalling_instance_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED + binding_1c11_scalling_instance_1c11_scalling_instance_t1_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED cpu_1c11_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2228,11 +2224,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_1c11_scalling_instance_1c1_t1_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED scalable_1c11_scalling_instance: type: tosca.capabilities.Scalable occurrences: @@ -2243,12 +2234,7 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_1c11_scalling_instance_1c1_t1_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - network.outpoing.packets_1c11_scalling_instance_1c1_t1_port: + network.outgoing.packets.rate_1c11_scalling_instance_1c11_scalling_instance_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2297,25 +2283,29 @@ node_types: occurrences: - 1 - UNBOUNDED - cpu.delta_1c11_scalling_instance: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_1c11_scalling_instance_1c11_scalling_instance_t1_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_1c11_scalling_instance_1c1_t1_port: + network.incoming.packets_1c11_scalling_instance_1c11_scalling_instance_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.requests_1c11_scalling_instance: + cpu.delta_1c11_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_1c11_scalling_instance_1c1_t1_port: + attachment_1c11_scalling_instance_1c11_scalling_instance_t1_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + disk.device.write.requests_1c11_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2327,38 +2317,35 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_1c11_scalling_instance_1c1_t1_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - disk.write.bytes_1c11_scalling_instance: + network.outgoing.bytes.rate_1c11_scalling_instance_1c11_scalling_instance_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.requests_1c11_scalling_instance: + network.incoming.bytes_1c11_scalling_instance_1c11_scalling_instance_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_1c11_scalling_instance_1c1_t1_port: + disk.write.bytes_1c11_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_1c11_scalling_instance_1c1_t1_port: + disk.write.requests_1c11_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED + forwarder_1c11_scalling_instance_1c11_scalling_instance_t1_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.read.requests_1c11_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2389,26 +2376,27 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.read.requests_1c11_scalling_instance: + network.incoming.bytes.rate_1c11_scalling_instance_1c11_scalling_instance_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.iops_1c11_scalling_instance: + disk.read.requests_1c11_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory.resident_1c11_scalling_instance: + disk.device.iops_1c11_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_1c11_scalling_instance_1c1_t1_port: - type: tosca.capabilities.Attachment + memory.resident_1c11_scalling_instance: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -2430,12 +2418,24 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes_1c11_scalling_instance_1c11_scalling_instance_t1_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.device.latency_1c11_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED + network.outpoing.packets_1c11_scalling_instance_1c11_scalling_instance_t1_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.iops_1c11_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3631,53 +3631,67 @@ node_types: org.openecomp.resource.abstract.nodes.2c2_catalog_instance: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_2c2_catalog_instance_201_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED compute_2c2_catalog_instance_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string - port_1c201_port_vlan_requirements: + port_2c2_catalog_instance_202_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_2c2_catalog_instance_202_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_2c2_catalog_instance_201_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - vm_flavor_name: + port_2c2_catalog_instance_202_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_2c202_port_subnetpoolid: + vm_flavor_name: type: string required: true status: SUPPORTED - port_2c202_port_ip_requirements: + port_2c2_catalog_instance_202_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_1c201_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_2c202_port_network_role_tag: + type: string + port_2c2_catalog_instance_202_port_0_network_role: type: string required: true status: SUPPORTED - port_2c202_port_network_role: + port_2c2_catalog_instance_202_port_0_subnetpoolid: type: string required: true status: SUPPORTED - vm_image_name: - type: string + port_2c2_catalog_instance_202_port_0_ip_requirements: + type: list required: true status: SUPPORTED - port_2c202_port_order: - type: integer + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_2c2_catalog_instance_201_port_0_ip_requirements: + type: list required: true status: SUPPORTED - port_1c201_port_network_role_tag: + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + vm_image_name: type: string required: true status: SUPPORTED @@ -3693,16 +3707,20 @@ node_types: status: SUPPORTED entry_schema: type: string - port_1c201_port_order: - type: integer + port_2c2_catalog_instance_201_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_2c202_port_vlan_requirements: + port_2c2_catalog_instance_202_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_2c2_catalog_instance_201_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -3711,57 +3729,39 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - compute_2c2_catalog_instance_name: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_2c202_port_mac_requirements: + port_2c2_catalog_instance_202_port_0_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_2c202_port_network: + compute_2c2_catalog_instance_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_1c201_port_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_1c201_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_2c202_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_2c2_catalog_instance_201_port_0_network_role_tag: + type: string required: true status: SUPPORTED - port_1c201_port_subnetpoolid: + port_2c2_catalog_instance_201_port_0_network_role: type: string required: true status: SUPPORTED - port_1c201_port_related_networks: + port_2c2_catalog_instance_201_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_2c202_port_related_networks: - type: list + port_2c2_catalog_instance_202_port_0_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1c201_port_network_role: - type: string + port_2c2_catalog_instance_201_port_0_order: + type: integer required: true status: SUPPORTED - port_1c201_port_network: + port_2c2_catalog_instance_201_port_0_network: type: list required: true status: SUPPORTED @@ -3786,36 +3786,35 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_2c2_catalog_instance_2c202_port: + - dependency_2c2_catalog_instance_2c2_catalog_instance_202_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_2c2_catalog_instance_2c202_port: + - link_2c2_catalog_instance_2c2_catalog_instance_202_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_2c2_catalog_instance_1c201_port: + - dependency_2c2_catalog_instance_2c2_catalog_instance_201_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_2c2_catalog_instance_1c201_port: + - link_2c2_catalog_instance_2c2_catalog_instance_201_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - network.outgoing.packets.rate_2c2_catalog_instance_1c201_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_2c2_catalog_instance_2c2_catalog_instance_201_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -3837,6 +3836,23 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_2c2_catalog_instance_2c2_catalog_instance_201_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + forwarder_2c2_catalog_instance_2c2_catalog_instance_202_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_2c2_catalog_instance_2c2_catalog_instance_202_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.device.read.bytes.rate_2c2_catalog_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3872,15 +3888,19 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_2c2_catalog_instance_2c2_catalog_instance_201_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.device.read.requests_2c2_catalog_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_2c2_catalog_instance_1c201_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_2c2_catalog_instance_2c2_catalog_instance_202_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -3896,8 +3916,8 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_2c2_catalog_instance_2c202_port: - type: org.openecomp.capabilities.Forwarder + feature_2c2_catalog_instance_2c2_catalog_instance_202_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -3908,34 +3928,31 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_2c2_catalog_instance_2c2_catalog_instance_201_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.allocation_2c2_catalog_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_2c2_catalog_instance_1c201_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED disk.device.write.requests.rate_2c2_catalog_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - os_2c2_catalog_instance: - type: tosca.capabilities.OperatingSystem + network.incoming.bytes.rate_2c2_catalog_instance_2c2_catalog_instance_202_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outpoing.packets_2c2_catalog_instance_2c202_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + os_2c2_catalog_instance: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED @@ -3945,25 +3962,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_2c2_catalog_instance_1c201_port: + disk.latency_2c2_catalog_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_2c2_catalog_instance_1c201_port: + network.outgoing.packets.rate_2c2_catalog_instance_2c2_catalog_instance_202_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.latency_2c2_catalog_instance: + disk.iops_2c2_catalog_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.iops_2c2_catalog_instance: + network.incoming.packets_2c2_catalog_instance_2c2_catalog_instance_202_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3980,35 +3997,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_2c2_catalog_instance_2c202_port: + network.incoming.bytes_2c2_catalog_instance_2c2_catalog_instance_201_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_2c2_catalog_instance_1c201_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes.rate_2c2_catalog_instance_2c202_port: + network.outpoing.packets_2c2_catalog_instance_2c2_catalog_instance_202_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.iops_2c2_catalog_instance: + network.incoming.packets.rate_2c2_catalog_instance_2c2_catalog_instance_202_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_2c2_catalog_instance_1c201_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets_2c2_catalog_instance_1c201_port: + disk.device.iops_2c2_catalog_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4020,12 +4027,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_2c2_catalog_instance_2c202_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.read.bytes.rate_2c2_catalog_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4050,13 +4051,21 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_2c2_catalog_instance_2c2_catalog_instance_202_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED disk.read.requests_2c2_catalog_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_2c2_catalog_instance_2c202_port: + network.outgoing.bytes_2c2_catalog_instance_2c2_catalog_instance_201_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4068,8 +4077,9 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_2c2_catalog_instance_1c201_port: - type: org.openecomp.capabilities.Forwarder + network.outgoing.bytes_2c2_catalog_instance_2c2_catalog_instance_202_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -4091,19 +4101,21 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.usage_2c2_catalog_instance: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_2c2_catalog_instance_2c2_catalog_instance_201_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED - network.outgoing.bytes.rate_2c2_catalog_instance_2c202_port: + disk.device.usage_2c2_catalog_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outpoing.packets_2c2_catalog_instance_1c201_port: + network.incoming.bytes.rate_2c2_catalog_instance_2c2_catalog_instance_201_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4115,77 +4127,65 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_2c2_catalog_instance_1c201_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.usage_2c2_catalog_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_2c2_catalog_instance_2c202_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED feature_2c2_catalog_instance: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.write.requests_2c2_catalog_instance: + network.outgoing.packets.rate_2c2_catalog_instance_2c2_catalog_instance_201_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - cpu.delta_2c2_catalog_instance: + network.outpoing.packets_2c2_catalog_instance_2c2_catalog_instance_201_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_2c2_catalog_instance_2c202_port: + disk.write.requests_2c2_catalog_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_2c2_catalog_instance: - type: tosca.capabilities.network.Bindable + network.incoming.packets_2c2_catalog_instance_2c2_catalog_instance_201_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_2c2_catalog_instance_2c202_port: - type: tosca.capabilities.Attachment + network.incoming.bytes_2c2_catalog_instance_2c2_catalog_instance_202_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets_2c2_catalog_instance_2c202_port: + cpu.delta_2c2_catalog_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_2c2_catalog_instance_2c202_port: - type: tosca.capabilities.Node + binding_2c2_catalog_instance: + type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - memory_2c2_catalog_instance: + network.incoming.packets.rate_2c2_catalog_instance_2c2_catalog_instance_201_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_2c2_catalog_instance_1c201_port: + memory_2c2_catalog_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4200,72 +4200,80 @@ node_types: org.openecomp.resource.abstract.nodes.1c2_catalog_instance: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - compute_1c2_catalog_instance_availability_zone: - type: list + port_1c2_catalog_instance_201_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: string - port_1c201_port_vlan_requirements: + port_1c2_catalog_instance_202_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + compute_1c2_catalog_instance_availability_zone: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string vm_flavor_name: type: string required: true status: SUPPORTED + port_1c2_catalog_instance_202_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements compute_1c2_catalog_instance_personality: type: list required: true status: SUPPORTED entry_schema: type: json - port_2c202_port_subnetpoolid: - type: string + port_1c2_catalog_instance_201_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_2c202_port_ip_requirements: + port_1c2_catalog_instance_202_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_1c201_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_2c202_port_network_role_tag: + type: string + vm_image_name: type: string required: true status: SUPPORTED - port_2c202_port_network_role: - type: string + port_1c2_catalog_instance_202_port_0_vlan_requirements: + type: list required: true status: SUPPORTED - vm_image_name: - type: string + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_1c2_catalog_instance_202_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_2c202_port_order: - type: integer + port_1c2_catalog_instance_201_port_0_vlan_requirements: + type: list required: true status: SUPPORTED - port_1c201_port_network_role_tag: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_1c2_catalog_instance_201_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_1c201_port_order: - type: integer + port_1c2_catalog_instance_201_port_0_network_role: + type: string required: true status: SUPPORTED - port_2c202_port_vlan_requirements: + port_1c2_catalog_instance_201_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -4280,62 +4288,54 @@ node_types: status: SUPPORTED entry_schema: type: string - port_2c202_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_1c2_catalog_instance_201_port_0_order: + type: integer required: true status: SUPPORTED - port_2c202_port_network: - type: list + port_1c2_catalog_instance_202_port_0_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: string - port_1c201_port_ip_requirements: + port_1c2_catalog_instance_201_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_1c201_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_2c202_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_1c201_port_subnetpoolid: + port_1c2_catalog_instance_201_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_1c201_port_related_networks: - type: list + port_1c2_catalog_instance_202_port_0_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_2c202_port_related_networks: + port_1c2_catalog_instance_202_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1c201_port_network_role: + port_1c2_catalog_instance_202_port_0_subnetpoolid: type: string required: true status: SUPPORTED - compute_1c2_catalog_instance_user_data_format: + port_1c2_catalog_instance_201_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_1c201_port_network: + compute_1c2_catalog_instance_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string + port_1c2_catalog_instance_202_port_0_network_role: + type: string + required: true + status: SUPPORTED compute_1c2_catalog_instance_scheduler_hints: type: list required: true @@ -4346,7 +4346,7 @@ node_types: 1c2_catalog_instance_instance_name: type: string status: SUPPORTED - 1c2_catalog_instance_1c201_port_tenant_id: + 1c2_catalog_instance_1c2_catalog_instance_201_port_0_tenant_id: type: string status: SUPPORTED requirements: @@ -4364,94 +4364,94 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_1c2_catalog_instance_1c201_port: + - dependency_1c2_catalog_instance_1c2_catalog_instance_202_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_1c2_catalog_instance_1c201_port: + - link_1c2_catalog_instance_1c2_catalog_instance_202_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_1c2_catalog_instance_2c202_port: + - dependency_1c2_catalog_instance_1c2_catalog_instance_201_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_1c2_catalog_instance_2c202_port: + - link_1c2_catalog_instance_1c2_catalog_instance_201_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - disk.device.capacity_1c2_catalog_instance: + network.outgoing.packets.rate_1c2_catalog_instance_1c2_catalog_instance_202_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_1c2_catalog_instance_2c202_port: - type: tosca.capabilities.Attachment + disk.device.capacity_1c2_catalog_instance: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_1c2_catalog_instance_2c202_port: + disk.read.bytes.rate_1c2_catalog_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets_1c2_catalog_instance_2c202_port: + network.incoming.bytes.rate_1c2_catalog_instance_1c2_catalog_instance_202_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_1c2_catalog_instance_1c201_port: + network.incoming.bytes.rate_1c2_catalog_instance_1c2_catalog_instance_201_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.bytes.rate_1c2_catalog_instance: + memory.usage_1c2_catalog_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_1c2_catalog_instance_1c201_port: + disk.write.bytes.rate_1c2_catalog_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory.usage_1c2_catalog_instance: + network.outgoing.packets.rate_1c2_catalog_instance_1c2_catalog_instance_201_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_1c2_catalog_instance_1c201_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + network.outpoing.packets_1c2_catalog_instance_1c2_catalog_instance_202_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED - forwarder_1c2_catalog_instance_1c201_port: - type: org.openecomp.capabilities.Forwarder + network.incoming.bytes_1c2_catalog_instance_1c2_catalog_instance_202_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.bytes.rate_1c2_catalog_instance: + network.incoming.packets.rate_1c2_catalog_instance_1c2_catalog_instance_201_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4463,19 +4463,31 @@ node_types: occurrences: - 1 - UNBOUNDED - cpu_1c2_catalog_instance: + network.outpoing.packets_1c2_catalog_instance_1c2_catalog_instance_201_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.requests_1c2_catalog_instance: + network.incoming.bytes_1c2_catalog_instance_1c2_catalog_instance_201_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_1c2_catalog_instance_1c2_catalog_instance_202_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + cpu_1c2_catalog_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outpoing.packets_1c2_catalog_instance_1c201_port: + disk.read.requests_1c2_catalog_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4505,6 +4517,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_1c2_catalog_instance_1c2_catalog_instance_202_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED os_1c2_catalog_instance: type: tosca.capabilities.OperatingSystem occurrences: @@ -4516,12 +4533,7 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_1c2_catalog_instance_2c202_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.outgoing.packets.rate_1c2_catalog_instance_2c202_port: + network.outgoing.bytes.rate_1c2_catalog_instance_1c2_catalog_instance_202_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4544,25 +4556,16 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_1c2_catalog_instance_2c202_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.iops_1c2_catalog_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_1c2_catalog_instance_2c202_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + attachment_1c2_catalog_instance_1c2_catalog_instance_201_port_0: + type: tosca.capabilities.Attachment occurrences: - - 0 + - 1 - UNBOUNDED vcpus_1c2_catalog_instance: type: org.openecomp.capabilities.metric.Ceilometer @@ -4576,24 +4579,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_1c2_catalog_instance_1c201_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - attachment_1c2_catalog_instance_1c201_port: - type: tosca.capabilities.Attachment + feature_1c2_catalog_instance_1c2_catalog_instance_202_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_1c2_catalog_instance_1c201_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_1c2_catalog_instance_1c2_catalog_instance_201_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED - network.incoming.packets_1c2_catalog_instance_1c201_port: + network.outgoing.bytes_1c2_catalog_instance_1c2_catalog_instance_202_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4629,23 +4628,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_1c2_catalog_instance_2c202_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.device.allocation_1c2_catalog_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - forwarder_1c2_catalog_instance_2c202_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.device.read.bytes_1c2_catalog_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4688,20 +4676,20 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_1c2_catalog_instance_1c201_port: - type: tosca.capabilities.Node + network.incoming.packets_1c2_catalog_instance_1c2_catalog_instance_201_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outpoing.packets_1c2_catalog_instance_2c202_port: + network.incoming.packets_1c2_catalog_instance_1c2_catalog_instance_202_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_1c2_catalog_instance_2c202_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_1c2_catalog_instance_1c2_catalog_instance_201_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -4711,7 +4699,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_1c2_catalog_instance_1c201_port: + network.outgoing.bytes.rate_1c2_catalog_instance_1c2_catalog_instance_201_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4734,21 +4722,28 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_1c2_catalog_instance_1c201_port: + disk.write.requests.rate_1c2_catalog_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.requests.rate_1c2_catalog_instance: + disk.write.requests_1c2_catalog_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.requests_1c2_catalog_instance: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_1c2_catalog_instance_1c2_catalog_instance_202_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + attachment_1c2_catalog_instance_1c2_catalog_instance_202_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -4763,13 +4758,18 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_1c2_catalog_instance_2c202_port: + disk.device.read.requests.rate_1c2_catalog_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_1c2_catalog_instance: + feature_1c2_catalog_instance_1c2_catalog_instance_201_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_1c2_catalog_instance_1c2_catalog_instance_201_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4778,16 +4778,32 @@ node_types: org.openecomp.resource.abstract.nodes.a_single_2a: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_a_single_2a_t1_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_a_single_2a_t1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED compute_a_single_2a_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string - port_1a_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_a_single_2a_t1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_a_single_2a_t1_port_0_network: + type: list required: true status: SUPPORTED + entry_schema: + type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -4796,76 +4812,60 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_1a_t1_port_ip_requirements: + compute_a_single_2a_scheduler_hints: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_1a_t1_port_related_networks: + type: json + compute_a_single_2a_availability_zone: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1a_t1_port_network_role_tag: + type: string + vm_flavor_name: type: string required: true status: SUPPORTED - port_1a_t1_port_network_role: + port_a_single_2a_t1_port_0_network_role_tag: type: string required: true status: SUPPORTED - compute_a_single_2a_scheduler_hints: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - port_1a_t1_port_order: + port_a_single_2a_t1_port_0_order: type: integer required: true status: SUPPORTED - compute_a_single_2a_availability_zone: + compute_a_single_2a_name: type: list required: true status: SUPPORTED entry_schema: type: string - vm_flavor_name: + vm_image_name: type: string required: true status: SUPPORTED - port_1a_t1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_1a_t1_port_network: + port_a_single_2a_t1_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_1a_t1_port_subnetpoolid: + type: org.openecomp.datatypes.network.VlanRequirements + port_a_single_2a_t1_port_0_network_role: type: string required: true status: SUPPORTED - compute_a_single_2a_name: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - vm_image_name: + port_a_single_2a_t1_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_1a_t1_port_vlan_requirements: + port_a_single_2a_t1_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_a_single_2a_metadata: type: list required: true @@ -4891,14 +4891,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_a_single_2a_1a_t1_port: + - dependency_a_single_2a_a_single_2a_t1_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_a_single_2a_1a_t1_port: + - link_a_single_2a_a_single_2a_t1_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -4911,6 +4911,17 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_a_single_2a_a_single_2a_t1_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_a_single_2a_a_single_2a_t1_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.ephemeral.size_a_single_2a: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4953,11 +4964,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_a_single_2a_1a_t1_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.read.bytes.rate_a_single_2a: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4970,12 +4976,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_a_single_2a_1a_t1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.write.requests.rate_a_single_2a: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5012,9 +5012,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_a_single_2a_1a_t1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_a_single_2a_a_single_2a_t1_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -5024,22 +5023,11 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_a_single_2a_1a_t1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED scalable_a_single_2a: type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - feature_a_single_2a_1a_t1_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.write.bytes_a_single_2a: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5063,14 +5051,15 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.requests_a_single_2a: + network.outpoing.packets_a_single_2a_a_single_2a_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_a_single_2a_1a_t1_port: - type: tosca.capabilities.Attachment + disk.device.write.requests_a_single_2a: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -5086,11 +5075,23 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_a_single_2a_a_single_2a_t1_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED os_a_single_2a: type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED + network.incoming.packets_a_single_2a_a_single_2a_t1_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.write.bytes.rate_a_single_2a: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5121,18 +5122,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_a_single_2a_1a_t1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_a_single_2a_a_single_2a_t1_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.outpoing.packets_a_single_2a_1a_t1_port: + network.incoming.packets.rate_a_single_2a_a_single_2a_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED + binding_a_single_2a_a_single_2a_t1_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED binding_a_single_2a: type: tosca.capabilities.network.Bindable occurrences: @@ -5144,7 +5152,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_a_single_2a_1a_t1_port: + network.incoming.bytes.rate_a_single_2a_a_single_2a_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5156,15 +5164,7 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_a_single_2a_1a_t1_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - network.incoming.packets_a_single_2a_1a_t1_port: + network.outgoing.packets.rate_a_single_2a_a_single_2a_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5177,31 +5177,31 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.bytes.rate_a_single_2a: + network.outgoing.bytes_a_single_2a_a_single_2a_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory_a_single_2a: + disk.device.write.bytes.rate_a_single_2a: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.allocation_a_single_2a: + memory_a_single_2a: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory.resident_a_single_2a: + disk.allocation_a_single_2a: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_a_single_2a_1a_t1_port: + memory.resident_a_single_2a: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5221,16 +5221,16 @@ node_types: org.openecomp.resource.abstract.nodes.pcma_server_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_pcm_port_0_network_role: - type: string - required: true - status: SUPPORTED port_pcm_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pcm_port_0_network_role: + type: string + required: true + status: SUPPORTED port_pcm_port_1_network_role_tag: type: string required: true @@ -5289,11 +5289,11 @@ node_types: type: string required: true status: SUPPORTED - port_pcm_port_0_exCP_naming: + port_pcm_port_1_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pcm_port_1_exCP_naming: + port_pcm_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED @@ -5307,18 +5307,18 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pcm_port_0_ip_requirements: + port_pcm_port_1_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pcm_port_1_security_groups: + type: json + port_pcm_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements compute_pcma_server_config_drive: type: list required: true @@ -5367,16 +5367,16 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pcm_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED port_pcm_port_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_pcm_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED port_pcm_port_1_order: type: integer required: true @@ -5810,43 +5810,55 @@ node_types: org.openecomp.resource.abstract.nodes.b_single_1b: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_1b_t1_port_order: - type: integer + port_b_single_1b_t1_port_0_network_role_tag: + type: string required: true status: SUPPORTED - port_1b_t1_port_network_role: + port_b_single_1b_t1_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_b_single_1b_t2_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_1b_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_b_single_1b_t1_port_0_network_role: + type: string + required: true + status: SUPPORTED + port_b_single_1b_t2_port_0_network: + type: list required: true status: SUPPORTED + entry_schema: + type: string vm_flavor_name: type: string required: true status: SUPPORTED - port_1b_t2_port_related_networks: + port_b_single_1b_t1_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1b_t1_port_ip_requirements: + type: org.openecomp.datatypes.network.VlanRequirements + port_b_single_1b_t2_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true status: SUPPORTED - port_1b_t2_port_network_role: - type: string + port_b_single_1b_t2_port_0_order: + type: integer required: true status: SUPPORTED - port_1b_t2_port_order: + port_b_single_1b_t1_port_0_order: type: integer required: true status: SUPPORTED @@ -5856,34 +5868,38 @@ node_types: status: SUPPORTED entry_schema: type: string - port_1b_t2_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_1b_t2_port_network_role_tag: - type: string + port_b_single_1b_t2_port_0_vlan_requirements: + type: list required: true status: SUPPORTED - port_1b_t2_port_subnetpoolid: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_b_single_1b_t2_port_0_network_role: type: string required: true status: SUPPORTED - port_1b_t1_port_related_networks: + port_b_single_1b_t1_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1b_t2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.network.IpRequirements + port_b_single_1b_t1_port_0_value_specs: + type: list required: true status: SUPPORTED + entry_schema: + type: json compute_b_single_1b_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string + port_b_single_1b_t1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -5898,54 +5914,38 @@ node_types: status: SUPPORTED entry_schema: type: json - port_1b_t2_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1b_t2_port_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_1b_t1_port_value_specs: - type: list + port_b_single_1b_t1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json - port_1b_t1_port_network_role_tag: + port_b_single_1b_t1_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_1b_t1_port_subnetpoolid: + port_b_single_1b_t2_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_1b_t1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_1b_t2_port_network: + port_b_single_1b_t1_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_1b_t1_port_vlan_requirements: + port_b_single_1b_t2_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1b_t1_port_network: - type: list + type: org.openecomp.datatypes.network.IpRequirements + port_b_single_1b_t2_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_b_single_1b_t2_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: string compute_b_single_1b_name: type: list required: true @@ -5956,7 +5956,7 @@ node_types: b_single_1b_instance_name: type: string status: SUPPORTED - b_single_1b_1b_t1_port_tenant_id: + b_single_1b_b_single_1b_t1_port_0_tenant_id: type: string status: SUPPORTED requirements: @@ -5974,43 +5974,33 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_b_single_1b_1b_t1_port: + - dependency_b_single_1b_b_single_1b_t2_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_b_single_1b_1b_t1_port: + - link_b_single_1b_b_single_1b_t2_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_b_single_1b_1b_t2_port: + - dependency_b_single_1b_b_single_1b_t1_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_b_single_1b_1b_t2_port: + - link_b_single_1b_b_single_1b_t1_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - attachment_b_single_1b_1b_t2_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - forwarder_b_single_1b_1b_t2_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED endpoint_b_single_1b: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -6027,23 +6017,56 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_b_single_1b_1b_t2_port: + network.incoming.bytes_b_single_1b_b_single_1b_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_b_single_1b_1b_t2_port: + network.incoming.packets.rate_b_single_1b_b_single_1b_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - forwarder_b_single_1b_1b_t1_port: - type: org.openecomp.capabilities.Forwarder + network.incoming.bytes_b_single_1b_b_single_1b_t2_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + binding_b_single_1b_b_single_1b_t1_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + feature_b_single_1b_b_single_1b_t2_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_b_single_1b_b_single_1b_t1_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_b_single_1b_b_single_1b_t1_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED + binding_b_single_1b_b_single_1b_t2_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED scalable_b_single_1b: type: tosca.capabilities.Scalable occurrences: @@ -6060,6 +6083,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_b_single_1b_b_single_1b_t2_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_b_single_1b_b_single_1b_t1_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED vcpus_b_single_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -6072,25 +6105,25 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_b_single_1b: + network.incoming.bytes.rate_b_single_1b_b_single_1b_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_b_single_1b_1b_t2_port: + disk.device.read.requests.rate_b_single_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - instance_b_single_1b: + network.incoming.packets.rate_b_single_1b_b_single_1b_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_b_single_1b_1b_t1_port: + instance_b_single_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -6114,49 +6147,43 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_b_single_1b_1b_t1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.device.allocation_b_single_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_b_single_1b_1b_t2_port: + network.outgoing.packets.rate_b_single_1b_b_single_1b_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.capacity_b_single_1b: + network.outpoing.packets_b_single_1b_b_single_1b_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.latency_b_single_1b: + network.outgoing.bytes_b_single_1b_b_single_1b_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets_b_single_1b_1b_t2_port: + disk.device.capacity_b_single_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_b_single_1b_1b_t1_port: + disk.latency_b_single_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_b_single_1b_1b_t1_port: + attachment_b_single_1b_b_single_1b_t1_port_0: type: tosca.capabilities.Attachment occurrences: - 1 @@ -6167,14 +6194,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_b_single_1b_1b_t2_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED disk.ephemeral.size_b_single_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -6187,25 +6206,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_b_single_1b_1b_t2_port: + disk.device.iops_b_single_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.iops_b_single_1b: + disk.read.requests_b_single_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.requests_b_single_1b: + memory.resident_b_single_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory.resident_b_single_1b: + network.outgoing.bytes.rate_b_single_1b_b_single_1b_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -6217,12 +6236,13 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_b_single_1b_1b_t1_port: - type: tosca.capabilities.Node + network.incoming.packets_b_single_1b_b_single_1b_t1_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_b_single_1b_1b_t2_port: + network.outgoing.bytes.rate_b_single_1b_b_single_1b_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -6264,7 +6284,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_b_single_1b_1b_t1_port: + network.incoming.packets_b_single_1b_b_single_1b_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -6282,63 +6302,48 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_b_single_1b_1b_t1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.device.read.requests_b_single_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets_b_single_1b_1b_t1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_b_single_1b_b_single_1b_t2_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - binding_b_single_1b_1b_t1_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - network.outpoing.packets_b_single_1b_1b_t1_port: + disk.device.write.requests.rate_b_single_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.requests.rate_b_single_1b: + network.outgoing.packets.rate_b_single_1b_b_single_1b_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory.usage_b_single_1b: + network.outpoing.packets_b_single_1b_b_single_1b_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.bytes.rate_b_single_1b: + memory.usage_b_single_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_b_single_1b_1b_t2_port: + network.outgoing.bytes_b_single_1b_b_single_1b_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_b_single_1b_1b_t1_port: + disk.write.bytes.rate_b_single_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -6380,11 +6385,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_b_single_1b_1b_t2_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED org.openecomp.resource.abstract.nodes.a_single_1a: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: @@ -6394,41 +6394,39 @@ node_types: status: SUPPORTED entry_schema: type: json - port_1a_t1_port_ip_requirements: + port_a_single_1a_t1_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_1a_t2_port_network_role_tag: - type: string - required: true - status: SUPPORTED - vm_flavor_name: - type: string + type: org.openecomp.datatypes.network.VlanRequirements + port_a_single_1a_t1_port_0_order: + type: integer required: true status: SUPPORTED - port_1a_t2_port_network_role: - type: string + port_a_single_1a_t2_port_0_order: + type: integer required: true status: SUPPORTED - port_1a_t2_port_network: + port_a_single_1a_t2_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_1a_t1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.network.VlanRequirements + vm_flavor_name: + type: string required: true status: SUPPORTED - port_1a_t1_port_network: - type: list + port_a_single_1a_t2_port_0_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: string - port_1a_t1_port_subnetpoolid: + port_a_single_1a_t1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_a_single_1a_t1_port_0_subnetpoolid: type: string required: true status: SUPPORTED @@ -6436,28 +6434,36 @@ node_types: type: string required: true status: SUPPORTED - port_1a_t2_port_related_networks: + port_a_single_1a_t2_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1a_t2_port_ip_requirements: + type: string + port_a_single_1a_t1_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED + port_a_single_1a_t1_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_1a_t1_port_vlan_requirements: - type: list + port_a_single_1a_t2_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1a_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_a_single_1a_t2_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED + port_a_single_1a_t1_port_0_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string compute_a_single_1a_availability_zone: type: list required: true @@ -6478,42 +6484,36 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_1a_t1_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1a_t1_port_network_role_tag: + port_a_single_1a_t1_port_0_network_role: type: string required: true status: SUPPORTED - port_1a_t1_port_network_role: - type: string + port_a_single_1a_t1_port_0_related_networks: + type: list required: true status: SUPPORTED - port_1a_t1_port_order: - type: integer + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_a_single_1a_t1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_1a_t2_port_exCP_naming: + port_a_single_1a_t2_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_1a_t2_port_vlan_requirements: + port_a_single_1a_t2_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1a_t2_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_1a_t2_port_order: - type: integer + type: org.openecomp.datatypes.network.IpRequirements + port_a_single_1a_t2_port_0_related_networks: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_a_single_1a_user_data_format: type: list required: true @@ -6526,26 +6526,26 @@ node_types: status: SUPPORTED entry_schema: type: string - port_1a_t2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_a_single_1a_t2_port_0_network_role: + type: string required: true status: SUPPORTED attributes: - a_single_1a_instance_name: + a_single_1a_a_single_1a_t1_port_0_tenant_id: type: string status: SUPPORTED - a_single_1a_1a_t1_port_tenant_id: + a_single_1a_instance_name: type: string status: SUPPORTED requirements: - - dependency_a_single_1a_1a_t1_port: + - dependency_a_single_1a_a_single_1a_t2_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_a_single_1a_1a_t1_port: + - link_a_single_1a_a_single_1a_t2_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -6565,14 +6565,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_a_single_1a_1a_t2_port: + - dependency_a_single_1a_a_single_1a_t1_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_a_single_1a_1a_t2_port: + - link_a_single_1a_a_single_1a_t1_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -6585,29 +6585,36 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_a_single_1a_1a_t2_port: + disk.usage_a_single_1a: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.usage_a_single_1a: + network.incoming.bytes.rate_a_single_1a_a_single_1a_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_a_single_1a_1a_t2_port: - type: tosca.capabilities.Attachment + scalable_a_single_1a: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - scalable_a_single_1a: - type: tosca.capabilities.Scalable + network.incoming.packets.rate_a_single_1a_a_single_1a_t2_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_a_single_1a_1a_t2_port: + network.incoming.bytes_a_single_1a_a_single_1a_t2_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_a_single_1a_a_single_1a_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -6637,44 +6644,38 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_a_single_1a_1a_t2_port: + cpu.delta_a_single_1a: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - cpu.delta_a_single_1a: + network.incoming.bytes_a_single_1a_a_single_1a_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - forwarder_a_single_1a_1a_t1_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.device.write.requests_a_single_1a: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_a_single_1a_1a_t1_port: + disk.iops_a_single_1a: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.iops_a_single_1a: + network.outgoing.bytes_a_single_1a_a_single_1a_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_a_single_1a_1a_t1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_a_single_1a_a_single_1a_t1_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -6695,15 +6696,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_a_single_1a_1a_t1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - network.outgoing.packets.rate_a_single_1a_1a_t2_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_a_single_1a_a_single_1a_t1_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -6719,14 +6713,22 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_a_single_1a_a_single_1a_t2_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED disk.write.bytes.rate_a_single_1a: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_a_single_1a_1a_t1_port: - type: tosca.capabilities.Attachment + feature_a_single_1a_a_single_1a_t2_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -6742,8 +6744,9 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_a_single_1a_1a_t2_port: - type: org.openecomp.capabilities.Forwarder + network.outpoing.packets_a_single_1a_a_single_1a_t1_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -6753,15 +6756,7 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_a_single_1a_1a_t2_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - network.incoming.packets_a_single_1a_1a_t2_port: + network.outgoing.packets.rate_a_single_1a_a_single_1a_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -6796,12 +6791,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_a_single_1a_1a_t2_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.device.allocation_a_single_1a: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -6814,36 +6803,25 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_a_single_1a_1a_t1_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.outpoing.packets_a_single_1a_1a_t2_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - network.outpoing.packets_a_single_1a_1a_t1_port: + disk.device.read.bytes.rate_a_single_1a: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_a_single_1a: + disk.device.write.bytes_a_single_1a: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.bytes_a_single_1a: + disk.device.write.bytes.rate_a_single_1a: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.bytes.rate_a_single_1a: + network.incoming.packets_a_single_1a_a_single_1a_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -6861,30 +6839,31 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_a_single_1a_1a_t1_port: + network.incoming.packets_a_single_1a_a_single_1a_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_a_single_1a_1a_t2_port: - type: tosca.capabilities.Node + network.outgoing.bytes.rate_a_single_1a_a_single_1a_t2_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.capacity_a_single_1a: + network.outgoing.bytes.rate_a_single_1a_a_single_1a_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.bytes_a_single_1a: + disk.capacity_a_single_1a: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets_a_single_1a_1a_t1_port: + disk.device.read.bytes_a_single_1a: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -6895,12 +6874,17 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_a_single_1a_1a_t1_port: + network.outgoing.bytes_a_single_1a_a_single_1a_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED + forwarder_a_single_1a_a_single_1a_t2_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.ephemeral.size_a_single_1a: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -6913,13 +6897,16 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_a_single_1a_1a_t1_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + attachment_a_single_1a_a_single_1a_t2_port_0: + type: tosca.capabilities.Attachment occurrences: - - 0 + - 1 + - UNBOUNDED + network.incoming.packets.rate_a_single_1a_a_single_1a_t1_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 - UNBOUNDED disk.device.iops_a_single_1a: type: org.openecomp.capabilities.metric.Ceilometer @@ -6933,31 +6920,44 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_a_single_1a: + network.outpoing.packets_a_single_1a_a_single_1a_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.capacity_a_single_1a: + disk.device.read.requests.rate_a_single_1a: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.requests.rate_a_single_1a: + feature_a_single_1a_a_single_1a_t1_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.device.capacity_a_single_1a: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_a_single_1a_1a_t2_port: + binding_a_single_1a_a_single_1a_t1_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + disk.write.requests.rate_a_single_1a: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_a_single_1a_1a_t1_port: + network.outgoing.packets.rate_a_single_1a_a_single_1a_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -6966,43 +6966,55 @@ node_types: org.openecomp.resource.abstract.nodes.b_single_1b_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_1b_t1_port_order: - type: integer + port_b_single_1b_t1_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED + port_b_single_1b_t1_port_0_related_networks: + type: list required: true status: SUPPORTED - port_1b_t1_port_network_role: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_b_single_1b_t2_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_1b_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_b_single_1b_t1_port_0_network_role: + type: string required: true status: SUPPORTED + port_b_single_1b_t2_port_0_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string vm_flavor_name: type: string required: true status: SUPPORTED - port_1b_t2_port_related_networks: + port_b_single_1b_t1_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1b_t1_port_ip_requirements: + type: org.openecomp.datatypes.network.VlanRequirements + port_b_single_1b_t2_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true status: SUPPORTED - port_1b_t2_port_network_role: - type: string + port_b_single_1b_t2_port_0_order: + type: integer required: true status: SUPPORTED - port_1b_t2_port_order: + port_b_single_1b_t1_port_0_order: type: integer required: true status: SUPPORTED @@ -7012,34 +7024,32 @@ node_types: status: SUPPORTED entry_schema: type: string - port_1b_t2_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_1b_t2_port_network_role_tag: - type: string + port_b_single_1b_t2_port_0_vlan_requirements: + type: list required: true status: SUPPORTED - port_1b_t2_port_subnetpoolid: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_b_single_1b_t2_port_0_network_role: type: string required: true status: SUPPORTED - port_1b_t1_port_related_networks: + port_b_single_1b_t1_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1b_t2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED + type: org.openecomp.datatypes.network.IpRequirements compute_b_single_1b_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string + port_b_single_1b_t1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -7054,19 +7064,15 @@ node_types: status: SUPPORTED entry_schema: type: json - port_1b_t2_port_vlan_requirements: - type: list + port_b_single_1b_t1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1b_t2_port_ip_requirements: - type: list + port_b_single_1b_t1_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_1b_t1_port_network_role_tag: + port_b_single_1b_t2_port_0_network_role_tag: type: string required: true status: SUPPORTED @@ -7076,26 +7082,20 @@ node_types: status: SUPPORTED entry_schema: type: json - port_1b_t1_port_subnetpoolid: - type: string + port_b_single_1b_t2_port_0_ip_requirements: + type: list required: true status: SUPPORTED - port_1b_t1_port_mac_requirements: + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_b_single_1b_t2_port_0_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_1b_t2_port_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_1b_t1_port_vlan_requirements: - type: list + port_b_single_1b_t2_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements compute_b_single_1b_name: type: list required: true @@ -7106,7 +7106,7 @@ node_types: b_single_1b_instance_name: type: string status: SUPPORTED - b_single_1b_1b_t1_port_tenant_id: + b_single_1b_b_single_1b_t1_port_0_tenant_id: type: string status: SUPPORTED requirements: @@ -7124,43 +7124,33 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_b_single_1b_1b_t1_port: + - dependency_b_single_1b_b_single_1b_t2_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_b_single_1b_1b_t1_port: + - link_b_single_1b_b_single_1b_t2_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_b_single_1b_1b_t2_port: + - dependency_b_single_1b_b_single_1b_t1_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_b_single_1b_1b_t2_port: + - link_b_single_1b_b_single_1b_t1_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - attachment_b_single_1b_1b_t2_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - forwarder_b_single_1b_1b_t2_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED endpoint_b_single_1b: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -7177,23 +7167,56 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_b_single_1b_1b_t2_port: + network.incoming.bytes_b_single_1b_b_single_1b_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_b_single_1b_1b_t2_port: + network.incoming.packets.rate_b_single_1b_b_single_1b_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - forwarder_b_single_1b_1b_t1_port: - type: org.openecomp.capabilities.Forwarder + network.incoming.bytes_b_single_1b_b_single_1b_t2_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + binding_b_single_1b_b_single_1b_t1_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + feature_b_single_1b_b_single_1b_t2_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_b_single_1b_b_single_1b_t1_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_b_single_1b_b_single_1b_t1_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED + binding_b_single_1b_b_single_1b_t2_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED scalable_b_single_1b: type: tosca.capabilities.Scalable occurrences: @@ -7210,6 +7233,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_b_single_1b_b_single_1b_t2_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_b_single_1b_b_single_1b_t1_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED vcpus_b_single_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -7222,25 +7255,25 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_b_single_1b: + network.incoming.bytes.rate_b_single_1b_b_single_1b_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_b_single_1b_1b_t2_port: + disk.device.read.requests.rate_b_single_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - instance_b_single_1b: + network.incoming.packets.rate_b_single_1b_b_single_1b_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_b_single_1b_1b_t1_port: + instance_b_single_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -7264,49 +7297,43 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_b_single_1b_1b_t1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.device.allocation_b_single_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_b_single_1b_1b_t2_port: + network.outgoing.packets.rate_b_single_1b_b_single_1b_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.capacity_b_single_1b: + network.outpoing.packets_b_single_1b_b_single_1b_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.latency_b_single_1b: + network.outgoing.bytes_b_single_1b_b_single_1b_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets_b_single_1b_1b_t2_port: + disk.device.capacity_b_single_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_b_single_1b_1b_t1_port: + disk.latency_b_single_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_b_single_1b_1b_t1_port: + attachment_b_single_1b_b_single_1b_t1_port_0: type: tosca.capabilities.Attachment occurrences: - 1 @@ -7317,14 +7344,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_b_single_1b_1b_t2_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED disk.ephemeral.size_b_single_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -7337,25 +7356,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_b_single_1b_1b_t2_port: + disk.device.iops_b_single_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.iops_b_single_1b: + disk.read.requests_b_single_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.requests_b_single_1b: + memory.resident_b_single_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory.resident_b_single_1b: + network.outgoing.bytes.rate_b_single_1b_b_single_1b_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -7367,12 +7386,13 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_b_single_1b_1b_t1_port: - type: tosca.capabilities.Node + network.incoming.packets_b_single_1b_b_single_1b_t1_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_b_single_1b_1b_t2_port: + network.outgoing.bytes.rate_b_single_1b_b_single_1b_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -7414,7 +7434,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_b_single_1b_1b_t1_port: + network.incoming.packets_b_single_1b_b_single_1b_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -7432,63 +7452,48 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_b_single_1b_1b_t1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.device.read.requests_b_single_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets_b_single_1b_1b_t1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_b_single_1b_b_single_1b_t2_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - binding_b_single_1b_1b_t1_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - network.outpoing.packets_b_single_1b_1b_t1_port: + disk.device.write.requests.rate_b_single_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.requests.rate_b_single_1b: + network.outgoing.packets.rate_b_single_1b_b_single_1b_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory.usage_b_single_1b: + network.outpoing.packets_b_single_1b_b_single_1b_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.bytes.rate_b_single_1b: + memory.usage_b_single_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_b_single_1b_1b_t2_port: + network.outgoing.bytes_b_single_1b_b_single_1b_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_b_single_1b_1b_t1_port: + disk.write.bytes.rate_b_single_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -7530,88 +7535,77 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_b_single_1b_1b_t2_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED org.openecomp.resource.abstract.nodes.b_single_2b: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_1b_t1_port_order: - type: integer + port_b_single_2b_t2_port_0_network_role: + type: string required: true status: SUPPORTED - port_1b_t1_port_network_role: + vm_flavor_name: type: string required: true status: SUPPORTED - port_1b_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_b_single_2b_t1_port_0_ip_requirements: + type: list required: true status: SUPPORTED - vm_flavor_name: + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_b_single_2b_t1_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_1b_t2_port_related_networks: + port_b_single_2b_t2_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1b_t1_port_ip_requirements: - type: list + vm_image_name: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: + port_b_single_2b_t2_port_0_subnetpoolid: type: string required: true status: SUPPORTED - compute_b_single_2b_scheduler_hints: + port_b_single_2b_t2_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: json - port_1b_t2_port_network_role: - type: string - required: true - status: SUPPORTED - port_1b_t2_port_order: - type: integer + type: string + compute_b_single_2b_scheduler_hints: + type: list required: true status: SUPPORTED - port_1b_t2_port_exCP_naming: + entry_schema: + type: json + port_b_single_2b_t1_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_1b_t2_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_1b_t2_port_subnetpoolid: - type: string + port_b_single_2b_t1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_1b_t1_port_related_networks: - type: list + port_b_single_2b_t2_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_b_single_2b_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_1b_t2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_b_single_2b_t1_port_0_vlan_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -7620,66 +7614,72 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_1b_t2_port_vlan_requirements: + compute_b_single_2b_name: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1b_t2_port_ip_requirements: + type: string + port_b_single_2b_t1_port_0_order: + type: integer + required: true + status: SUPPORTED + port_b_single_2b_t2_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_b_single_2b_t2_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - compute_b_single_2b_name: + compute_b_single_2b_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string - port_1b_t1_port_value_specs: + port_b_single_2b_t2_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json - compute_b_single_2b_user_data_format: + type: org.openecomp.datatypes.network.VlanRequirements + port_b_single_2b_t1_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_1b_t1_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_1b_t1_port_subnetpoolid: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_b_single_2b_t1_port_0_network_role: type: string required: true status: SUPPORTED - port_1b_t1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_b_single_2b_t1_port_0_value_specs: + type: list required: true status: SUPPORTED - port_1b_t2_port_network: + entry_schema: + type: json + port_b_single_2b_t1_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_1b_t1_port_vlan_requirements: - type: list + port_b_single_2b_t2_port_0_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1b_t1_port_network: - type: list + port_b_single_2b_t1_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_b_single_2b_t2_port_0_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: string attributes: b_single_2b_instance_name: type: string @@ -7699,27 +7699,27 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_b_single_2b_1b_t1_port: + - dependency_b_single_2b_b_single_2b_t1_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_b_single_2b_1b_t1_port: + - link_b_single_2b_b_single_2b_t1_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_b_single_2b_1b_t2_port: + - dependency_b_single_2b_b_single_2b_t2_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_b_single_2b_1b_t2_port: + - link_b_single_2b_b_single_2b_t2_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -7732,25 +7732,13 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_b_single_2b_1b_t2_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes.rate_b_single_2b_1b_t2_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - network.outgoing.bytes.rate_b_single_2b_1b_t2_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_b_single_2b_b_single_2b_t1_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - attachment_b_single_2b_1b_t2_port: - type: tosca.capabilities.Attachment + feature_b_single_2b_b_single_2b_t2_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -7785,20 +7773,21 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_b_single_2b_1b_t2_port: + disk.read.bytes_b_single_2b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.bytes_b_single_2b: + network.incoming.bytes_b_single_2b_b_single_2b_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - forwarder_b_single_2b_1b_t1_port: - type: org.openecomp.capabilities.Forwarder + network.incoming.bytes_b_single_2b_b_single_2b_t1_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -7814,19 +7803,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_b_single_2b_1b_t1_port: + network.outgoing.packets.rate_b_single_2b_b_single_2b_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_b_single_2b_1b_t1_port: + disk.write.requests.rate_b_single_2b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.requests.rate_b_single_2b: + network.incoming.bytes.rate_b_single_2b_b_single_2b_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -7849,9 +7838,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_b_single_2b_1b_t2_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_b_single_2b_b_single_2b_t1_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -7867,24 +7855,27 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_b_single_2b_1b_t1_port: + network.incoming.packets.rate_b_single_2b_b_single_2b_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_b_single_2b_1b_t1_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.write.bytes_b_single_2b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets_b_single_2b_1b_t2_port: + binding_b_single_2b_b_single_2b_t2_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + network.outpoing.packets_b_single_2b_b_single_2b_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -7896,19 +7887,17 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_b_single_2b: + network.outgoing.bytes_b_single_2b_b_single_2b_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_b_single_2b_1b_t2_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + disk.device.read.requests.rate_b_single_2b: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED instance_b_single_2b: type: org.openecomp.capabilities.metric.Ceilometer @@ -7916,7 +7905,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_b_single_2b_1b_t2_port: + network.incoming.packets_b_single_2b_b_single_2b_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -7928,32 +7917,33 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.latency_b_single_2b: + network.incoming.packets_b_single_2b_b_single_2b_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_b_single_2b_1b_t2_port: + network.outgoing.bytes.rate_b_single_2b_b_single_2b_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.allocation_b_single_2b: + disk.device.latency_b_single_2b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.latency_b_single_2b: + disk.device.allocation_b_single_2b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_b_single_2b_1b_t1_port: - type: tosca.capabilities.Node + disk.latency_b_single_2b: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -7963,9 +7953,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_b_single_2b_1b_t1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_b_single_2b_b_single_2b_t2_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + attachment_b_single_2b_b_single_2b_t1_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -7987,7 +7981,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_b_single_2b_1b_t1_port: + network.outgoing.bytes.rate_b_single_2b_b_single_2b_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -7998,19 +7992,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_b_single_2b_1b_t1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - network.outgoing.bytes_b_single_2b_1b_t1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + os_b_single_2b: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - binding_b_single_2b_1b_t1_port: + binding_b_single_2b_b_single_2b_t1_port_0: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -8018,23 +8005,24 @@ node_types: occurrences: - 0 - UNBOUNDED - feature_b_single_2b_1b_t2_port: - type: tosca.capabilities.Node + forwarder_b_single_2b_b_single_2b_t2_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - os_b_single_2b: - type: tosca.capabilities.OperatingSystem + disk.root.size_b_single_2b: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.root.size_b_single_2b: + disk.read.requests_b_single_2b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.requests_b_single_2b: + network.incoming.bytes.rate_b_single_2b_b_single_2b_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -8057,6 +8045,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets.rate_b_single_2b_b_single_2b_t1_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED scalable_b_single_2b: type: tosca.capabilities.Scalable occurrences: @@ -8080,6 +8074,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_b_single_2b_b_single_2b_t2_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests.rate_b_single_2b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -8092,19 +8092,19 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.read.bytes.rate_b_single_2b: + network.outgoing.packets.rate_b_single_2b_b_single_2b_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_b_single_2b_1b_t2_port: + disk.read.bytes.rate_b_single_2b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_b_single_2b_1b_t1_port: + network.outgoing.bytes_b_single_2b_b_single_2b_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -8113,23 +8113,25 @@ node_types: org.openecomp.resource.abstract.nodes.b_single_2b_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_1b_t1_port_order: - type: integer + port_b_single_2b_t2_port_0_network_role: + type: string required: true status: SUPPORTED - port_1b_t1_port_network_role: + vm_flavor_name: type: string required: true status: SUPPORTED - port_1b_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_b_single_2b_t1_port_0_ip_requirements: + type: list required: true status: SUPPORTED - vm_flavor_name: + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_b_single_2b_t1_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_1b_t2_port_related_networks: + port_b_single_2b_t2_port_0_related_networks: type: list required: true status: SUPPORTED @@ -8141,58 +8143,50 @@ node_types: status: SUPPORTED entry_schema: type: json - port_1b_t1_port_ip_requirements: - type: list + vm_image_name: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: + port_b_single_2b_t2_port_0_subnetpoolid: type: string required: true status: SUPPORTED - compute_b_single_2b_scheduler_hints: + port_b_single_2b_t2_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: json - port_1b_t2_port_network_role: - type: string - required: true - status: SUPPORTED - port_1b_t2_port_order: - type: integer + type: string + compute_b_single_2b_scheduler_hints: + type: list required: true status: SUPPORTED - port_1b_t2_port_exCP_naming: + entry_schema: + type: json + port_b_single_2b_t1_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_1b_t2_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_1b_t2_port_subnetpoolid: - type: string + port_b_single_2b_t1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_1b_t1_port_related_networks: - type: list + port_b_single_2b_t2_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_b_single_2b_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_1b_t2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_b_single_2b_t1_port_0_vlan_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -8201,54 +8195,60 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_1b_t2_port_vlan_requirements: + compute_b_single_2b_name: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1b_t2_port_ip_requirements: + type: string + port_b_single_2b_t1_port_0_order: + type: integer + required: true + status: SUPPORTED + port_b_single_2b_t2_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_b_single_2b_t2_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - compute_b_single_2b_name: + compute_b_single_2b_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string - compute_b_single_2b_user_data_format: + port_b_single_2b_t2_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_1b_t1_port_network_role_tag: - type: string + type: org.openecomp.datatypes.network.VlanRequirements + port_b_single_2b_t1_port_0_related_networks: + type: list required: true status: SUPPORTED - port_1b_t1_port_subnetpoolid: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_b_single_2b_t1_port_0_network_role: type: string required: true status: SUPPORTED - port_1b_t1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_b_single_2b_t2_port_0_order: + type: integer required: true status: SUPPORTED - port_1b_t2_port_network: - type: list + port_b_single_2b_t1_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: string - port_1b_t1_port_vlan_requirements: - type: list + port_b_single_2b_t2_port_0_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements attributes: b_single_2b_instance_name: type: string @@ -8268,27 +8268,27 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_b_single_2b_1b_t1_port: + - dependency_b_single_2b_b_single_2b_t1_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_b_single_2b_1b_t1_port: + - link_b_single_2b_b_single_2b_t1_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_b_single_2b_1b_t2_port: + - dependency_b_single_2b_b_single_2b_t2_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_b_single_2b_1b_t2_port: + - link_b_single_2b_b_single_2b_t2_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -8301,25 +8301,13 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_b_single_2b_1b_t2_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes.rate_b_single_2b_1b_t2_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - network.outgoing.bytes.rate_b_single_2b_1b_t2_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_b_single_2b_b_single_2b_t1_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - attachment_b_single_2b_1b_t2_port: - type: tosca.capabilities.Attachment + feature_b_single_2b_b_single_2b_t2_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -8354,20 +8342,21 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_b_single_2b_1b_t2_port: + disk.read.bytes_b_single_2b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.bytes_b_single_2b: + network.incoming.bytes_b_single_2b_b_single_2b_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - forwarder_b_single_2b_1b_t1_port: - type: org.openecomp.capabilities.Forwarder + network.incoming.bytes_b_single_2b_b_single_2b_t1_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -8383,19 +8372,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_b_single_2b_1b_t1_port: + network.outgoing.packets.rate_b_single_2b_b_single_2b_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_b_single_2b_1b_t1_port: + disk.write.requests.rate_b_single_2b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.requests.rate_b_single_2b: + network.incoming.bytes.rate_b_single_2b_b_single_2b_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -8418,9 +8407,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_b_single_2b_1b_t2_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_b_single_2b_b_single_2b_t1_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -8436,24 +8424,27 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_b_single_2b_1b_t1_port: + network.incoming.packets.rate_b_single_2b_b_single_2b_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_b_single_2b_1b_t1_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.write.bytes_b_single_2b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets_b_single_2b_1b_t2_port: + binding_b_single_2b_b_single_2b_t2_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + network.outpoing.packets_b_single_2b_b_single_2b_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -8465,19 +8456,17 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_b_single_2b: + network.outgoing.bytes_b_single_2b_b_single_2b_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_b_single_2b_1b_t2_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + disk.device.read.requests.rate_b_single_2b: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED instance_b_single_2b: type: org.openecomp.capabilities.metric.Ceilometer @@ -8485,7 +8474,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_b_single_2b_1b_t2_port: + network.incoming.packets_b_single_2b_b_single_2b_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -8497,32 +8486,33 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.latency_b_single_2b: + network.incoming.packets_b_single_2b_b_single_2b_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_b_single_2b_1b_t2_port: + network.outgoing.bytes.rate_b_single_2b_b_single_2b_t2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.allocation_b_single_2b: + disk.device.latency_b_single_2b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.latency_b_single_2b: + disk.device.allocation_b_single_2b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_b_single_2b_1b_t1_port: - type: tosca.capabilities.Node + disk.latency_b_single_2b: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -8532,9 +8522,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_b_single_2b_1b_t1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_b_single_2b_b_single_2b_t2_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + attachment_b_single_2b_b_single_2b_t1_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -8556,7 +8550,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_b_single_2b_1b_t1_port: + network.outgoing.bytes.rate_b_single_2b_b_single_2b_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -8567,19 +8561,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_b_single_2b_1b_t1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - network.outgoing.bytes_b_single_2b_1b_t1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + os_b_single_2b: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - binding_b_single_2b_1b_t1_port: + binding_b_single_2b_b_single_2b_t1_port_0: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -8587,23 +8574,24 @@ node_types: occurrences: - 0 - UNBOUNDED - feature_b_single_2b_1b_t2_port: - type: tosca.capabilities.Node + forwarder_b_single_2b_b_single_2b_t2_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - os_b_single_2b: - type: tosca.capabilities.OperatingSystem + disk.root.size_b_single_2b: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.root.size_b_single_2b: + disk.read.requests_b_single_2b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.requests_b_single_2b: + network.incoming.bytes.rate_b_single_2b_b_single_2b_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -8626,6 +8614,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets.rate_b_single_2b_b_single_2b_t1_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED scalable_b_single_2b: type: tosca.capabilities.Scalable occurrences: @@ -8649,6 +8643,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_b_single_2b_b_single_2b_t2_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests.rate_b_single_2b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -8661,19 +8661,19 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.read.bytes.rate_b_single_2b: + network.outgoing.packets.rate_b_single_2b_b_single_2b_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_b_single_2b_1b_t2_port: + disk.read.bytes.rate_b_single_2b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_b_single_2b_1b_t1_port: + network.outgoing.bytes_b_single_2b_b_single_2b_t1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: 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 6741c72585..9cabc6d0d0 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 @@ -264,43 +264,43 @@ topology_template: directives: - substitutable properties: + port_b_single_1b_t1_port_0_network_role_tag: oam + port_b_single_1b_t2_port_0_network: + - b_single_1b_network_1 vm_flavor_name: get_input: pd_flavor_name - port_1b_t1_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false vm_image_name: get_input: pd_image_name compute_b_single_1b_user_data_format: - RAW - port_1b_t2_port_mac_requirements: - mac_count_required: + port_b_single_1b_t1_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: is_required: false + port_b_single_1b_t1_port_0_value_specs: + - get_attribute: + - abstract_a_single_1a + - a_single_1a_a_single_1a_t1_port_0_tenant_id compute_b_single_1b_availability_zone: - get_input: availabilityzone_name compute_b_single_1b_scheduler_hints: - group: BE_Affinity_group - port_1b_t2_port_ip_requirements: + port_b_single_1b_t1_port_0_mac_requirements: + mac_count_required: + is_required: false + port_b_single_1b_t1_port_0_network: + - get_input: oam_net_name + port_b_single_1b_t2_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_1b_t1_port_value_specs: - - 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_mac_requirements: + port_b_single_1b_t2_port_0_mac_requirements: mac_count_required: is_required: false - port_1b_t2_port_network: - - b_single_1b_network_1 - port_1b_t1_port_network: - - get_input: oam_net_name compute_b_single_1b_name: - get_input: - b_single_1b_names @@ -314,7 +314,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_b_single_1b_1b_t2_port: + - link_b_single_1b_b_single_1b_t2_port_0: capability: tosca.capabilities.network.Linkable node: b_single_1b_network_1 relationship: tosca.relationships.network.LinksTo @@ -329,7 +329,15 @@ topology_template: - 1c2_catalog_instance_instance_name vm_flavor_name: get_input: pd_flavor_name - port_2c202_port_ip_requirements: + port_2c2_catalog_instance_202_port_0_network: + - 1c2_catalog_instance_network + port_2c2_catalog_instance_202_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_2c2_catalog_instance_201_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false @@ -337,30 +345,22 @@ topology_template: is_required: false vm_image_name: get_input: pd_image_name - port_1c201_port_network_role_tag: oam compute_2c2_catalog_instance_scheduler_hints: - group: BE_Affinity_group compute_2c2_catalog_instance_availability_zone: - get_input: availabilityzone_name - compute_2c2_catalog_instance_name: - - get_input: - - 2c2_catalog_instance_names - - 1 - port_2c202_port_mac_requirements: + port_2c2_catalog_instance_201_port_0_mac_requirements: mac_count_required: is_required: false - port_2c202_port_network: - - 1c2_catalog_instance_network - port_1c201_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_1c201_port_mac_requirements: + port_2c2_catalog_instance_202_port_0_mac_requirements: mac_count_required: is_required: false - port_1c201_port_network: + compute_2c2_catalog_instance_name: + - get_input: + - 2c2_catalog_instance_names + - 1 + port_2c2_catalog_instance_201_port_0_network_role_tag: oam + port_2c2_catalog_instance_201_port_0_network: - get_input: oam_net_name service_template_filter: substitute_service_template: Nested_2c2_catalog_instanceServiceTemplate.yaml @@ -371,7 +371,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_2c2_catalog_instance_2c202_port: + - link_2c2_catalog_instance_2c2_catalog_instance_202_port_0: capability: tosca.capabilities.network.Linkable node: 1c2_catalog_instance_network relationship: tosca.relationships.network.LinksTo @@ -384,7 +384,15 @@ topology_template: - RAW1 vm_flavor_name: get_input: pd_flavor_name - port_2c202_port_ip_requirements: + port_2c2_catalog_instance_202_port_0_network: + - 1c2_catalog_instance_network + port_2c2_catalog_instance_202_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_2c2_catalog_instance_201_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false @@ -392,30 +400,22 @@ topology_template: is_required: false vm_image_name: get_input: pd_image_name - port_1c201_port_network_role_tag: oam compute_2c2_catalog_instance_scheduler_hints: - group: BE_Affinity_group compute_2c2_catalog_instance_availability_zone: - get_input: availabilityzone_name - compute_2c2_catalog_instance_name: - - get_input: - - 2c2_catalog_instance_names - - 0 - port_2c202_port_mac_requirements: + port_2c2_catalog_instance_201_port_0_mac_requirements: mac_count_required: is_required: false - port_2c202_port_network: - - 1c2_catalog_instance_network - port_1c201_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_1c201_port_mac_requirements: + port_2c2_catalog_instance_202_port_0_mac_requirements: mac_count_required: is_required: false - port_1c201_port_network: + compute_2c2_catalog_instance_name: + - get_input: + - 2c2_catalog_instance_names + - 0 + port_2c2_catalog_instance_201_port_0_network_role_tag: oam + port_2c2_catalog_instance_201_port_0_network: - get_input: oam_net_name service_template_filter: substitute_service_template: Nested_2c2_catalog_instanceServiceTemplate.yaml @@ -426,7 +426,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_2c2_catalog_instance_2c202_port: + - link_2c2_catalog_instance_2c2_catalog_instance_202_port_0: capability: tosca.capabilities.network.Linkable node: 1c2_catalog_instance_network relationship: tosca.relationships.network.LinksTo @@ -439,39 +439,39 @@ topology_template: - get_input: availabilityzone_name vm_flavor_name: get_input: pd_flavor_name - compute_1c2_catalog_instance_personality: - - - UNSUPPORTED_RESOURCE_[1a_single_1A_1, instance_name] - port_2c202_port_ip_requirements: + port_1c2_catalog_instance_202_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false + compute_1c2_catalog_instance_personality: + - - UNSUPPORTED_RESOURCE_[1a_single_1A_1, instance_name] + port_1c2_catalog_instance_201_port_0_mac_requirements: + mac_count_required: + is_required: false + port_1c2_catalog_instance_202_port_0_network: + - 1c2_catalog_instance_network vm_image_name: get_input: pd_image_name - port_1c201_port_network_role_tag: oam + port_1c2_catalog_instance_202_port_0_mac_requirements: + mac_count_required: + is_required: false + port_1c2_catalog_instance_201_port_0_network_role_tag: oam compute_1c2_catalog_instance_name: - get_input: - 1c2_catalog_instance_names - 1 - port_2c202_port_mac_requirements: - mac_count_required: - is_required: false - port_2c202_port_network: - - 1c2_catalog_instance_network - port_1c201_port_ip_requirements: + port_1c2_catalog_instance_201_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_1c201_port_mac_requirements: - mac_count_required: - is_required: false + port_1c2_catalog_instance_201_port_0_network: + - get_input: oam_net_name compute_1c2_catalog_instance_user_data_format: - RAW1 - port_1c201_port_network: - - get_input: oam_net_name compute_1c2_catalog_instance_scheduler_hints: - group: BE_Affinity_group service_template_filter: @@ -483,7 +483,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_1c2_catalog_instance_2c202_port: + - link_1c2_catalog_instance_1c2_catalog_instance_202_port_0: capability: tosca.capabilities.network.Linkable node: 1c2_catalog_instance_network relationship: tosca.relationships.network.LinksTo @@ -496,39 +496,39 @@ topology_template: - get_input: availabilityzone_name vm_flavor_name: get_input: pd_flavor_name - port_2c202_port_ip_requirements: + port_1c2_catalog_instance_202_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false + port_1c2_catalog_instance_201_port_0_mac_requirements: + mac_count_required: + is_required: false + port_1c2_catalog_instance_202_port_0_network: + - 1c2_catalog_instance_network vm_image_name: get_input: pd_image_name - port_1c201_port_network_role_tag: oam + port_1c2_catalog_instance_202_port_0_mac_requirements: + mac_count_required: + is_required: false + port_1c2_catalog_instance_201_port_0_network_role_tag: oam compute_1c2_catalog_instance_name: - get_input: - 1c2_catalog_instance_names - 2 - port_2c202_port_mac_requirements: - mac_count_required: - is_required: false - port_2c202_port_network: - - 1c2_catalog_instance_network - port_1c201_port_ip_requirements: + port_1c2_catalog_instance_201_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_1c201_port_mac_requirements: - mac_count_required: - is_required: false + port_1c2_catalog_instance_201_port_0_network: + - get_input: oam_net_name compute_1c2_catalog_instance_user_data_format: - get_attribute: - abstract_1c2_catalog_instance_0 - 1c2_catalog_instance_instance_name - port_1c201_port_network: - - get_input: oam_net_name compute_1c2_catalog_instance_scheduler_hints: - group: BE_Affinity_group service_template_filter: @@ -540,7 +540,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_1c2_catalog_instance_2c202_port: + - link_1c2_catalog_instance_1c2_catalog_instance_202_port_0: capability: tosca.capabilities.network.Linkable node: 1c2_catalog_instance_network relationship: tosca.relationships.network.LinksTo @@ -550,10 +550,10 @@ topology_template: dhcp_agent_ids: get_attribute: - abstract_1c2_catalog_instance_1 - - 1c2_catalog_instance_1c201_port_tenant_id + - 1c2_catalog_instance_1c2_catalog_instance_201_port_0_tenant_id - get_attribute: - abstract_1c2_catalog_instance_0 - - 1c2_catalog_instance_1c201_port_tenant_id + - 1c2_catalog_instance_1c2_catalog_instance_201_port_0_tenant_id - get_attribute: - abstract_1c2_catalog_instance_1 - 1c2_catalog_instance_instance_name @@ -582,7 +582,7 @@ topology_template: admin_state_up: get_attribute: - abstract_a_single_1a - - a_single_1a_1a_t1_port_tenant_id + - a_single_1a_a_single_1a_t1_port_0_tenant_id qos_policy: get_attribute: - abstract_a_single_1a @@ -603,10 +603,10 @@ topology_template: - b_single_1b_instance_name - get_attribute: - abstract_b_single_1b_1 - - b_single_1b_1b_t1_port_tenant_id + - b_single_1b_b_single_1b_t1_port_0_tenant_id - get_attribute: - abstract_b_single_1b - - b_single_1b_1b_t1_port_tenant_id + - b_single_1b_b_single_1b_t1_port_0_tenant_id abstract_a_single_1a: type: org.openecomp.resource.abstract.nodes.a_single_1a directives: @@ -676,43 +676,43 @@ topology_template: get_attribute: - abstract_1c2_catalog_instance_1 - 1c2_catalog_instance_instance_name - port_1a_t1_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_1a_t2_port_network_role_tag: ppds vm_flavor_name: get_input: pd_flavor_name - port_1a_t2_port_network: - - get_input: ppds_net_name - port_1a_t1_port_mac_requirements: + port_a_single_1a_t2_port_0_network_role_tag: ppds + port_a_single_1a_t1_port_0_mac_requirements: mac_count_required: is_required: false - port_1a_t1_port_network: - - a_single_1a_network vm_image_name: get_input: pd_image_name - port_1a_t2_port_ip_requirements: + port_a_single_1a_t2_port_0_network: + - get_input: ppds_net_name + port_a_single_1a_t1_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false + port_a_single_1a_t2_port_0_mac_requirements: + mac_count_required: + is_required: false + port_a_single_1a_t1_port_0_network: + - a_single_1a_network compute_a_single_1a_availability_zone: - get_input: availabilityzone_name compute_a_single_1a_scheduler_hints: - group: BE_Affinity_group + port_a_single_1a_t2_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false compute_a_single_1a_user_data_format: - RAW compute_a_single_1a_name: - get_input: - a_single_1a_names - 0 - port_1a_t2_port_mac_requirements: - mac_count_required: - is_required: false service_template_filter: substitute_service_template: Nested_a_single_1aServiceTemplate.yaml count: 1 @@ -722,7 +722,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_a_single_1a_1a_t1_port: + - link_a_single_1a_a_single_1a_t1_port_0: capability: tosca.capabilities.network.Linkable node: a_single_1a_network relationship: tosca.relationships.network.LinksTo @@ -744,11 +744,11 @@ topology_template: connectivityTo1C1_T1_02: get_attribute: - abstract_1c11_scalling_instance - - 1c11_scalling_instance_1c1_t1_port_tenant_id + - 1c11_scalling_instance_1c11_scalling_instance_t1_port_0_tenant_id connectivityTo1C1_T1_11: get_attribute: - abstract_1c12_scalling_instance - - 1c12_scalling_instance_1c1_t1_port_tenant_id + - 1c12_scalling_instance_1c12_scalling_instance_t1_port_0_tenant_id connectivityTo4PNested_1: get_attribute: - 4p_nested_1 @@ -756,11 +756,11 @@ topology_template: connectivityTo1C1_T1_01: get_attribute: - abstract_1c11_scalling_instance - - 1c11_scalling_instance_1c1_t1_port_tenant_id + - 1c11_scalling_instance_1c11_scalling_instance_t1_port_0_tenant_id connectivityTo1C1_T1_12: get_attribute: - abstract_1c12_scalling_instance - - 1c12_scalling_instance_1c1_t1_port_tenant_id + - 1c12_scalling_instance_1c12_scalling_instance_t1_port_0_tenant_id connectivityTo1B01_1: get_attribute: - abstract_b_single_1b_1 @@ -840,11 +840,11 @@ topology_template: connectivityTo1C1_T1_02: get_attribute: - abstract_1c11_scalling_instance - - 1c11_scalling_instance_1c1_t1_port_tenant_id + - 1c11_scalling_instance_1c11_scalling_instance_t1_port_0_tenant_id connectivityTo1C1_T1_11: get_attribute: - abstract_1c12_scalling_instance - - 1c12_scalling_instance_1c1_t1_port_tenant_id + - 1c12_scalling_instance_1c12_scalling_instance_t1_port_0_tenant_id connectivityTo4PNested_1: get_attribute: - 4p_nested_1 @@ -852,11 +852,11 @@ topology_template: connectivityTo1C1_T1_01: get_attribute: - abstract_1c11_scalling_instance - - 1c11_scalling_instance_1c1_t1_port_tenant_id + - 1c11_scalling_instance_1c11_scalling_instance_t1_port_0_tenant_id connectivityTo1C1_T1_12: get_attribute: - abstract_1c12_scalling_instance - - 1c12_scalling_instance_1c1_t1_port_tenant_id + - 1c12_scalling_instance_1c12_scalling_instance_t1_port_0_tenant_id connectivityTo1B01_1: get_attribute: - abstract_b_single_1b_1 @@ -923,18 +923,6 @@ topology_template: directives: - substitutable properties: - port_1c1_t1_port_fixed_ips: - - - ip_address: - get_input: - - myIPs - - 1 - - - ip_address: - get_input: - - myIPs - - 1 - port_1c1_t1_port_mac_requirements: - mac_count_required: - is_required: false vm_flavor_name: get_input: pd_flavor_name compute_1c11_scalling_instance_name: @@ -950,23 +938,35 @@ topology_template: compute_1c11_scalling_instance_user_data_format: - RAW1 - RAW1 - port_1c1_t1_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: + port_1c11_scalling_instance_t1_port_0_name: + - 1c11_scalling_instance_0_t1_port_0 + - 1c11_scalling_instance_1_t1_port_0 + port_1c11_scalling_instance_t1_port_0_mac_requirements: + mac_count_required: is_required: false vm_image_name: get_input: pd_image_name - port_1c1_t1_port_name: - - 1c1_t1_port_01 - - 1c1_t1_port_02 compute_1c11_scalling_instance_scheduler_hints: - group: BE_Affinity_group - group: BE_Affinity_group - port_1c1_t1_port_network: + port_1c11_scalling_instance_t1_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + port_1c11_scalling_instance_t1_port_0_network: - 1c1_scalling_instance_network - 1c1_scalling_instance_network + port_1c11_scalling_instance_t1_port_0_fixed_ips: + - - ip_address: + get_input: + - myIPs + - 1 + - - ip_address: + get_input: + - myIPs + - 1 service_template_filter: substitute_service_template: Nested_1c11_scalling_instanceServiceTemplate.yaml count: 2 @@ -976,7 +976,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_1c11_scalling_instance_1c1_t1_port: + - link_1c11_scalling_instance_1c11_scalling_instance_t1_port_0: capability: tosca.capabilities.network.Linkable node: 1c1_scalling_instance_network relationship: tosca.relationships.network.LinksTo @@ -987,6 +987,12 @@ topology_template: properties: vm_flavor_name: get_input: pd_flavor_name + port_b_single_2b_t1_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false compute_b_single_2b_metadata: - connectivityTo4PNested_2: get_attribute: @@ -995,11 +1001,11 @@ topology_template: connectivityTo1C1_T1_02: get_attribute: - abstract_1c11_scalling_instance - - 1c11_scalling_instance_1c1_t1_port_tenant_id + - 1c11_scalling_instance_1c11_scalling_instance_t1_port_0_tenant_id connectivityTo1C1_T1_11: get_attribute: - abstract_1c12_scalling_instance - - 1c12_scalling_instance_1c1_t1_port_tenant_id + - 1c12_scalling_instance_1c12_scalling_instance_t1_port_0_tenant_id connectivityTo4PNested_1: get_attribute: - 4p_nested_1 @@ -1007,11 +1013,11 @@ topology_template: connectivityTo1C1_T1_01: get_attribute: - abstract_1c11_scalling_instance - - 1c11_scalling_instance_1c1_t1_port_tenant_id + - 1c11_scalling_instance_1c11_scalling_instance_t1_port_0_tenant_id connectivityTo1C1_T1_12: get_attribute: - abstract_1c12_scalling_instance - - 1c12_scalling_instance_1c1_t1_port_tenant_id + - 1c12_scalling_instance_1c12_scalling_instance_t1_port_0_tenant_id connectivityTo1B01_1: get_attribute: - abstract_b_single_1b_1 @@ -1052,38 +1058,32 @@ topology_template: get_attribute: - abstract_1c2_catalog_instance_1 - 1c2_catalog_instance_instance_name - port_1b_t1_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false vm_image_name: get_input: pd_image_name + port_b_single_2b_t2_port_0_network: + - b_single_1b_network_2 compute_b_single_2b_scheduler_hints: - group: BE_Affinity_group + port_b_single_2b_t1_port_0_mac_requirements: + mac_count_required: + is_required: false compute_b_single_2b_availability_zone: - get_input: availabilityzone_name - port_1b_t2_port_mac_requirements: + compute_b_single_2b_name: + - get_input: + - b_single_2b_names + - 0 + port_b_single_2b_t2_port_0_mac_requirements: mac_count_required: is_required: false - port_1b_t2_port_ip_requirements: + port_b_single_2b_t2_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - compute_b_single_2b_name: - - get_input: - - b_single_2b_names - - 0 compute_b_single_2b_user_data_format: - RAW - port_1b_t1_port_mac_requirements: - mac_count_required: - is_required: false - port_1b_t2_port_network: - - b_single_1b_network_2 service_template_filter: substitute_service_template: Nested_b_single_2b_1ServiceTemplate.yaml count: 1 @@ -1093,7 +1093,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_b_single_2b_1b_t2_port: + - link_b_single_2b_b_single_2b_t2_port_0: capability: tosca.capabilities.network.Linkable node: b_single_1b_network_2 relationship: tosca.relationships.network.LinksTo @@ -1115,15 +1115,6 @@ topology_template: compute_1c12_scalling_instance_scheduler_hints: - group: BE_Affinity_group - group: BE_Affinity_group - port_1c1_t1_port_fixed_ips: - - - ip_address: - get_input: - - myIPs - - 1 - - - ip_address: - get_input: - - myIPs - - 1 compute_1c12_scalling_instance_name: - get_input: - 1c12_scalling_instance_names @@ -1131,7 +1122,7 @@ topology_template: - get_input: - 1c12_scalling_instance_names - 2 - port_1c1_t1_port_mac_requirements: + port_1c12_scalling_instance_t1_port_0_mac_requirements: mac_count_required: is_required: false vm_flavor_name: @@ -1139,23 +1130,32 @@ topology_template: compute_1c12_scalling_instance_user_data_format: - RAW1 - RAW1 - port_1c1_t1_port_ip_requirements: + port_1c12_scalling_instance_t1_port_0_name: + - 1c12_scalling_instance_0_t1_port_0 + - 1c12_scalling_instance_1_t1_port_0 + port_1c12_scalling_instance_t1_port_0_network: + - 1c1_scalling_instance_network + - 1c1_scalling_instance_network + vm_image_name: + get_input: pd_image_name + port_1c12_scalling_instance_t1_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - vm_image_name: - get_input: pd_image_name - port_1c1_t1_port_name: - - 1c1_t1_port_11 - - 1c1_t1_port_12 + port_1c12_scalling_instance_t1_port_0_fixed_ips: + - - ip_address: + get_input: + - myIPs + - 1 + - - ip_address: + get_input: + - myIPs + - 1 compute_1c12_scalling_instance_availability_zone: - get_input: availabilityzone_name - get_input: availabilityzone_name - port_1c1_t1_port_network: - - 1c1_scalling_instance_network - - 1c1_scalling_instance_network service_template_filter: substitute_service_template: Nested_1c12_scalling_instanceServiceTemplate.yaml count: 2 @@ -1165,7 +1165,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_1c12_scalling_instance_1c1_t1_port: + - link_1c12_scalling_instance_1c12_scalling_instance_t1_port_0: capability: tosca.capabilities.network.Linkable node: 1c1_scalling_instance_network relationship: tosca.relationships.network.LinksTo @@ -1304,25 +1304,25 @@ topology_template: directives: - substitutable properties: - compute_a_single_2a_user_data_format: - - RAW - port_1a_t1_port_ip_requirements: + port_a_single_2a_t1_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false + compute_a_single_2a_user_data_format: + - RAW + port_a_single_2a_t1_port_0_mac_requirements: + mac_count_required: + is_required: false + port_a_single_2a_t1_port_0_network: + - a_single_1a_network compute_a_single_2a_scheduler_hints: - group: BE_Affinity_group compute_a_single_2a_availability_zone: - get_input: availabilityzone_name vm_flavor_name: get_input: pd_flavor_name - port_1a_t1_port_mac_requirements: - mac_count_required: - is_required: false - port_1a_t1_port_network: - - a_single_1a_network compute_a_single_2a_name: - get_input: - a_single_2a_names @@ -1402,7 +1402,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_a_single_2a_1a_t1_port: + - link_a_single_2a_a_single_2a_t1_port_0: capability: tosca.capabilities.network.Linkable node: a_single_1a_network relationship: tosca.relationships.network.LinksTo @@ -1460,44 +1460,44 @@ topology_template: properties: vm_flavor_name: get_input: pd_flavor_name - port_1b_t1_port_ip_requirements: + port_b_single_2b_t1_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false + port_b_single_2b_t1_port_0_network_role_tag: oam vm_image_name: get_input: pd_image_name + port_b_single_2b_t2_port_0_network: + - b_single_1b_network_2 compute_b_single_2b_scheduler_hints: - group: BE_Affinity_group + port_b_single_2b_t1_port_0_mac_requirements: + mac_count_required: + is_required: false compute_b_single_2b_availability_zone: - get_input: availabilityzone_name - port_1b_t2_port_mac_requirements: + compute_b_single_2b_name: + - get_input: + - b_single_2b_names + - 1 + port_b_single_2b_t2_port_0_mac_requirements: mac_count_required: is_required: false - port_1b_t2_port_ip_requirements: + port_b_single_2b_t2_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - compute_b_single_2b_name: - - get_input: - - b_single_2b_names - - 1 - port_1b_t1_port_value_specs: - - get_attribute: - - abstract_a_single_1a - - 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_mac_requirements: - mac_count_required: - is_required: false - port_1b_t2_port_network: - - b_single_1b_network_2 - port_1b_t1_port_network: + port_b_single_2b_t1_port_0_value_specs: + - get_attribute: + - abstract_a_single_1a + - a_single_1a_a_single_1a_t1_port_0_tenant_id + port_b_single_2b_t1_port_0_network: - get_input: oam_net_name service_template_filter: substitute_service_template: Nested_b_single_2bServiceTemplate.yaml @@ -1508,7 +1508,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_b_single_2b_1b_t2_port: + - link_b_single_2b_b_single_2b_t2_port_0: capability: tosca.capabilities.network.Linkable node: b_single_1b_network_2 relationship: tosca.relationships.network.LinksTo @@ -1519,11 +1519,11 @@ topology_template: get_input: net_name requirements: - dependency: - capability: feature_1c2_catalog_instance_1c201_port + capability: feature_1c2_catalog_instance_1c2_catalog_instance_201_port_0 node: abstract_1c2_catalog_instance_1 relationship: tosca.relationships.DependsOn - dependency: - capability: feature_1c2_catalog_instance_1c201_port + capability: feature_1c2_catalog_instance_1c2_catalog_instance_201_port_0 node: abstract_1c2_catalog_instance_0 relationship: tosca.relationships.DependsOn - dependency: @@ -1567,11 +1567,11 @@ topology_template: node: abstract_b_single_1b relationship: tosca.relationships.DependsOn - dependency: - capability: feature_b_single_1b_1b_t1_port + capability: feature_b_single_1b_b_single_1b_t1_port_0 node: abstract_b_single_1b_1 relationship: tosca.relationships.DependsOn - dependency: - capability: feature_b_single_1b_1b_t1_port + capability: feature_b_single_1b_b_single_1b_t1_port_0 node: abstract_b_single_1b relationship: tosca.relationships.DependsOn - dependency: @@ -1583,7 +1583,7 @@ topology_template: node: abstract_a_single_2a relationship: tosca.relationships.DependsOn - dependency: - capability: feature_a_single_1a_1a_t1_port + capability: feature_a_single_1a_a_single_1a_t1_port_0 node: abstract_a_single_1a relationship: tosca.relationships.DependsOn 4p_nested_2: @@ -1601,11 +1601,11 @@ topology_template: connectivityChk: connectivityTo1C1_T1_02: get_attribute: - - 1c1_t1_port_02 + - 1c11_scalling_instance_1_t1_port_0 - tenant_id connectivityTo1C1_T1_11: get_attribute: - - 1c1_t1_port_11 + - 1c12_scalling_instance_0_t1_port_0 - tenant_id connectivityTo4PNested_1: get_attribute: @@ -1613,11 +1613,11 @@ topology_template: - server_pcm_id connectivityTo1C1_T1_01: get_attribute: - - 1c1_t1_port_01 + - 1c11_scalling_instance_0_t1_port_0 - tenant_id connectivityTo1C1_T1_12: get_attribute: - - 1c1_t1_port_12 + - 1c12_scalling_instance_1_t1_port_0 - tenant_id connectivityTo1B01_1: get_attribute: @@ -1738,19 +1738,19 @@ topology_template: - server_pcm_id connectivityTo1C1_T1_02: get_attribute: - - 1c1_t1_port_02 + - 1c11_scalling_instance_1_t1_port_0 - tenant_id connectivityTo1C1_T1_11: get_attribute: - - 1c1_t1_port_11 + - 1c12_scalling_instance_0_t1_port_0 - tenant_id connectivityTo1C1_T1_01: get_attribute: - - 1c1_t1_port_01 + - 1c11_scalling_instance_0_t1_port_0 - tenant_id connectivityTo1C1_T1_12: get_attribute: - - 1c1_t1_port_12 + - 1c12_scalling_instance_1_t1_port_0 - tenant_id connectivityTo1B01_1: get_attribute: @@ -1862,30 +1862,26 @@ topology_template: directives: - substitutable properties: + port_b_single_1b_t2_port_0_network: + - b_single_1b_network_1 vm_flavor_name: get_input: pd_flavor_name - port_1b_t1_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false vm_image_name: get_input: pd_image_name compute_b_single_1b_user_data_format: - RAW - port_1b_t2_port_mac_requirements: - mac_count_required: + port_b_single_1b_t1_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: is_required: false compute_b_single_1b_availability_zone: - get_input: availabilityzone_name compute_b_single_1b_scheduler_hints: - group: BE_Affinity_group - port_1b_t2_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: + port_b_single_1b_t1_port_0_mac_requirements: + mac_count_required: is_required: false compute_b_single_1b_metadata: - connectivityTo4PNested_2: @@ -1895,11 +1891,11 @@ topology_template: connectivityTo1C1_T1_02: get_attribute: - abstract_1c11_scalling_instance - - 1c11_scalling_instance_1c1_t1_port_tenant_id + - 1c11_scalling_instance_1c11_scalling_instance_t1_port_0_tenant_id connectivityTo1C1_T1_11: get_attribute: - abstract_1c12_scalling_instance - - 1c12_scalling_instance_1c1_t1_port_tenant_id + - 1c12_scalling_instance_1c12_scalling_instance_t1_port_0_tenant_id connectivityTo4PNested_1: get_attribute: - 4p_nested_1 @@ -1907,11 +1903,11 @@ topology_template: connectivityTo1C1_T1_01: get_attribute: - abstract_1c11_scalling_instance - - 1c11_scalling_instance_1c1_t1_port_tenant_id + - 1c11_scalling_instance_1c11_scalling_instance_t1_port_0_tenant_id connectivityTo1C1_T1_12: get_attribute: - abstract_1c12_scalling_instance - - 1c12_scalling_instance_1c1_t1_port_tenant_id + - 1c12_scalling_instance_1c12_scalling_instance_t1_port_0_tenant_id connectivityTo1B01_2: get_attribute: - abstract_b_single_2b_1 @@ -1952,11 +1948,15 @@ topology_template: get_attribute: - abstract_1c2_catalog_instance_1 - 1c2_catalog_instance_instance_name - port_1b_t1_port_mac_requirements: + port_b_single_1b_t2_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_b_single_1b_t2_port_0_mac_requirements: mac_count_required: is_required: false - port_1b_t2_port_network: - - b_single_1b_network_1 compute_b_single_1b_name: - get_input: - b_single_1b_names @@ -1970,7 +1970,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_b_single_1b_1b_t2_port: + - link_b_single_1b_b_single_1b_t2_port_0: capability: tosca.capabilities.network.Linkable node: b_single_1b_network_1 relationship: tosca.relationships.network.LinksTo @@ -2030,10 +2030,10 @@ topology_template: value: get_attribute: - abstract_1c2_catalog_instance_1 - - 1c2_catalog_instance_1c201_port_tenant_id + - 1c2_catalog_instance_1c2_catalog_instance_201_port_0_tenant_id - get_attribute: - abstract_1c2_catalog_instance_0 - - 1c2_catalog_instance_1c201_port_tenant_id + - 1c2_catalog_instance_1c2_catalog_instance_201_port_0_tenant_id - get_attribute: - abstract_1c2_catalog_instance_1 - 1c2_catalog_instance_instance_name @@ -2070,10 +2070,10 @@ topology_template: - b_single_1b_instance_name - get_attribute: - abstract_b_single_1b_1 - - b_single_1b_1b_t1_port_tenant_id + - b_single_1b_b_single_1b_t1_port_0_tenant_id - get_attribute: - abstract_b_single_1b - - b_single_1b_1b_t1_port_tenant_id + - b_single_1b_b_single_1b_t1_port_0_tenant_id out5: value: get_attribute: @@ -2091,7 +2091,7 @@ topology_template: value: get_attribute: - abstract_a_single_1a - - a_single_1a_1a_t1_port_tenant_id + - a_single_1a_a_single_1a_t1_port_0_tenant_id out7: value: get_attribute: 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 8640992fb3..c475f397f6 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 @@ -11,21 +11,8 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_1c1_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_1c1_t1_port_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_1c1_t1_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1c1_t1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_1c11_scalling_instance_t1_port_0_network_role: + type: string required: true index_value: type: integer @@ -34,6 +21,11 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_1c11_scalling_instance_t1_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true @@ -52,109 +44,117 @@ topology_template: required: true entry_schema: type: string - port_1c1_t1_port_related_networks: + port_1c11_scalling_instance_t1_port_0_name: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1c1_t1_port_ip_requirements: + type: string + port_1c11_scalling_instance_t1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_1c11_scalling_instance_t1_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.VlanRequirements + port_1c11_scalling_instance_t1_port_0_order: + type: integer + required: true vm_image_name: type: string required: true - port_1c1_t1_port_name: - type: list + port_1c11_scalling_instance_t1_port_0_network_role_tag: + type: string required: true - entry_schema: - type: string compute_1c11_scalling_instance_scheduler_hints: type: list required: true entry_schema: type: json - port_1c1_t1_port_subnetpoolid: - type: string - required: true - port_1c1_t1_port_network_role_tag: - type: string + port_1c11_scalling_instance_t1_port_0_ip_requirements: + type: list required: true - port_1c1_t1_port_network_role: + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_1c11_scalling_instance_t1_port_0_subnetpoolid: type: string required: true - port_1c1_t1_port_network: + port_1c11_scalling_instance_t1_port_0_network: type: list required: true entry_schema: type: string - port_1c1_t1_port_order: - type: integer + port_1c11_scalling_instance_t1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_1c11_scalling_instance_t1_port_0_fixed_ips: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps node_templates: - 1c11_scalling_instance: - type: org.openecomp.resource.vfc.compute.nodes.heat.1c11_scalling_instance - properties: - availability_zone: - get_input: - - compute_1c11_scalling_instance_availability_zone - - index_value - flavor: - get_input: vm_flavor_name - image: - get_input: vm_image_name - name: - get_input: - - compute_1c11_scalling_instance_name - - index_value - scheduler_hints: - get_input: - - compute_1c11_scalling_instance_scheduler_hints - - index_value - user_data_format: - get_input: - - compute_1c11_scalling_instance_user_data_format - - index_value - 1c11_scalling_instance_1c1_t1_port: + 1c11_scalling_instance_1c11_scalling_instance_t1_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_1c1_t1_port_mac_requirements + get_input: port_1c11_scalling_instance_t1_port_0_mac_requirements order: - get_input: port_1c1_t1_port_order + get_input: port_1c11_scalling_instance_t1_port_0_order exCP_naming: - get_input: port_1c1_t1_port_exCP_naming + get_input: port_1c11_scalling_instance_t1_port_0_exCP_naming vlan_requirements: - get_input: port_1c1_t1_port_vlan_requirements + get_input: port_1c11_scalling_instance_t1_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_1c1_t1_port_ip_requirements + get_input: port_1c11_scalling_instance_t1_port_0_ip_requirements related_networks: - get_input: port_1c1_t1_port_related_networks + get_input: port_1c11_scalling_instance_t1_port_0_related_networks network_role_tag: - get_input: port_1c1_t1_port_network_role_tag + get_input: port_1c11_scalling_instance_t1_port_0_network_role_tag network_role: - get_input: port_1c1_t1_port_network_role + get_input: port_1c11_scalling_instance_t1_port_0_network_role fixed_ips: get_input: - - port_1c1_t1_port_fixed_ips + - port_1c11_scalling_instance_t1_port_0_fixed_ips - index_value subnetpoolid: - get_input: port_1c1_t1_port_subnetpoolid + get_input: port_1c11_scalling_instance_t1_port_0_subnetpoolid name: get_input: - - port_1c1_t1_port_name + - port_1c11_scalling_instance_t1_port_0_name - index_value network: get_input: - - port_1c1_t1_port_network + - port_1c11_scalling_instance_t1_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: 1c11_scalling_instance relationship: tosca.relationships.network.BindsTo + 1c11_scalling_instance: + type: org.openecomp.resource.vfc.compute.nodes.heat.1c11_scalling_instance + properties: + availability_zone: + get_input: + - compute_1c11_scalling_instance_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + image: + get_input: vm_image_name + name: + get_input: + - compute_1c11_scalling_instance_name + - index_value + scheduler_hints: + get_input: + - compute_1c11_scalling_instance_scheduler_hints + - index_value + user_data_format: + get_input: + - compute_1c11_scalling_instance_user_data_format + - index_value outputs: 1c11_scalling_instance_instance_name: type: string @@ -162,11 +162,11 @@ topology_template: get_attribute: - 1c11_scalling_instance - instance_name - 1c11_scalling_instance_1c1_t1_port_tenant_id: + 1c11_scalling_instance_1c11_scalling_instance_t1_port_0_tenant_id: type: string value: get_attribute: - - 1c11_scalling_instance_1c1_t1_port + - 1c11_scalling_instance_1c11_scalling_instance_t1_port_0 - tenant_id substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.1c11_scalling_instance @@ -174,12 +174,6 @@ topology_template: disk.device.usage_1c11_scalling_instance: - 1c11_scalling_instance - disk.device.usage - network.incoming.packets_1c11_scalling_instance_1c1_t1_port: - - 1c11_scalling_instance_1c1_t1_port - - network.incoming.packets - network.incoming.packets.rate_1c11_scalling_instance_1c1_t1_port: - - 1c11_scalling_instance_1c1_t1_port - - network.incoming.packets.rate disk.allocation_1c11_scalling_instance: - 1c11_scalling_instance - disk.allocation @@ -207,36 +201,33 @@ topology_template: disk.latency_1c11_scalling_instance: - 1c11_scalling_instance - disk.latency - network.outgoing.packets.rate_1c11_scalling_instance_1c1_t1_port: - - 1c11_scalling_instance_1c1_t1_port - - network.outgoing.packets.rate vcpus_1c11_scalling_instance: - 1c11_scalling_instance - vcpus memory_1c11_scalling_instance: - 1c11_scalling_instance - memory + network.incoming.packets.rate_1c11_scalling_instance_1c11_scalling_instance_t1_port_0: + - 1c11_scalling_instance_1c11_scalling_instance_t1_port_0 + - network.incoming.packets.rate + binding_1c11_scalling_instance_1c11_scalling_instance_t1_port_0: + - 1c11_scalling_instance_1c11_scalling_instance_t1_port_0 + - binding cpu_1c11_scalling_instance: - 1c11_scalling_instance - cpu endpoint_1c11_scalling_instance: - 1c11_scalling_instance - endpoint - feature_1c11_scalling_instance_1c1_t1_port: - - 1c11_scalling_instance_1c1_t1_port - - feature scalable_1c11_scalling_instance: - 1c11_scalling_instance - scalable os_1c11_scalling_instance: - 1c11_scalling_instance - os - forwarder_1c11_scalling_instance_1c1_t1_port: - - 1c11_scalling_instance_1c1_t1_port - - forwarder - network.outpoing.packets_1c11_scalling_instance_1c1_t1_port: - - 1c11_scalling_instance_1c1_t1_port - - network.outpoing.packets + network.outgoing.packets.rate_1c11_scalling_instance_1c11_scalling_instance_t1_port_0: + - 1c11_scalling_instance_1c11_scalling_instance_t1_port_0 + - network.outgoing.packets.rate disk.ephemeral.size_1c11_scalling_instance: - 1c11_scalling_instance - disk.ephemeral.size @@ -258,36 +249,39 @@ topology_template: disk.device.write.bytes.rate_1c11_scalling_instance: - 1c11_scalling_instance - disk.device.write.bytes.rate + feature_1c11_scalling_instance_1c11_scalling_instance_t1_port_0: + - 1c11_scalling_instance_1c11_scalling_instance_t1_port_0 + - feature + network.incoming.packets_1c11_scalling_instance_1c11_scalling_instance_t1_port_0: + - 1c11_scalling_instance_1c11_scalling_instance_t1_port_0 + - network.incoming.packets cpu.delta_1c11_scalling_instance: - 1c11_scalling_instance - cpu.delta - network.outgoing.bytes_1c11_scalling_instance_1c1_t1_port: - - 1c11_scalling_instance_1c1_t1_port - - network.outgoing.bytes + attachment_1c11_scalling_instance_1c11_scalling_instance_t1_port_0: + - 1c11_scalling_instance_1c11_scalling_instance_t1_port_0 + - attachment disk.device.write.requests_1c11_scalling_instance: - 1c11_scalling_instance - disk.device.write.requests - network.incoming.bytes.rate_1c11_scalling_instance_1c1_t1_port: - - 1c11_scalling_instance_1c1_t1_port - - network.incoming.bytes.rate disk.device.capacity_1c11_scalling_instance: - 1c11_scalling_instance - disk.device.capacity - binding_1c11_scalling_instance_1c1_t1_port: - - 1c11_scalling_instance_1c1_t1_port - - binding + network.outgoing.bytes.rate_1c11_scalling_instance_1c11_scalling_instance_t1_port_0: + - 1c11_scalling_instance_1c11_scalling_instance_t1_port_0 + - network.outgoing.bytes.rate + network.incoming.bytes_1c11_scalling_instance_1c11_scalling_instance_t1_port_0: + - 1c11_scalling_instance_1c11_scalling_instance_t1_port_0 + - network.incoming.bytes disk.write.bytes_1c11_scalling_instance: - 1c11_scalling_instance - disk.write.bytes disk.write.requests_1c11_scalling_instance: - 1c11_scalling_instance - disk.write.requests - network.incoming.bytes_1c11_scalling_instance_1c1_t1_port: - - 1c11_scalling_instance_1c1_t1_port - - network.incoming.bytes - network.outgoing.bytes.rate_1c11_scalling_instance_1c1_t1_port: - - 1c11_scalling_instance_1c1_t1_port - - network.outgoing.bytes.rate + forwarder_1c11_scalling_instance_1c11_scalling_instance_t1_port_0: + - 1c11_scalling_instance_1c11_scalling_instance_t1_port_0 + - forwarder disk.device.read.requests_1c11_scalling_instance: - 1c11_scalling_instance - disk.device.read.requests @@ -303,6 +297,9 @@ topology_template: instance_1c11_scalling_instance: - 1c11_scalling_instance - instance + network.incoming.bytes.rate_1c11_scalling_instance_1c11_scalling_instance_t1_port_0: + - 1c11_scalling_instance_1c11_scalling_instance_t1_port_0 + - network.incoming.bytes.rate disk.read.requests_1c11_scalling_instance: - 1c11_scalling_instance - disk.read.requests @@ -312,9 +309,6 @@ topology_template: memory.resident_1c11_scalling_instance: - 1c11_scalling_instance - memory.resident - attachment_1c11_scalling_instance_1c1_t1_port: - - 1c11_scalling_instance_1c1_t1_port - - attachment disk.write.requests.rate_1c11_scalling_instance: - 1c11_scalling_instance - disk.write.requests.rate @@ -324,9 +318,15 @@ topology_template: disk.device.write.requests.rate_1c11_scalling_instance: - 1c11_scalling_instance - disk.device.write.requests.rate + network.outgoing.bytes_1c11_scalling_instance_1c11_scalling_instance_t1_port_0: + - 1c11_scalling_instance_1c11_scalling_instance_t1_port_0 + - network.outgoing.bytes disk.device.latency_1c11_scalling_instance: - 1c11_scalling_instance - disk.device.latency + network.outpoing.packets_1c11_scalling_instance_1c11_scalling_instance_t1_port_0: + - 1c11_scalling_instance_1c11_scalling_instance_t1_port_0 + - network.outpoing.packets disk.iops_1c11_scalling_instance: - 1c11_scalling_instance - disk.iops @@ -334,12 +334,12 @@ topology_template: local_storage_1c11_scalling_instance: - 1c11_scalling_instance - local_storage - dependency_1c11_scalling_instance_1c1_t1_port: - - 1c11_scalling_instance_1c1_t1_port - - dependency - link_1c11_scalling_instance_1c1_t1_port: - - 1c11_scalling_instance_1c1_t1_port + link_1c11_scalling_instance_1c11_scalling_instance_t1_port_0: + - 1c11_scalling_instance_1c11_scalling_instance_t1_port_0 - link + dependency_1c11_scalling_instance_1c11_scalling_instance_t1_port_0: + - 1c11_scalling_instance_1c11_scalling_instance_t1_port_0 + - dependency dependency_1c11_scalling_instance: - 1c11_scalling_instance - dependency
\ No newline at end of file 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 31686e862a..83fd91196d 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 @@ -11,31 +11,18 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_1c1_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true compute_1c12_scalling_instance_scheduler_hints: type: list required: true entry_schema: type: json - port_1c1_t1_port_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps compute_1c12_scalling_instance_name: type: list required: true entry_schema: type: string - port_1c1_t1_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1c1_t1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_1c12_scalling_instance_t1_port_0_network_role: + type: string required: true index_value: type: integer @@ -44,6 +31,9 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_1c12_scalling_instance_t1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true vm_flavor_name: type: string required: true @@ -52,115 +42,125 @@ topology_template: required: true entry_schema: type: string - port_1c1_t1_port_related_networks: + port_1c12_scalling_instance_t1_port_0_name: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1c1_t1_port_ip_requirements: + type: string + port_1c12_scalling_instance_t1_port_0_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_1c12_scalling_instance_t1_port_0_network_role_tag: + type: string + required: true + port_1c12_scalling_instance_t1_port_0_subnetpoolid: type: string required: true - port_1c1_t1_port_name: + port_1c12_scalling_instance_t1_port_0_network: type: list required: true entry_schema: type: string - port_1c1_t1_port_subnetpoolid: + vm_image_name: type: string required: true - port_1c1_t1_port_network_role_tag: - type: string + port_1c12_scalling_instance_t1_port_0_ip_requirements: + type: list required: true - port_1c1_t1_port_network_role: - type: string + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_1c12_scalling_instance_t1_port_0_vlan_requirements: + type: list required: true - compute_1c12_scalling_instance_availability_zone: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_1c12_scalling_instance_t1_port_0_order: + type: integer + required: true + port_1c12_scalling_instance_t1_port_0_fixed_ips: type: list required: true entry_schema: - type: string - port_1c1_t1_port_network: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + compute_1c12_scalling_instance_availability_zone: type: list required: true entry_schema: type: string - port_1c1_t1_port_order: - type: integer + port_1c12_scalling_instance_t1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true node_templates: - 1c12_scalling_instance_1c1_t1_port: + 1c12_scalling_instance: + type: org.openecomp.resource.vfc.compute.nodes.heat.1c12_scalling_instance + properties: + availability_zone: + get_input: + - compute_1c12_scalling_instance_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + image: + get_input: vm_image_name + name: + get_input: + - compute_1c12_scalling_instance_name + - index_value + scheduler_hints: + get_input: + - compute_1c12_scalling_instance_scheduler_hints + - index_value + user_data_format: + get_input: + - compute_1c12_scalling_instance_user_data_format + - index_value + 1c12_scalling_instance_1c12_scalling_instance_t1_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_1c1_t1_port_mac_requirements + get_input: port_1c12_scalling_instance_t1_port_0_mac_requirements order: - get_input: port_1c1_t1_port_order + get_input: port_1c12_scalling_instance_t1_port_0_order exCP_naming: - get_input: port_1c1_t1_port_exCP_naming + get_input: port_1c12_scalling_instance_t1_port_0_exCP_naming vlan_requirements: - get_input: port_1c1_t1_port_vlan_requirements + get_input: port_1c12_scalling_instance_t1_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_1c1_t1_port_ip_requirements + get_input: port_1c12_scalling_instance_t1_port_0_ip_requirements related_networks: - get_input: port_1c1_t1_port_related_networks + get_input: port_1c12_scalling_instance_t1_port_0_related_networks network_role_tag: - get_input: port_1c1_t1_port_network_role_tag + get_input: port_1c12_scalling_instance_t1_port_0_network_role_tag network_role: - get_input: port_1c1_t1_port_network_role + get_input: port_1c12_scalling_instance_t1_port_0_network_role fixed_ips: get_input: - - port_1c1_t1_port_fixed_ips + - port_1c12_scalling_instance_t1_port_0_fixed_ips - index_value subnetpoolid: - get_input: port_1c1_t1_port_subnetpoolid + get_input: port_1c12_scalling_instance_t1_port_0_subnetpoolid name: get_input: - - port_1c1_t1_port_name + - port_1c12_scalling_instance_t1_port_0_name - index_value network: get_input: - - port_1c1_t1_port_network + - port_1c12_scalling_instance_t1_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: 1c12_scalling_instance relationship: tosca.relationships.network.BindsTo - 1c12_scalling_instance: - type: org.openecomp.resource.vfc.compute.nodes.heat.1c12_scalling_instance - properties: - availability_zone: - get_input: - - compute_1c12_scalling_instance_availability_zone - - index_value - flavor: - get_input: vm_flavor_name - image: - get_input: vm_image_name - name: - get_input: - - compute_1c12_scalling_instance_name - - index_value - scheduler_hints: - get_input: - - compute_1c12_scalling_instance_scheduler_hints - - index_value - user_data_format: - get_input: - - compute_1c12_scalling_instance_user_data_format - - index_value outputs: - 1c12_scalling_instance_1c1_t1_port_tenant_id: + 1c12_scalling_instance_1c12_scalling_instance_t1_port_0_tenant_id: type: string value: get_attribute: - - 1c12_scalling_instance_1c1_t1_port + - 1c12_scalling_instance_1c12_scalling_instance_t1_port_0 - tenant_id 1c12_scalling_instance_instance_name: type: string @@ -171,33 +171,33 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.1c12_scalling_instance capabilities: + network.incoming.packets_1c12_scalling_instance_1c12_scalling_instance_t1_port_0: + - 1c12_scalling_instance_1c12_scalling_instance_t1_port_0 + - network.incoming.packets cpu_1c12_scalling_instance: - 1c12_scalling_instance - cpu + attachment_1c12_scalling_instance_1c12_scalling_instance_t1_port_0: + - 1c12_scalling_instance_1c12_scalling_instance_t1_port_0 + - attachment disk.device.write.bytes_1c12_scalling_instance: - 1c12_scalling_instance - disk.device.write.bytes - network.incoming.bytes.rate_1c12_scalling_instance_1c1_t1_port: - - 1c12_scalling_instance_1c1_t1_port - - network.incoming.bytes.rate disk.usage_1c12_scalling_instance: - 1c12_scalling_instance - disk.usage disk.device.read.requests_1c12_scalling_instance: - 1c12_scalling_instance - disk.device.read.requests - feature_1c12_scalling_instance_1c1_t1_port: - - 1c12_scalling_instance_1c1_t1_port - - feature - forwarder_1c12_scalling_instance_1c1_t1_port: - - 1c12_scalling_instance_1c1_t1_port - - forwarder + network.outgoing.bytes.rate_1c12_scalling_instance_1c12_scalling_instance_t1_port_0: + - 1c12_scalling_instance_1c12_scalling_instance_t1_port_0 + - network.outgoing.bytes.rate disk.device.latency_1c12_scalling_instance: - 1c12_scalling_instance - disk.device.latency - network.outgoing.bytes_1c12_scalling_instance_1c1_t1_port: - - 1c12_scalling_instance_1c1_t1_port - - network.outgoing.bytes + network.incoming.bytes_1c12_scalling_instance_1c12_scalling_instance_t1_port_0: + - 1c12_scalling_instance_1c12_scalling_instance_t1_port_0 + - network.incoming.bytes cpu_util_1c12_scalling_instance: - 1c12_scalling_instance - cpu_util @@ -216,27 +216,27 @@ topology_template: os_1c12_scalling_instance: - 1c12_scalling_instance - os + feature_1c12_scalling_instance_1c12_scalling_instance_t1_port_0: + - 1c12_scalling_instance_1c12_scalling_instance_t1_port_0 + - feature disk.device.usage_1c12_scalling_instance: - 1c12_scalling_instance - disk.device.usage disk.device.allocation_1c12_scalling_instance: - 1c12_scalling_instance - disk.device.allocation - binding_1c12_scalling_instance_1c1_t1_port: - - 1c12_scalling_instance_1c1_t1_port + binding_1c12_scalling_instance_1c12_scalling_instance_t1_port_0: + - 1c12_scalling_instance_1c12_scalling_instance_t1_port_0 - binding - network.incoming.packets_1c12_scalling_instance_1c1_t1_port: - - 1c12_scalling_instance_1c1_t1_port - - network.incoming.packets - attachment_1c12_scalling_instance_1c1_t1_port: - - 1c12_scalling_instance_1c1_t1_port - - attachment + network.incoming.packets.rate_1c12_scalling_instance_1c12_scalling_instance_t1_port_0: + - 1c12_scalling_instance_1c12_scalling_instance_t1_port_0 + - network.incoming.packets.rate + network.outgoing.packets.rate_1c12_scalling_instance_1c12_scalling_instance_t1_port_0: + - 1c12_scalling_instance_1c12_scalling_instance_t1_port_0 + - network.outgoing.packets.rate disk.latency_1c12_scalling_instance: - 1c12_scalling_instance - disk.latency - network.incoming.bytes_1c12_scalling_instance_1c1_t1_port: - - 1c12_scalling_instance_1c1_t1_port - - network.incoming.bytes memory_1c12_scalling_instance: - 1c12_scalling_instance - memory @@ -258,12 +258,12 @@ topology_template: disk.write.bytes.rate_1c12_scalling_instance: - 1c12_scalling_instance - disk.write.bytes.rate + network.outpoing.packets_1c12_scalling_instance_1c12_scalling_instance_t1_port_0: + - 1c12_scalling_instance_1c12_scalling_instance_t1_port_0 + - network.outpoing.packets disk.write.requests_1c12_scalling_instance: - 1c12_scalling_instance - disk.write.requests - network.outgoing.bytes.rate_1c12_scalling_instance_1c1_t1_port: - - 1c12_scalling_instance_1c1_t1_port - - network.outgoing.bytes.rate disk.ephemeral.size_1c12_scalling_instance: - 1c12_scalling_instance - disk.ephemeral.size @@ -297,27 +297,27 @@ topology_template: vcpus_1c12_scalling_instance: - 1c12_scalling_instance - vcpus - network.incoming.packets.rate_1c12_scalling_instance_1c1_t1_port: - - 1c12_scalling_instance_1c1_t1_port - - network.incoming.packets.rate disk.device.write.requests.rate_1c12_scalling_instance: - 1c12_scalling_instance - disk.device.write.requests.rate - network.outgoing.packets.rate_1c12_scalling_instance_1c1_t1_port: - - 1c12_scalling_instance_1c1_t1_port - - network.outgoing.packets.rate disk.device.write.requests_1c12_scalling_instance: - 1c12_scalling_instance - disk.device.write.requests - network.outpoing.packets_1c12_scalling_instance_1c1_t1_port: - - 1c12_scalling_instance_1c1_t1_port - - network.outpoing.packets + forwarder_1c12_scalling_instance_1c12_scalling_instance_t1_port_0: + - 1c12_scalling_instance_1c12_scalling_instance_t1_port_0 + - forwarder disk.allocation_1c12_scalling_instance: - 1c12_scalling_instance - disk.allocation + network.incoming.bytes.rate_1c12_scalling_instance_1c12_scalling_instance_t1_port_0: + - 1c12_scalling_instance_1c12_scalling_instance_t1_port_0 + - network.incoming.bytes.rate disk.root.size_1c12_scalling_instance: - 1c12_scalling_instance - disk.root.size + network.outgoing.bytes_1c12_scalling_instance_1c12_scalling_instance_t1_port_0: + - 1c12_scalling_instance_1c12_scalling_instance_t1_port_0 + - network.outgoing.bytes disk.capacity_1c12_scalling_instance: - 1c12_scalling_instance - disk.capacity @@ -331,8 +331,8 @@ topology_template: - 1c12_scalling_instance - memory.usage requirements: - dependency_1c12_scalling_instance_1c1_t1_port: - - 1c12_scalling_instance_1c1_t1_port + dependency_1c12_scalling_instance_1c12_scalling_instance_t1_port_0: + - 1c12_scalling_instance_1c12_scalling_instance_t1_port_0 - dependency local_storage_1c12_scalling_instance: - 1c12_scalling_instance @@ -340,6 +340,6 @@ topology_template: dependency_1c12_scalling_instance: - 1c12_scalling_instance - dependency - link_1c12_scalling_instance_1c1_t1_port: - - 1c12_scalling_instance_1c1_t1_port + link_1c12_scalling_instance_1c12_scalling_instance_t1_port_0: + - 1c12_scalling_instance_1c12_scalling_instance_t1_port_0 - link
\ No newline at end of file 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_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_1c2_catalog_instanceServiceTemplate.yaml index 6271474b83..57da03d117 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_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_1c2_catalog_instanceServiceTemplate.yaml @@ -11,58 +11,65 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_1c2_catalog_instance_201_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_1c2_catalog_instance_202_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true compute_1c2_catalog_instance_availability_zone: type: list required: true entry_schema: type: string - port_1c201_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements vm_flavor_name: type: string required: true + port_1c2_catalog_instance_202_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements compute_1c2_catalog_instance_personality: type: list required: true entry_schema: type: json - port_2c202_port_subnetpoolid: - type: string + port_1c2_catalog_instance_201_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_2c202_port_ip_requirements: + port_1c2_catalog_instance_202_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_1c201_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_2c202_port_network_role_tag: + type: string + vm_image_name: type: string required: true - port_2c202_port_network_role: - type: string + port_1c2_catalog_instance_202_port_0_vlan_requirements: + type: list required: true - vm_image_name: - type: string + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_1c2_catalog_instance_202_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_2c202_port_order: - type: integer + port_1c2_catalog_instance_201_port_0_vlan_requirements: + type: list required: true - port_1c201_port_network_role_tag: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_1c2_catalog_instance_201_port_0_network_role_tag: type: string required: true - port_1c201_port_order: - type: integer + port_1c2_catalog_instance_201_port_0_network_role: + type: string required: true - port_2c202_port_vlan_requirements: + port_1c2_catalog_instance_201_port_0_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -75,51 +82,44 @@ topology_template: required: true entry_schema: type: string - port_2c202_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_1c2_catalog_instance_201_port_0_order: + type: integer required: true - port_2c202_port_network: - type: list + port_1c2_catalog_instance_202_port_0_order: + type: integer required: true - entry_schema: - type: string - port_1c201_port_ip_requirements: + port_1c2_catalog_instance_201_port_0_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_1c201_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_2c202_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_1c2_catalog_instance_201_port_0_subnetpoolid: + type: string required: true - port_1c201_port_subnetpoolid: + port_1c2_catalog_instance_202_port_0_network_role_tag: type: string required: true - port_1c201_port_related_networks: + port_1c2_catalog_instance_202_port_0_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_2c202_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1c201_port_network_role: + port_1c2_catalog_instance_202_port_0_subnetpoolid: type: string required: true - compute_1c2_catalog_instance_user_data_format: + port_1c2_catalog_instance_201_port_0_network: type: list required: true entry_schema: type: string - port_1c201_port_network: + compute_1c2_catalog_instance_user_data_format: type: list required: true entry_schema: type: string + port_1c2_catalog_instance_202_port_0_network_role: + type: string + required: true compute_1c2_catalog_instance_scheduler_hints: type: list required: true @@ -143,7 +143,7 @@ topology_template: get_input: vm_image_name diskConfig: get_attribute: - - 1c2_catalog_instance_1c201_port + - 1c2_catalog_instance_1c2_catalog_instance_201_port_0 - tenant_id name: get_input: @@ -157,62 +157,62 @@ topology_template: get_input: - compute_1c2_catalog_instance_user_data_format - index_value - 1c2_catalog_instance_1c201_port: + 1c2_catalog_instance_1c2_catalog_instance_202_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_1c201_port_exCP_naming + get_input: port_1c2_catalog_instance_202_port_0_exCP_naming vlan_requirements: - get_input: port_1c201_port_vlan_requirements + get_input: port_1c2_catalog_instance_202_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_1c201_port_related_networks + get_input: port_1c2_catalog_instance_202_port_0_related_networks ip_requirements: - get_input: port_1c201_port_ip_requirements + get_input: port_1c2_catalog_instance_202_port_0_ip_requirements network_role_tag: - get_input: port_1c201_port_network_role_tag + get_input: port_1c2_catalog_instance_202_port_0_network_role_tag mac_requirements: - get_input: port_1c201_port_mac_requirements + get_input: port_1c2_catalog_instance_202_port_0_mac_requirements order: - get_input: port_1c201_port_order + get_input: port_1c2_catalog_instance_202_port_0_order network_role: - get_input: port_1c201_port_network_role + get_input: port_1c2_catalog_instance_202_port_0_network_role subnetpoolid: - get_input: port_1c201_port_subnetpoolid + get_input: port_1c2_catalog_instance_202_port_0_subnetpoolid network: get_input: - - port_1c201_port_network + - port_1c2_catalog_instance_202_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: 1c2_catalog_instance relationship: tosca.relationships.network.BindsTo - 1c2_catalog_instance_2c202_port: + 1c2_catalog_instance_1c2_catalog_instance_201_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_2c202_port_exCP_naming + get_input: port_1c2_catalog_instance_201_port_0_exCP_naming vlan_requirements: - get_input: port_2c202_port_vlan_requirements + get_input: port_1c2_catalog_instance_201_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_2c202_port_related_networks + get_input: port_1c2_catalog_instance_201_port_0_related_networks ip_requirements: - get_input: port_2c202_port_ip_requirements + get_input: port_1c2_catalog_instance_201_port_0_ip_requirements network_role_tag: - get_input: port_2c202_port_network_role_tag + get_input: port_1c2_catalog_instance_201_port_0_network_role_tag mac_requirements: - get_input: port_2c202_port_mac_requirements + get_input: port_1c2_catalog_instance_201_port_0_mac_requirements order: - get_input: port_2c202_port_order + get_input: port_1c2_catalog_instance_201_port_0_order network_role: - get_input: port_2c202_port_network_role + get_input: port_1c2_catalog_instance_201_port_0_network_role subnetpoolid: - get_input: port_2c202_port_subnetpoolid + get_input: port_1c2_catalog_instance_201_port_0_subnetpoolid network: get_input: - - port_2c202_port_network + - port_1c2_catalog_instance_201_port_0_network - index_value requirements: - binding: @@ -226,60 +226,66 @@ topology_template: get_attribute: - 1c2_catalog_instance - instance_name - 1c2_catalog_instance_1c201_port_tenant_id: + 1c2_catalog_instance_1c2_catalog_instance_201_port_0_tenant_id: type: string value: get_attribute: - - 1c2_catalog_instance_1c201_port + - 1c2_catalog_instance_1c2_catalog_instance_201_port_0 - tenant_id substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.1c2_catalog_instance capabilities: + network.outgoing.packets.rate_1c2_catalog_instance_1c2_catalog_instance_202_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_202_port_0 + - network.outgoing.packets.rate disk.device.capacity_1c2_catalog_instance: - 1c2_catalog_instance - disk.device.capacity - attachment_1c2_catalog_instance_2c202_port: - - 1c2_catalog_instance_2c202_port - - attachment - network.incoming.bytes.rate_1c2_catalog_instance_2c202_port: - - 1c2_catalog_instance_2c202_port - - network.incoming.bytes.rate - network.incoming.packets_1c2_catalog_instance_2c202_port: - - 1c2_catalog_instance_2c202_port - - network.incoming.packets - network.incoming.packets.rate_1c2_catalog_instance_1c201_port: - - 1c2_catalog_instance_1c201_port - - network.incoming.packets.rate disk.read.bytes.rate_1c2_catalog_instance: - 1c2_catalog_instance - disk.read.bytes.rate - network.incoming.bytes_1c2_catalog_instance_1c201_port: - - 1c2_catalog_instance_1c201_port - - network.incoming.bytes + network.incoming.bytes.rate_1c2_catalog_instance_1c2_catalog_instance_202_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_202_port_0 + - network.incoming.bytes.rate + network.incoming.bytes.rate_1c2_catalog_instance_1c2_catalog_instance_201_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_201_port_0 + - network.incoming.bytes.rate memory.usage_1c2_catalog_instance: - 1c2_catalog_instance - memory.usage - binding_1c2_catalog_instance_1c201_port: - - 1c2_catalog_instance_1c201_port - - binding - forwarder_1c2_catalog_instance_1c201_port: - - 1c2_catalog_instance_1c201_port - - forwarder disk.write.bytes.rate_1c2_catalog_instance: - 1c2_catalog_instance - disk.write.bytes.rate + network.outgoing.packets.rate_1c2_catalog_instance_1c2_catalog_instance_201_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_201_port_0 + - network.outgoing.packets.rate + network.outpoing.packets_1c2_catalog_instance_1c2_catalog_instance_202_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_202_port_0 + - network.outpoing.packets + network.incoming.bytes_1c2_catalog_instance_1c2_catalog_instance_202_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_202_port_0 + - network.incoming.bytes + network.incoming.packets.rate_1c2_catalog_instance_1c2_catalog_instance_201_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_201_port_0 + - network.incoming.packets.rate cpu_util_1c2_catalog_instance: - 1c2_catalog_instance - cpu_util + network.outpoing.packets_1c2_catalog_instance_1c2_catalog_instance_201_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_201_port_0 + - network.outpoing.packets + network.incoming.bytes_1c2_catalog_instance_1c2_catalog_instance_201_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_201_port_0 + - network.incoming.bytes + network.incoming.packets.rate_1c2_catalog_instance_1c2_catalog_instance_202_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_202_port_0 + - network.incoming.packets.rate cpu_1c2_catalog_instance: - 1c2_catalog_instance - cpu disk.read.requests_1c2_catalog_instance: - 1c2_catalog_instance - disk.read.requests - network.outpoing.packets_1c2_catalog_instance_1c201_port: - - 1c2_catalog_instance_1c201_port - - network.outpoing.packets disk.ephemeral.size_1c2_catalog_instance: - 1c2_catalog_instance - disk.ephemeral.size @@ -292,18 +298,18 @@ topology_template: disk.device.write.requests.rate_1c2_catalog_instance: - 1c2_catalog_instance - disk.device.write.requests.rate + forwarder_1c2_catalog_instance_1c2_catalog_instance_202_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_202_port_0 + - forwarder os_1c2_catalog_instance: - 1c2_catalog_instance - os disk.device.iops_1c2_catalog_instance: - 1c2_catalog_instance - disk.device.iops - feature_1c2_catalog_instance_2c202_port: - - 1c2_catalog_instance_2c202_port - - feature - network.outgoing.packets.rate_1c2_catalog_instance_2c202_port: - - 1c2_catalog_instance_2c202_port - - network.outgoing.packets.rate + network.outgoing.bytes.rate_1c2_catalog_instance_1c2_catalog_instance_202_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_202_port_0 + - network.outgoing.bytes.rate endpoint_1c2_catalog_instance: - 1c2_catalog_instance - endpoint @@ -313,33 +319,27 @@ topology_template: disk.latency_1c2_catalog_instance: - 1c2_catalog_instance - disk.latency - network.outgoing.bytes.rate_1c2_catalog_instance_2c202_port: - - 1c2_catalog_instance_2c202_port - - network.outgoing.bytes.rate disk.iops_1c2_catalog_instance: - 1c2_catalog_instance - disk.iops - binding_1c2_catalog_instance_2c202_port: - - 1c2_catalog_instance_2c202_port - - binding + attachment_1c2_catalog_instance_1c2_catalog_instance_201_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_201_port_0 + - attachment vcpus_1c2_catalog_instance: - 1c2_catalog_instance - vcpus disk.device.latency_1c2_catalog_instance: - 1c2_catalog_instance - disk.device.latency - network.outgoing.bytes_1c2_catalog_instance_1c201_port: - - 1c2_catalog_instance_1c201_port + feature_1c2_catalog_instance_1c2_catalog_instance_202_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_202_port_0 + - feature + binding_1c2_catalog_instance_1c2_catalog_instance_201_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_201_port_0 + - binding + network.outgoing.bytes_1c2_catalog_instance_1c2_catalog_instance_202_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_202_port_0 - network.outgoing.bytes - attachment_1c2_catalog_instance_1c201_port: - - 1c2_catalog_instance_1c201_port - - attachment - network.incoming.bytes.rate_1c2_catalog_instance_1c201_port: - - 1c2_catalog_instance_1c201_port - - network.incoming.bytes.rate - network.incoming.packets_1c2_catalog_instance_1c201_port: - - 1c2_catalog_instance_1c201_port - - network.incoming.packets disk.read.bytes_1c2_catalog_instance: - 1c2_catalog_instance - disk.read.bytes @@ -355,15 +355,9 @@ topology_template: disk.device.read.bytes.rate_1c2_catalog_instance: - 1c2_catalog_instance - disk.device.read.bytes.rate - network.incoming.bytes_1c2_catalog_instance_2c202_port: - - 1c2_catalog_instance_2c202_port - - network.incoming.bytes disk.device.allocation_1c2_catalog_instance: - 1c2_catalog_instance - disk.device.allocation - forwarder_1c2_catalog_instance_2c202_port: - - 1c2_catalog_instance_2c202_port - - forwarder disk.device.read.bytes_1c2_catalog_instance: - 1c2_catalog_instance - disk.device.read.bytes @@ -385,21 +379,21 @@ topology_template: disk.root.size_1c2_catalog_instance: - 1c2_catalog_instance - disk.root.size - feature_1c2_catalog_instance_1c201_port: - - 1c2_catalog_instance_1c201_port - - feature - network.outpoing.packets_1c2_catalog_instance_2c202_port: - - 1c2_catalog_instance_2c202_port - - network.outpoing.packets - network.incoming.packets.rate_1c2_catalog_instance_2c202_port: - - 1c2_catalog_instance_2c202_port - - network.incoming.packets.rate + network.incoming.packets_1c2_catalog_instance_1c2_catalog_instance_201_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_201_port_0 + - network.incoming.packets + network.incoming.packets_1c2_catalog_instance_1c2_catalog_instance_202_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_202_port_0 + - network.incoming.packets + forwarder_1c2_catalog_instance_1c2_catalog_instance_201_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_201_port_0 + - forwarder disk.device.usage_1c2_catalog_instance: - 1c2_catalog_instance - disk.device.usage - network.outgoing.packets.rate_1c2_catalog_instance_1c201_port: - - 1c2_catalog_instance_1c201_port - - network.outgoing.packets.rate + network.outgoing.bytes.rate_1c2_catalog_instance_1c2_catalog_instance_201_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_201_port_0 + - network.outgoing.bytes.rate disk.usage_1c2_catalog_instance: - 1c2_catalog_instance - disk.usage @@ -409,43 +403,49 @@ topology_template: memory_1c2_catalog_instance: - 1c2_catalog_instance - memory - network.outgoing.bytes.rate_1c2_catalog_instance_1c201_port: - - 1c2_catalog_instance_1c201_port - - network.outgoing.bytes.rate disk.write.requests.rate_1c2_catalog_instance: - 1c2_catalog_instance - disk.write.requests.rate disk.write.requests_1c2_catalog_instance: - 1c2_catalog_instance - disk.write.requests + binding_1c2_catalog_instance_1c2_catalog_instance_202_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_202_port_0 + - binding + attachment_1c2_catalog_instance_1c2_catalog_instance_202_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_202_port_0 + - attachment binding_1c2_catalog_instance: - 1c2_catalog_instance - binding cpu.delta_1c2_catalog_instance: - 1c2_catalog_instance - cpu.delta - network.outgoing.bytes_1c2_catalog_instance_2c202_port: - - 1c2_catalog_instance_2c202_port - - network.outgoing.bytes disk.device.read.requests.rate_1c2_catalog_instance: - 1c2_catalog_instance - disk.device.read.requests.rate + feature_1c2_catalog_instance_1c2_catalog_instance_201_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_201_port_0 + - feature + network.outgoing.bytes_1c2_catalog_instance_1c2_catalog_instance_201_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_201_port_0 + - network.outgoing.bytes requirements: - dependency_1c2_catalog_instance_2c202_port: - - 1c2_catalog_instance_2c202_port - - dependency + link_1c2_catalog_instance_1c2_catalog_instance_202_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_202_port_0 + - link dependency_1c2_catalog_instance: - 1c2_catalog_instance - dependency local_storage_1c2_catalog_instance: - 1c2_catalog_instance - local_storage - link_1c2_catalog_instance_1c201_port: - - 1c2_catalog_instance_1c201_port - - link - link_1c2_catalog_instance_2c202_port: - - 1c2_catalog_instance_2c202_port - - link - dependency_1c2_catalog_instance_1c201_port: - - 1c2_catalog_instance_1c201_port - - dependency
\ No newline at end of file + dependency_1c2_catalog_instance_1c2_catalog_instance_202_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_202_port_0 + - dependency + dependency_1c2_catalog_instance_1c2_catalog_instance_201_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_201_port_0 + - dependency + link_1c2_catalog_instance_1c2_catalog_instance_201_port_0: + - 1c2_catalog_instance_1c2_catalog_instance_201_port_0 + - link
\ No newline at end of file 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_2c2_catalog_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_2c2_catalog_instanceServiceTemplate.yaml index 5b15894873..b4947b13ba 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_2c2_catalog_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_2c2_catalog_instanceServiceTemplate.yaml @@ -11,43 +11,55 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_2c2_catalog_instance_201_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true compute_2c2_catalog_instance_user_data_format: type: list required: true entry_schema: type: string - port_1c201_port_vlan_requirements: + port_2c2_catalog_instance_202_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_2c2_catalog_instance_202_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_2c2_catalog_instance_201_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - vm_flavor_name: + port_2c2_catalog_instance_202_port_0_network_role_tag: type: string required: true - port_2c202_port_subnetpoolid: + vm_flavor_name: type: string required: true - port_2c202_port_ip_requirements: + port_2c2_catalog_instance_202_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_1c201_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_2c202_port_network_role_tag: + type: string + port_2c2_catalog_instance_202_port_0_network_role: type: string required: true - port_2c202_port_network_role: + port_2c2_catalog_instance_202_port_0_subnetpoolid: type: string required: true - vm_image_name: - type: string + port_2c2_catalog_instance_202_port_0_ip_requirements: + type: list required: true - port_2c202_port_order: - type: integer + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_2c2_catalog_instance_201_port_0_ip_requirements: + type: list required: true - port_1c201_port_network_role_tag: + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + vm_image_name: type: string required: true compute_2c2_catalog_instance_scheduler_hints: @@ -60,14 +72,17 @@ topology_template: required: true entry_schema: type: string - port_1c201_port_order: - type: integer + port_2c2_catalog_instance_201_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_2c202_port_vlan_requirements: + port_2c2_catalog_instance_202_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_2c2_catalog_instance_201_port_0_subnetpoolid: + type: string + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -75,47 +90,32 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - compute_2c2_catalog_instance_name: - type: list - required: true - entry_schema: - type: string - port_2c202_port_mac_requirements: + port_2c2_catalog_instance_202_port_0_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_2c202_port_network: + compute_2c2_catalog_instance_name: type: list required: true entry_schema: type: string - port_1c201_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_1c201_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_2c202_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_2c2_catalog_instance_201_port_0_network_role_tag: + type: string required: true - port_1c201_port_subnetpoolid: + port_2c2_catalog_instance_201_port_0_network_role: type: string required: true - port_1c201_port_related_networks: + port_2c2_catalog_instance_201_port_0_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_2c202_port_related_networks: - type: list + port_2c2_catalog_instance_202_port_0_order: + type: integer required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1c201_port_network_role: - type: string + port_2c2_catalog_instance_201_port_0_order: + type: integer required: true - port_1c201_port_network: + port_2c2_catalog_instance_201_port_0_network: type: list required: true entry_schema: @@ -144,62 +144,62 @@ topology_template: get_input: - compute_2c2_catalog_instance_user_data_format - index_value - 2c2_catalog_instance_2c202_port: + 2c2_catalog_instance_2c2_catalog_instance_202_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_2c202_port_exCP_naming + get_input: port_2c2_catalog_instance_202_port_0_exCP_naming vlan_requirements: - get_input: port_2c202_port_vlan_requirements + get_input: port_2c2_catalog_instance_202_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_2c202_port_related_networks + get_input: port_2c2_catalog_instance_202_port_0_related_networks ip_requirements: - get_input: port_2c202_port_ip_requirements + get_input: port_2c2_catalog_instance_202_port_0_ip_requirements network_role_tag: - get_input: port_2c202_port_network_role_tag + get_input: port_2c2_catalog_instance_202_port_0_network_role_tag mac_requirements: - get_input: port_2c202_port_mac_requirements + get_input: port_2c2_catalog_instance_202_port_0_mac_requirements order: - get_input: port_2c202_port_order + get_input: port_2c2_catalog_instance_202_port_0_order network_role: - get_input: port_2c202_port_network_role + get_input: port_2c2_catalog_instance_202_port_0_network_role subnetpoolid: - get_input: port_2c202_port_subnetpoolid + get_input: port_2c2_catalog_instance_202_port_0_subnetpoolid network: get_input: - - port_2c202_port_network + - port_2c2_catalog_instance_202_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: 2c2_catalog_instance relationship: tosca.relationships.network.BindsTo - 2c2_catalog_instance_1c201_port: + 2c2_catalog_instance_2c2_catalog_instance_201_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_1c201_port_exCP_naming + get_input: port_2c2_catalog_instance_201_port_0_exCP_naming vlan_requirements: - get_input: port_1c201_port_vlan_requirements + get_input: port_2c2_catalog_instance_201_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_1c201_port_related_networks + get_input: port_2c2_catalog_instance_201_port_0_related_networks ip_requirements: - get_input: port_1c201_port_ip_requirements + get_input: port_2c2_catalog_instance_201_port_0_ip_requirements network_role_tag: - get_input: port_1c201_port_network_role_tag + get_input: port_2c2_catalog_instance_201_port_0_network_role_tag mac_requirements: - get_input: port_1c201_port_mac_requirements + get_input: port_2c2_catalog_instance_201_port_0_mac_requirements order: - get_input: port_1c201_port_order + get_input: port_2c2_catalog_instance_201_port_0_order network_role: - get_input: port_1c201_port_network_role + get_input: port_2c2_catalog_instance_201_port_0_network_role subnetpoolid: - get_input: port_1c201_port_subnetpoolid + get_input: port_2c2_catalog_instance_201_port_0_subnetpoolid network: get_input: - - port_1c201_port_network + - port_2c2_catalog_instance_201_port_0_network - index_value requirements: - binding: @@ -216,9 +216,9 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.2c2_catalog_instance capabilities: - network.outgoing.packets.rate_2c2_catalog_instance_1c201_port: - - 2c2_catalog_instance_1c201_port - - network.outgoing.packets.rate + forwarder_2c2_catalog_instance_2c2_catalog_instance_201_port_0: + - 2c2_catalog_instance_2c2_catalog_instance_201_port_0 + - forwarder instance_2c2_catalog_instance: - 2c2_catalog_instance - instance @@ -228,6 +228,15 @@ topology_template: disk.capacity_2c2_catalog_instance: - 2c2_catalog_instance - disk.capacity + network.outgoing.bytes.rate_2c2_catalog_instance_2c2_catalog_instance_201_port_0: + - 2c2_catalog_instance_2c2_catalog_instance_201_port_0 + - network.outgoing.bytes.rate + forwarder_2c2_catalog_instance_2c2_catalog_instance_202_port_0: + - 2c2_catalog_instance_2c2_catalog_instance_202_port_0 + - forwarder + network.outgoing.bytes.rate_2c2_catalog_instance_2c2_catalog_instance_202_port_0: + - 2c2_catalog_instance_2c2_catalog_instance_202_port_0 + - network.outgoing.bytes.rate disk.device.read.bytes.rate_2c2_catalog_instance: - 2c2_catalog_instance - disk.device.read.bytes.rate @@ -246,84 +255,78 @@ topology_template: scalable_2c2_catalog_instance: - 2c2_catalog_instance - scalable + attachment_2c2_catalog_instance_2c2_catalog_instance_201_port_0: + - 2c2_catalog_instance_2c2_catalog_instance_201_port_0 + - attachment disk.device.read.requests_2c2_catalog_instance: - 2c2_catalog_instance - disk.device.read.requests - network.outgoing.bytes_2c2_catalog_instance_1c201_port: - - 2c2_catalog_instance_1c201_port - - network.outgoing.bytes + attachment_2c2_catalog_instance_2c2_catalog_instance_202_port_0: + - 2c2_catalog_instance_2c2_catalog_instance_202_port_0 + - attachment disk.root.size_2c2_catalog_instance: - 2c2_catalog_instance - disk.root.size disk.device.write.requests_2c2_catalog_instance: - 2c2_catalog_instance - disk.device.write.requests - forwarder_2c2_catalog_instance_2c202_port: - - 2c2_catalog_instance_2c202_port - - forwarder + feature_2c2_catalog_instance_2c2_catalog_instance_202_port_0: + - 2c2_catalog_instance_2c2_catalog_instance_202_port_0 + - feature host_2c2_catalog_instance: - 2c2_catalog_instance - host + feature_2c2_catalog_instance_2c2_catalog_instance_201_port_0: + - 2c2_catalog_instance_2c2_catalog_instance_201_port_0 + - feature disk.allocation_2c2_catalog_instance: - 2c2_catalog_instance - disk.allocation - binding_2c2_catalog_instance_1c201_port: - - 2c2_catalog_instance_1c201_port - - binding disk.device.write.requests.rate_2c2_catalog_instance: - 2c2_catalog_instance - disk.device.write.requests.rate + network.incoming.bytes.rate_2c2_catalog_instance_2c2_catalog_instance_202_port_0: + - 2c2_catalog_instance_2c2_catalog_instance_202_port_0 + - network.incoming.bytes.rate os_2c2_catalog_instance: - 2c2_catalog_instance - os - network.outpoing.packets_2c2_catalog_instance_2c202_port: - - 2c2_catalog_instance_2c202_port - - network.outpoing.packets disk.device.write.bytes.rate_2c2_catalog_instance: - 2c2_catalog_instance - disk.device.write.bytes.rate - network.outgoing.bytes.rate_2c2_catalog_instance_1c201_port: - - 2c2_catalog_instance_1c201_port - - network.outgoing.bytes.rate - network.incoming.packets.rate_2c2_catalog_instance_1c201_port: - - 2c2_catalog_instance_1c201_port - - network.incoming.packets.rate disk.latency_2c2_catalog_instance: - 2c2_catalog_instance - disk.latency + network.outgoing.packets.rate_2c2_catalog_instance_2c2_catalog_instance_202_port_0: + - 2c2_catalog_instance_2c2_catalog_instance_202_port_0 + - network.outgoing.packets.rate disk.iops_2c2_catalog_instance: - 2c2_catalog_instance - disk.iops + network.incoming.packets_2c2_catalog_instance_2c2_catalog_instance_202_port_0: + - 2c2_catalog_instance_2c2_catalog_instance_202_port_0 + - network.incoming.packets endpoint_2c2_catalog_instance: - 2c2_catalog_instance - endpoint vcpus_2c2_catalog_instance: - 2c2_catalog_instance - vcpus - network.incoming.bytes_2c2_catalog_instance_2c202_port: - - 2c2_catalog_instance_2c202_port + network.incoming.bytes_2c2_catalog_instance_2c2_catalog_instance_201_port_0: + - 2c2_catalog_instance_2c2_catalog_instance_201_port_0 - network.incoming.bytes - feature_2c2_catalog_instance_1c201_port: - - 2c2_catalog_instance_1c201_port - - feature - network.incoming.bytes.rate_2c2_catalog_instance_2c202_port: - - 2c2_catalog_instance_2c202_port - - network.incoming.bytes.rate + network.outpoing.packets_2c2_catalog_instance_2c2_catalog_instance_202_port_0: + - 2c2_catalog_instance_2c2_catalog_instance_202_port_0 + - network.outpoing.packets + network.incoming.packets.rate_2c2_catalog_instance_2c2_catalog_instance_202_port_0: + - 2c2_catalog_instance_2c2_catalog_instance_202_port_0 + - network.incoming.packets.rate disk.device.iops_2c2_catalog_instance: - 2c2_catalog_instance - disk.device.iops - attachment_2c2_catalog_instance_1c201_port: - - 2c2_catalog_instance_1c201_port - - attachment - network.incoming.packets_2c2_catalog_instance_1c201_port: - - 2c2_catalog_instance_1c201_port - - network.incoming.packets disk.device.latency_2c2_catalog_instance: - 2c2_catalog_instance - disk.device.latency - network.outgoing.packets.rate_2c2_catalog_instance_2c202_port: - - 2c2_catalog_instance_2c202_port - - network.outgoing.packets.rate disk.read.bytes.rate_2c2_catalog_instance: - 2c2_catalog_instance - disk.read.bytes.rate @@ -336,18 +339,21 @@ topology_template: disk.device.capacity_2c2_catalog_instance: - 2c2_catalog_instance - disk.device.capacity + binding_2c2_catalog_instance_2c2_catalog_instance_202_port_0: + - 2c2_catalog_instance_2c2_catalog_instance_202_port_0 + - binding disk.read.requests_2c2_catalog_instance: - 2c2_catalog_instance - disk.read.requests - network.outgoing.bytes_2c2_catalog_instance_2c202_port: - - 2c2_catalog_instance_2c202_port + network.outgoing.bytes_2c2_catalog_instance_2c2_catalog_instance_201_port_0: + - 2c2_catalog_instance_2c2_catalog_instance_201_port_0 - network.outgoing.bytes cpu_2c2_catalog_instance: - 2c2_catalog_instance - cpu - forwarder_2c2_catalog_instance_1c201_port: - - 2c2_catalog_instance_1c201_port - - forwarder + network.outgoing.bytes_2c2_catalog_instance_2c2_catalog_instance_202_port_0: + - 2c2_catalog_instance_2c2_catalog_instance_202_port_0 + - network.outgoing.bytes disk.ephemeral.size_2c2_catalog_instance: - 2c2_catalog_instance - disk.ephemeral.size @@ -357,57 +363,51 @@ topology_template: memory.resident_2c2_catalog_instance: - 2c2_catalog_instance - memory.resident + binding_2c2_catalog_instance_2c2_catalog_instance_201_port_0: + - 2c2_catalog_instance_2c2_catalog_instance_201_port_0 + - binding disk.device.usage_2c2_catalog_instance: - 2c2_catalog_instance - disk.device.usage - network.outgoing.bytes.rate_2c2_catalog_instance_2c202_port: - - 2c2_catalog_instance_2c202_port - - network.outgoing.bytes.rate - network.outpoing.packets_2c2_catalog_instance_1c201_port: - - 2c2_catalog_instance_1c201_port - - network.outpoing.packets + network.incoming.bytes.rate_2c2_catalog_instance_2c2_catalog_instance_201_port_0: + - 2c2_catalog_instance_2c2_catalog_instance_201_port_0 + - network.incoming.bytes.rate cpu_util_2c2_catalog_instance: - 2c2_catalog_instance - cpu_util - network.incoming.bytes.rate_2c2_catalog_instance_1c201_port: - - 2c2_catalog_instance_1c201_port - - network.incoming.bytes.rate disk.usage_2c2_catalog_instance: - 2c2_catalog_instance - disk.usage - binding_2c2_catalog_instance_2c202_port: - - 2c2_catalog_instance_2c202_port - - binding feature_2c2_catalog_instance: - 2c2_catalog_instance - feature + network.outgoing.packets.rate_2c2_catalog_instance_2c2_catalog_instance_201_port_0: + - 2c2_catalog_instance_2c2_catalog_instance_201_port_0 + - network.outgoing.packets.rate + network.outpoing.packets_2c2_catalog_instance_2c2_catalog_instance_201_port_0: + - 2c2_catalog_instance_2c2_catalog_instance_201_port_0 + - network.outpoing.packets disk.write.requests_2c2_catalog_instance: - 2c2_catalog_instance - disk.write.requests + network.incoming.packets_2c2_catalog_instance_2c2_catalog_instance_201_port_0: + - 2c2_catalog_instance_2c2_catalog_instance_201_port_0 + - network.incoming.packets + network.incoming.bytes_2c2_catalog_instance_2c2_catalog_instance_202_port_0: + - 2c2_catalog_instance_2c2_catalog_instance_202_port_0 + - network.incoming.bytes cpu.delta_2c2_catalog_instance: - 2c2_catalog_instance - cpu.delta - network.incoming.packets.rate_2c2_catalog_instance_2c202_port: - - 2c2_catalog_instance_2c202_port - - network.incoming.packets.rate binding_2c2_catalog_instance: - 2c2_catalog_instance - binding - attachment_2c2_catalog_instance_2c202_port: - - 2c2_catalog_instance_2c202_port - - attachment - network.incoming.packets_2c2_catalog_instance_2c202_port: - - 2c2_catalog_instance_2c202_port - - network.incoming.packets - feature_2c2_catalog_instance_2c202_port: - - 2c2_catalog_instance_2c202_port - - feature + network.incoming.packets.rate_2c2_catalog_instance_2c2_catalog_instance_201_port_0: + - 2c2_catalog_instance_2c2_catalog_instance_201_port_0 + - network.incoming.packets.rate memory_2c2_catalog_instance: - 2c2_catalog_instance - memory - network.incoming.bytes_2c2_catalog_instance_1c201_port: - - 2c2_catalog_instance_1c201_port - - network.incoming.bytes disk.device.read.requests.rate_2c2_catalog_instance: - 2c2_catalog_instance - disk.device.read.requests.rate @@ -415,18 +415,18 @@ topology_template: dependency_2c2_catalog_instance: - 2c2_catalog_instance - dependency - link_2c2_catalog_instance_1c201_port: - - 2c2_catalog_instance_1c201_port + link_2c2_catalog_instance_2c2_catalog_instance_202_port_0: + - 2c2_catalog_instance_2c2_catalog_instance_202_port_0 - link - dependency_2c2_catalog_instance_1c201_port: - - 2c2_catalog_instance_1c201_port + link_2c2_catalog_instance_2c2_catalog_instance_201_port_0: + - 2c2_catalog_instance_2c2_catalog_instance_201_port_0 + - link + dependency_2c2_catalog_instance_2c2_catalog_instance_201_port_0: + - 2c2_catalog_instance_2c2_catalog_instance_201_port_0 - dependency local_storage_2c2_catalog_instance: - 2c2_catalog_instance - local_storage - dependency_2c2_catalog_instance_2c202_port: - - 2c2_catalog_instance_2c202_port - - dependency - link_2c2_catalog_instance_2c202_port: - - 2c2_catalog_instance_2c202_port - - link
\ No newline at end of file + dependency_2c2_catalog_instance_2c2_catalog_instance_202_port_0: + - 2c2_catalog_instance_2c2_catalog_instance_202_port_0 + - dependency
\ No newline at end of file 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 98912ac570..5b5da38df0 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 @@ -16,57 +16,61 @@ topology_template: required: true entry_schema: type: json - port_1a_t1_port_ip_requirements: + port_a_single_1a_t1_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_1a_t2_port_network_role_tag: - type: string + type: org.openecomp.datatypes.network.VlanRequirements + port_a_single_1a_t1_port_0_order: + type: integer required: true + port_a_single_1a_t2_port_0_order: + type: integer + required: true + port_a_single_1a_t2_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements vm_flavor_name: type: string required: true - port_1a_t2_port_network_role: + port_a_single_1a_t2_port_0_network_role_tag: type: string required: true - port_1a_t2_port_network: - type: list - required: true - entry_schema: - type: string - port_1a_t1_port_mac_requirements: + port_a_single_1a_t1_port_0_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_1a_t1_port_network: - type: list - required: true - entry_schema: - type: string - port_1a_t1_port_subnetpoolid: + port_a_single_1a_t1_port_0_subnetpoolid: type: string required: true vm_image_name: type: string required: true - port_1a_t2_port_related_networks: + port_a_single_1a_t2_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1a_t2_port_ip_requirements: + type: string + port_a_single_1a_t1_port_0_network_role_tag: + type: string + required: true + port_a_single_1a_t1_port_0_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_1a_t1_port_vlan_requirements: + port_a_single_1a_t2_port_0_subnetpoolid: + type: string + required: true + port_a_single_1a_t2_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_a_single_1a_t1_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1a_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true + type: string compute_a_single_1a_availability_zone: type: list required: true @@ -84,34 +88,30 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_1a_t1_port_related_networks: + port_a_single_1a_t1_port_0_network_role: + type: string + required: true + port_a_single_1a_t1_port_0_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1a_t1_port_network_role_tag: - type: string - required: true - port_1a_t1_port_network_role: - type: string - required: true - port_1a_t1_port_order: - type: integer + port_a_single_1a_t1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_1a_t2_port_exCP_naming: + port_a_single_1a_t2_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_1a_t2_port_vlan_requirements: + port_a_single_1a_t2_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1a_t2_port_subnetpoolid: - type: string - required: true - port_1a_t2_port_order: - type: integer + type: org.openecomp.datatypes.network.IpRequirements + port_a_single_1a_t2_port_0_related_networks: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_a_single_1a_user_data_format: type: list required: true @@ -122,35 +122,35 @@ topology_template: required: true entry_schema: type: string - port_1a_t2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_a_single_1a_t2_port_0_network_role: + type: string required: true node_templates: - a_single_1a_1a_t1_port: + a_single_1a_a_single_1a_t2_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_1a_t1_port_exCP_naming + get_input: port_a_single_1a_t2_port_0_exCP_naming vlan_requirements: - get_input: port_1a_t1_port_vlan_requirements + get_input: port_a_single_1a_t2_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_1a_t1_port_related_networks + get_input: port_a_single_1a_t2_port_0_related_networks ip_requirements: - get_input: port_1a_t1_port_ip_requirements + get_input: port_a_single_1a_t2_port_0_ip_requirements network_role_tag: - get_input: port_1a_t1_port_network_role_tag + get_input: port_a_single_1a_t2_port_0_network_role_tag mac_requirements: - get_input: port_1a_t1_port_mac_requirements + get_input: port_a_single_1a_t2_port_0_mac_requirements order: - get_input: port_1a_t1_port_order + get_input: port_a_single_1a_t2_port_0_order network_role: - get_input: port_1a_t1_port_network_role + get_input: port_a_single_1a_t2_port_0_network_role subnetpoolid: - get_input: port_1a_t1_port_subnetpoolid + get_input: port_a_single_1a_t2_port_0_subnetpoolid network: get_input: - - port_1a_t1_port_network + - port_a_single_1a_t2_port_0_network - index_value requirements: - binding: @@ -184,31 +184,31 @@ topology_template: get_input: - compute_a_single_1a_user_data_format - index_value - a_single_1a_1a_t2_port: + a_single_1a_a_single_1a_t1_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_1a_t2_port_exCP_naming + get_input: port_a_single_1a_t1_port_0_exCP_naming vlan_requirements: - get_input: port_1a_t2_port_vlan_requirements + get_input: port_a_single_1a_t1_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_1a_t2_port_related_networks + get_input: port_a_single_1a_t1_port_0_related_networks ip_requirements: - get_input: port_1a_t2_port_ip_requirements + get_input: port_a_single_1a_t1_port_0_ip_requirements network_role_tag: - get_input: port_1a_t2_port_network_role_tag + get_input: port_a_single_1a_t1_port_0_network_role_tag mac_requirements: - get_input: port_1a_t2_port_mac_requirements + get_input: port_a_single_1a_t1_port_0_mac_requirements order: - get_input: port_1a_t2_port_order + get_input: port_a_single_1a_t1_port_0_order network_role: - get_input: port_1a_t2_port_network_role + get_input: port_a_single_1a_t1_port_0_network_role subnetpoolid: - get_input: port_1a_t2_port_subnetpoolid + get_input: port_a_single_1a_t1_port_0_subnetpoolid network: get_input: - - port_1a_t2_port_network + - port_a_single_1a_t1_port_0_network - index_value requirements: - binding: @@ -216,39 +216,42 @@ topology_template: node: a_single_1a relationship: tosca.relationships.network.BindsTo outputs: - a_single_1a_instance_name: + a_single_1a_a_single_1a_t1_port_0_tenant_id: type: string value: get_attribute: - - a_single_1a - - instance_name - a_single_1a_1a_t1_port_tenant_id: + - a_single_1a_a_single_1a_t1_port_0 + - tenant_id + a_single_1a_instance_name: type: string value: get_attribute: - - a_single_1a_1a_t1_port - - tenant_id + - a_single_1a + - instance_name substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.a_single_1a capabilities: disk.read.bytes_a_single_1a: - a_single_1a - disk.read.bytes - network.incoming.bytes.rate_a_single_1a_1a_t2_port: - - a_single_1a_1a_t2_port - - network.incoming.bytes.rate disk.usage_a_single_1a: - a_single_1a - disk.usage - attachment_a_single_1a_1a_t2_port: - - a_single_1a_1a_t2_port - - attachment + network.incoming.bytes.rate_a_single_1a_a_single_1a_t2_port_0: + - a_single_1a_a_single_1a_t2_port_0 + - network.incoming.bytes.rate scalable_a_single_1a: - a_single_1a - scalable - network.outgoing.bytes.rate_a_single_1a_1a_t2_port: - - a_single_1a_1a_t2_port - - network.outgoing.bytes.rate + network.incoming.packets.rate_a_single_1a_a_single_1a_t2_port_0: + - a_single_1a_a_single_1a_t2_port_0 + - network.incoming.packets.rate + network.incoming.bytes_a_single_1a_a_single_1a_t2_port_0: + - a_single_1a_a_single_1a_t2_port_0 + - network.incoming.bytes + network.incoming.bytes.rate_a_single_1a_a_single_1a_t1_port_0: + - a_single_1a_a_single_1a_t1_port_0 + - network.incoming.bytes.rate host_a_single_1a: - a_single_1a - host @@ -261,27 +264,24 @@ topology_template: memory.resident_a_single_1a: - a_single_1a - memory.resident - network.incoming.packets.rate_a_single_1a_1a_t2_port: - - a_single_1a_1a_t2_port - - network.incoming.packets.rate cpu.delta_a_single_1a: - a_single_1a - cpu.delta - forwarder_a_single_1a_1a_t1_port: - - a_single_1a_1a_t1_port - - forwarder + network.incoming.bytes_a_single_1a_a_single_1a_t1_port_0: + - a_single_1a_a_single_1a_t1_port_0 + - network.incoming.bytes disk.device.write.requests_a_single_1a: - a_single_1a - disk.device.write.requests - network.incoming.bytes.rate_a_single_1a_1a_t1_port: - - a_single_1a_1a_t1_port - - network.incoming.bytes.rate disk.iops_a_single_1a: - a_single_1a - disk.iops - network.incoming.bytes_a_single_1a_1a_t1_port: - - a_single_1a_1a_t1_port - - network.incoming.bytes + network.outgoing.bytes_a_single_1a_a_single_1a_t2_port_0: + - a_single_1a_a_single_1a_t2_port_0 + - network.outgoing.bytes + forwarder_a_single_1a_a_single_1a_t1_port_0: + - a_single_1a_a_single_1a_t1_port_0 + - forwarder cpu_util_a_single_1a: - a_single_1a - cpu_util @@ -291,42 +291,39 @@ topology_template: disk.device.usage_a_single_1a: - a_single_1a - disk.device.usage - network.incoming.packets.rate_a_single_1a_1a_t1_port: - - a_single_1a_1a_t1_port - - network.incoming.packets.rate - network.outgoing.packets.rate_a_single_1a_1a_t2_port: - - a_single_1a_1a_t2_port - - network.outgoing.packets.rate + attachment_a_single_1a_a_single_1a_t1_port_0: + - a_single_1a_a_single_1a_t1_port_0 + - attachment disk.read.requests_a_single_1a: - a_single_1a - disk.read.requests disk.read.bytes.rate_a_single_1a: - a_single_1a - disk.read.bytes.rate + binding_a_single_1a_a_single_1a_t2_port_0: + - a_single_1a_a_single_1a_t2_port_0 + - binding disk.write.bytes.rate_a_single_1a: - a_single_1a - disk.write.bytes.rate - attachment_a_single_1a_1a_t1_port: - - a_single_1a_1a_t1_port - - attachment + feature_a_single_1a_a_single_1a_t2_port_0: + - a_single_1a_a_single_1a_t2_port_0 + - feature cpu_a_single_1a: - a_single_1a - cpu memory.usage_a_single_1a: - a_single_1a - memory.usage - forwarder_a_single_1a_1a_t2_port: - - a_single_1a_1a_t2_port - - forwarder + network.outpoing.packets_a_single_1a_a_single_1a_t1_port_0: + - a_single_1a_a_single_1a_t1_port_0 + - network.outpoing.packets disk.device.write.requests.rate_a_single_1a: - a_single_1a - disk.device.write.requests.rate - binding_a_single_1a_1a_t2_port: - - a_single_1a_1a_t2_port - - binding - network.incoming.packets_a_single_1a_1a_t2_port: - - a_single_1a_1a_t2_port - - network.incoming.packets + network.outgoing.packets.rate_a_single_1a_a_single_1a_t2_port_0: + - a_single_1a_a_single_1a_t2_port_0 + - network.outgoing.packets.rate disk.device.read.requests_a_single_1a: - a_single_1a - disk.device.read.requests @@ -342,24 +339,12 @@ topology_template: disk.latency_a_single_1a: - a_single_1a - disk.latency - network.outgoing.bytes_a_single_1a_1a_t2_port: - - a_single_1a_1a_t2_port - - network.outgoing.bytes disk.device.allocation_a_single_1a: - a_single_1a - disk.device.allocation disk.write.bytes_a_single_1a: - a_single_1a - disk.write.bytes - feature_a_single_1a_1a_t1_port: - - a_single_1a_1a_t1_port - - feature - network.outpoing.packets_a_single_1a_1a_t2_port: - - a_single_1a_1a_t2_port - - network.outpoing.packets - network.outpoing.packets_a_single_1a_1a_t1_port: - - a_single_1a_1a_t1_port - - network.outpoing.packets disk.device.read.bytes.rate_a_single_1a: - a_single_1a - disk.device.read.bytes.rate @@ -369,78 +354,93 @@ topology_template: disk.device.write.bytes.rate_a_single_1a: - a_single_1a - disk.device.write.bytes.rate + network.incoming.packets_a_single_1a_a_single_1a_t2_port_0: + - a_single_1a_a_single_1a_t2_port_0 + - network.incoming.packets memory_a_single_1a: - a_single_1a - memory disk.allocation_a_single_1a: - a_single_1a - disk.allocation - network.outgoing.packets.rate_a_single_1a_1a_t1_port: - - a_single_1a_1a_t1_port - - network.outgoing.packets.rate - feature_a_single_1a_1a_t2_port: - - a_single_1a_1a_t2_port - - feature + network.incoming.packets_a_single_1a_a_single_1a_t1_port_0: + - a_single_1a_a_single_1a_t1_port_0 + - network.incoming.packets + network.outgoing.bytes.rate_a_single_1a_a_single_1a_t2_port_0: + - a_single_1a_a_single_1a_t2_port_0 + - network.outgoing.bytes.rate + network.outgoing.bytes.rate_a_single_1a_a_single_1a_t1_port_0: + - a_single_1a_a_single_1a_t1_port_0 + - network.outgoing.bytes.rate disk.capacity_a_single_1a: - a_single_1a - disk.capacity disk.device.read.bytes_a_single_1a: - a_single_1a - disk.device.read.bytes - network.incoming.packets_a_single_1a_1a_t1_port: - - a_single_1a_1a_t1_port - - network.incoming.packets feature_a_single_1a: - a_single_1a - feature - network.outgoing.bytes_a_single_1a_1a_t1_port: - - a_single_1a_1a_t1_port + network.outgoing.bytes_a_single_1a_a_single_1a_t1_port_0: + - a_single_1a_a_single_1a_t1_port_0 - network.outgoing.bytes + forwarder_a_single_1a_a_single_1a_t2_port_0: + - a_single_1a_a_single_1a_t2_port_0 + - forwarder disk.ephemeral.size_a_single_1a: - a_single_1a - disk.ephemeral.size vcpus_a_single_1a: - a_single_1a - vcpus - binding_a_single_1a_1a_t1_port: - - a_single_1a_1a_t1_port - - binding + attachment_a_single_1a_a_single_1a_t2_port_0: + - a_single_1a_a_single_1a_t2_port_0 + - attachment + network.incoming.packets.rate_a_single_1a_a_single_1a_t1_port_0: + - a_single_1a_a_single_1a_t1_port_0 + - network.incoming.packets.rate disk.device.iops_a_single_1a: - a_single_1a - disk.device.iops disk.write.requests_a_single_1a: - a_single_1a - disk.write.requests + network.outpoing.packets_a_single_1a_a_single_1a_t2_port_0: + - a_single_1a_a_single_1a_t2_port_0 + - network.outpoing.packets disk.device.read.requests.rate_a_single_1a: - a_single_1a - disk.device.read.requests.rate + feature_a_single_1a_a_single_1a_t1_port_0: + - a_single_1a_a_single_1a_t1_port_0 + - feature disk.device.capacity_a_single_1a: - a_single_1a - disk.device.capacity + binding_a_single_1a_a_single_1a_t1_port_0: + - a_single_1a_a_single_1a_t1_port_0 + - binding disk.write.requests.rate_a_single_1a: - a_single_1a - disk.write.requests.rate - network.incoming.bytes_a_single_1a_1a_t2_port: - - a_single_1a_1a_t2_port - - network.incoming.bytes - network.outgoing.bytes.rate_a_single_1a_1a_t1_port: - - a_single_1a_1a_t1_port - - network.outgoing.bytes.rate + network.outgoing.packets.rate_a_single_1a_a_single_1a_t1_port_0: + - a_single_1a_a_single_1a_t1_port_0 + - network.outgoing.packets.rate requirements: - link_a_single_1a_1a_t2_port: - - a_single_1a_1a_t2_port + link_a_single_1a_a_single_1a_t2_port_0: + - a_single_1a_a_single_1a_t2_port_0 - link - link_a_single_1a_1a_t1_port: - - a_single_1a_1a_t1_port + link_a_single_1a_a_single_1a_t1_port_0: + - a_single_1a_a_single_1a_t1_port_0 - link dependency_a_single_1a: - a_single_1a - dependency - dependency_a_single_1a_1a_t2_port: - - a_single_1a_1a_t2_port + dependency_a_single_1a_a_single_1a_t2_port_0: + - a_single_1a_a_single_1a_t2_port_0 - dependency - dependency_a_single_1a_1a_t1_port: - - a_single_1a_1a_t1_port + dependency_a_single_1a_a_single_1a_t1_port_0: + - a_single_1a_a_single_1a_t1_port_0 - dependency local_storage_a_single_1a: - a_single_1a 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 34c13baf1d..8670430317 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 @@ -11,14 +11,27 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_a_single_2a_t1_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_a_single_2a_t1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true compute_a_single_2a_user_data_format: type: list required: true entry_schema: type: string - port_1a_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_a_single_2a_t1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true + port_a_single_2a_t1_port_0_network: + type: list + required: true + entry_schema: + type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -26,30 +39,11 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_1a_t1_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_1a_t1_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1a_t1_port_network_role_tag: - type: string - required: true - port_1a_t1_port_network_role: - type: string - required: true compute_a_single_2a_scheduler_hints: type: list required: true entry_schema: type: json - port_1a_t1_port_order: - type: integer - required: true compute_a_single_2a_availability_zone: type: list required: true @@ -58,30 +52,36 @@ topology_template: vm_flavor_name: type: string required: true - port_1a_t1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_a_single_2a_t1_port_0_network_role_tag: + type: string + required: true + port_a_single_2a_t1_port_0_order: + type: integer required: true - port_1a_t1_port_network: + compute_a_single_2a_name: type: list required: true entry_schema: type: string - port_1a_t1_port_subnetpoolid: + vm_image_name: type: string required: true - compute_a_single_2a_name: + port_a_single_2a_t1_port_0_vlan_requirements: type: list required: true entry_schema: - type: string - vm_image_name: + type: org.openecomp.datatypes.network.VlanRequirements + port_a_single_2a_t1_port_0_network_role: + type: string + required: true + port_a_single_2a_t1_port_0_subnetpoolid: type: string required: true - port_1a_t1_port_vlan_requirements: + port_a_single_2a_t1_port_0_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_a_single_2a_metadata: type: list required: true @@ -115,31 +115,31 @@ topology_template: get_input: - compute_a_single_2a_user_data_format - index_value - a_single_2a_1a_t1_port: + a_single_2a_a_single_2a_t1_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_1a_t1_port_exCP_naming + get_input: port_a_single_2a_t1_port_0_exCP_naming vlan_requirements: - get_input: port_1a_t1_port_vlan_requirements + get_input: port_a_single_2a_t1_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_1a_t1_port_related_networks + get_input: port_a_single_2a_t1_port_0_related_networks ip_requirements: - get_input: port_1a_t1_port_ip_requirements + get_input: port_a_single_2a_t1_port_0_ip_requirements network_role_tag: - get_input: port_1a_t1_port_network_role_tag + get_input: port_a_single_2a_t1_port_0_network_role_tag mac_requirements: - get_input: port_1a_t1_port_mac_requirements + get_input: port_a_single_2a_t1_port_0_mac_requirements order: - get_input: port_1a_t1_port_order + get_input: port_a_single_2a_t1_port_0_order network_role: - get_input: port_1a_t1_port_network_role + get_input: port_a_single_2a_t1_port_0_network_role subnetpoolid: - get_input: port_1a_t1_port_subnetpoolid + get_input: port_a_single_2a_t1_port_0_subnetpoolid network: get_input: - - port_1a_t1_port_network + - port_a_single_2a_t1_port_0_network - index_value requirements: - binding: @@ -159,6 +159,12 @@ topology_template: disk.capacity_a_single_2a: - a_single_2a - disk.capacity + network.incoming.bytes_a_single_2a_a_single_2a_t1_port_0: + - a_single_2a_a_single_2a_t1_port_0 + - network.incoming.bytes + feature_a_single_2a_a_single_2a_t1_port_0: + - a_single_2a_a_single_2a_t1_port_0 + - feature disk.ephemeral.size_a_single_2a: - a_single_2a - disk.ephemeral.size @@ -180,18 +186,12 @@ topology_template: disk.device.usage_a_single_2a: - a_single_2a - disk.device.usage - forwarder_a_single_2a_1a_t1_port: - - a_single_2a_1a_t1_port - - forwarder disk.read.bytes.rate_a_single_2a: - a_single_2a - disk.read.bytes.rate disk.device.write.requests.rate_a_single_2a: - a_single_2a - disk.device.write.requests.rate - network.incoming.bytes.rate_a_single_2a_1a_t1_port: - - a_single_2a_1a_t1_port - - network.incoming.bytes.rate disk.write.requests.rate_a_single_2a: - a_single_2a - disk.write.requests.rate @@ -210,21 +210,15 @@ topology_template: disk.latency_a_single_2a: - a_single_2a - disk.latency - network.incoming.packets.rate_a_single_2a_1a_t1_port: - - a_single_2a_1a_t1_port - - network.incoming.packets.rate + forwarder_a_single_2a_a_single_2a_t1_port_0: + - a_single_2a_a_single_2a_t1_port_0 + - forwarder disk.usage_a_single_2a: - a_single_2a - disk.usage - network.incoming.bytes_a_single_2a_1a_t1_port: - - a_single_2a_1a_t1_port - - network.incoming.bytes scalable_a_single_2a: - a_single_2a - scalable - feature_a_single_2a_1a_t1_port: - - a_single_2a_1a_t1_port - - feature disk.device.write.bytes_a_single_2a: - a_single_2a - disk.device.write.bytes @@ -237,21 +231,27 @@ topology_template: disk.root.size_a_single_2a: - a_single_2a - disk.root.size + network.outpoing.packets_a_single_2a_a_single_2a_t1_port_0: + - a_single_2a_a_single_2a_t1_port_0 + - network.outpoing.packets disk.device.write.requests_a_single_2a: - a_single_2a - disk.device.write.requests - attachment_a_single_2a_1a_t1_port: - - a_single_2a_1a_t1_port - - attachment disk.iops_a_single_2a: - a_single_2a - disk.iops vcpus_a_single_2a: - a_single_2a - vcpus + network.outgoing.bytes.rate_a_single_2a_a_single_2a_t1_port_0: + - a_single_2a_a_single_2a_t1_port_0 + - network.outgoing.bytes.rate os_a_single_2a: - a_single_2a - os + network.incoming.packets_a_single_2a_a_single_2a_t1_port_0: + - a_single_2a_a_single_2a_t1_port_0 + - network.incoming.packets disk.write.bytes.rate_a_single_2a: - a_single_2a - disk.write.bytes.rate @@ -267,33 +267,36 @@ topology_template: memory.usage_a_single_2a: - a_single_2a - memory.usage - network.outgoing.packets.rate_a_single_2a_1a_t1_port: - - a_single_2a_1a_t1_port - - network.outgoing.packets.rate - network.outpoing.packets_a_single_2a_1a_t1_port: - - a_single_2a_1a_t1_port - - network.outpoing.packets + attachment_a_single_2a_a_single_2a_t1_port_0: + - a_single_2a_a_single_2a_t1_port_0 + - attachment + network.incoming.packets.rate_a_single_2a_a_single_2a_t1_port_0: + - a_single_2a_a_single_2a_t1_port_0 + - network.incoming.packets.rate + binding_a_single_2a_a_single_2a_t1_port_0: + - a_single_2a_a_single_2a_t1_port_0 + - binding binding_a_single_2a: - a_single_2a - binding instance_a_single_2a: - a_single_2a - instance - network.outgoing.bytes_a_single_2a_1a_t1_port: - - a_single_2a_1a_t1_port - - network.outgoing.bytes + network.incoming.bytes.rate_a_single_2a_a_single_2a_t1_port_0: + - a_single_2a_a_single_2a_t1_port_0 + - network.incoming.bytes.rate disk.write.bytes_a_single_2a: - a_single_2a - disk.write.bytes - binding_a_single_2a_1a_t1_port: - - a_single_2a_1a_t1_port - - binding - network.incoming.packets_a_single_2a_1a_t1_port: - - a_single_2a_1a_t1_port - - network.incoming.packets + network.outgoing.packets.rate_a_single_2a_a_single_2a_t1_port_0: + - a_single_2a_a_single_2a_t1_port_0 + - network.outgoing.packets.rate host_a_single_2a: - a_single_2a - host + network.outgoing.bytes_a_single_2a_a_single_2a_t1_port_0: + - a_single_2a_a_single_2a_t1_port_0 + - network.outgoing.bytes disk.device.write.bytes.rate_a_single_2a: - a_single_2a - disk.device.write.bytes.rate @@ -306,9 +309,6 @@ topology_template: memory.resident_a_single_2a: - a_single_2a - memory.resident - network.outgoing.bytes.rate_a_single_2a_1a_t1_port: - - a_single_2a_1a_t1_port - - network.outgoing.bytes.rate cpu.delta_a_single_2a: - a_single_2a - cpu.delta @@ -316,15 +316,15 @@ topology_template: - a_single_2a - feature requirements: + link_a_single_2a_a_single_2a_t1_port_0: + - a_single_2a_a_single_2a_t1_port_0 + - link dependency_a_single_2a: - a_single_2a - dependency - dependency_a_single_2a_1a_t1_port: - - a_single_2a_1a_t1_port + dependency_a_single_2a_a_single_2a_t1_port_0: + - a_single_2a_a_single_2a_t1_port_0 - dependency - link_a_single_2a_1a_t1_port: - - a_single_2a_1a_t1_port - - link local_storage_a_single_2a: - a_single_2a - local_storage
\ No newline at end of file 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_1bServiceTemplate.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_1bServiceTemplate.yaml index 82eb0a0bf7..795c6564c8 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_1bServiceTemplate.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_1bServiceTemplate.yaml @@ -11,35 +11,45 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_1b_t1_port_order: - type: integer + port_b_single_1b_t1_port_0_network_role_tag: + type: string + required: true + port_b_single_1b_t1_port_0_related_networks: + type: list required: true - port_1b_t1_port_network_role: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_b_single_1b_t2_port_0_subnetpoolid: type: string required: true - port_1b_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_b_single_1b_t1_port_0_network_role: + type: string required: true + port_b_single_1b_t2_port_0_network: + type: list + required: true + entry_schema: + type: string vm_flavor_name: type: string required: true - port_1b_t2_port_related_networks: + port_b_single_1b_t1_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1b_t1_port_ip_requirements: + type: org.openecomp.datatypes.network.VlanRequirements + port_b_single_1b_t2_port_0_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true - port_1b_t2_port_network_role: - type: string + port_b_single_1b_t2_port_0_order: + type: integer required: true - port_1b_t2_port_order: + port_b_single_1b_t1_port_0_order: type: integer required: true compute_b_single_1b_user_data_format: @@ -47,28 +57,32 @@ topology_template: required: true entry_schema: type: string - port_1b_t2_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_1b_t2_port_network_role_tag: - type: string + port_b_single_1b_t2_port_0_vlan_requirements: + type: list required: true - port_1b_t2_port_subnetpoolid: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_b_single_1b_t2_port_0_network_role: type: string required: true - port_1b_t1_port_related_networks: + port_b_single_1b_t1_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1b_t2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.network.IpRequirements + port_b_single_1b_t1_port_0_value_specs: + type: list required: true + entry_schema: + type: json compute_b_single_1b_availability_zone: type: list required: true entry_schema: type: string + port_b_single_1b_t1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -81,45 +95,31 @@ topology_template: required: true entry_schema: type: json - port_1b_t2_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1b_t2_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_1b_t1_port_value_specs: - type: list + port_b_single_1b_t1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json - port_1b_t1_port_network_role_tag: + port_b_single_1b_t1_port_0_subnetpoolid: type: string required: true - port_1b_t1_port_subnetpoolid: + port_b_single_1b_t2_port_0_network_role_tag: type: string required: true - port_1b_t1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_1b_t2_port_network: + port_b_single_1b_t1_port_0_network: type: list required: true entry_schema: type: string - port_1b_t1_port_vlan_requirements: + port_b_single_1b_t2_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1b_t1_port_network: - type: list + type: org.openecomp.datatypes.network.IpRequirements + port_b_single_1b_t2_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_b_single_1b_t2_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: string compute_b_single_1b_name: type: list required: true @@ -149,66 +149,66 @@ topology_template: get_input: - compute_b_single_1b_user_data_format - index_value - b_single_1b_1b_t1_port: + b_single_1b_b_single_1b_t2_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - mac_requirements: - get_input: port_1b_t1_port_mac_requirements - order: - get_input: port_1b_t1_port_order - value_specs: - get_input: - - port_1b_t1_port_value_specs - - index_value exCP_naming: - get_input: port_1b_t1_port_exCP_naming + get_input: port_b_single_1b_t2_port_0_exCP_naming vlan_requirements: - get_input: port_1b_t1_port_vlan_requirements + get_input: port_b_single_1b_t2_port_0_vlan_requirements subinterface_indicator: false - ip_requirements: - get_input: port_1b_t1_port_ip_requirements related_networks: - get_input: port_1b_t1_port_related_networks + get_input: port_b_single_1b_t2_port_0_related_networks + ip_requirements: + get_input: port_b_single_1b_t2_port_0_ip_requirements network_role_tag: - get_input: port_1b_t1_port_network_role_tag + get_input: port_b_single_1b_t2_port_0_network_role_tag + mac_requirements: + get_input: port_b_single_1b_t2_port_0_mac_requirements + order: + get_input: port_b_single_1b_t2_port_0_order network_role: - get_input: port_1b_t1_port_network_role + get_input: port_b_single_1b_t2_port_0_network_role subnetpoolid: - get_input: port_1b_t1_port_subnetpoolid + get_input: port_b_single_1b_t2_port_0_subnetpoolid network: get_input: - - port_1b_t1_port_network + - port_b_single_1b_t2_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: b_single_1b relationship: tosca.relationships.network.BindsTo - b_single_1b_1b_t2_port: + b_single_1b_b_single_1b_t1_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + mac_requirements: + get_input: port_b_single_1b_t1_port_0_mac_requirements + order: + get_input: port_b_single_1b_t1_port_0_order + value_specs: + get_input: + - port_b_single_1b_t1_port_0_value_specs + - index_value exCP_naming: - get_input: port_1b_t2_port_exCP_naming + get_input: port_b_single_1b_t1_port_0_exCP_naming vlan_requirements: - get_input: port_1b_t2_port_vlan_requirements + get_input: port_b_single_1b_t1_port_0_vlan_requirements subinterface_indicator: false - related_networks: - get_input: port_1b_t2_port_related_networks ip_requirements: - get_input: port_1b_t2_port_ip_requirements + get_input: port_b_single_1b_t1_port_0_ip_requirements + related_networks: + get_input: port_b_single_1b_t1_port_0_related_networks network_role_tag: - get_input: port_1b_t2_port_network_role_tag - mac_requirements: - get_input: port_1b_t2_port_mac_requirements - order: - get_input: port_1b_t2_port_order + get_input: port_b_single_1b_t1_port_0_network_role_tag network_role: - get_input: port_1b_t2_port_network_role + get_input: port_b_single_1b_t1_port_0_network_role subnetpoolid: - get_input: port_1b_t2_port_subnetpoolid + get_input: port_b_single_1b_t1_port_0_subnetpoolid network: get_input: - - port_1b_t2_port_network + - port_b_single_1b_t1_port_0_network - index_value requirements: - binding: @@ -222,21 +222,15 @@ topology_template: get_attribute: - b_single_1b - instance_name - b_single_1b_1b_t1_port_tenant_id: + b_single_1b_b_single_1b_t1_port_0_tenant_id: type: string value: get_attribute: - - b_single_1b_1b_t1_port + - b_single_1b_b_single_1b_t1_port_0 - tenant_id substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.b_single_1b capabilities: - attachment_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - attachment - forwarder_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - forwarder endpoint_b_single_1b: - b_single_1b - endpoint @@ -246,15 +240,30 @@ topology_template: disk.iops_b_single_1b: - b_single_1b - disk.iops - network.incoming.bytes.rate_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port + network.incoming.bytes_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - network.incoming.bytes + network.incoming.packets.rate_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.incoming.packets.rate + network.incoming.bytes_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.incoming.bytes + binding_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - binding + feature_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - feature + feature_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - feature + network.incoming.bytes.rate_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 - network.incoming.bytes.rate - network.outgoing.bytes.rate_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - network.outgoing.bytes.rate - forwarder_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - forwarder + binding_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - binding scalable_b_single_1b: - b_single_1b - scalable @@ -264,24 +273,30 @@ topology_template: os_b_single_1b: - b_single_1b - os + forwarder_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - forwarder + forwarder_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - forwarder vcpus_b_single_1b: - b_single_1b - vcpus cpu_b_single_1b: - b_single_1b - cpu + network.incoming.bytes.rate_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.incoming.bytes.rate disk.device.read.requests.rate_b_single_1b: - b_single_1b - disk.device.read.requests.rate - network.incoming.packets.rate_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port + network.incoming.packets.rate_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 - network.incoming.packets.rate instance_b_single_1b: - b_single_1b - instance - network.incoming.bytes.rate_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.incoming.bytes.rate disk.read.bytes_b_single_1b: - b_single_1b - disk.read.bytes @@ -291,45 +306,36 @@ topology_template: disk.usage_b_single_1b: - b_single_1b - disk.usage - network.incoming.bytes_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.incoming.bytes disk.device.allocation_b_single_1b: - b_single_1b - disk.device.allocation - network.outgoing.packets.rate_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port + network.outgoing.packets.rate_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 - network.outgoing.packets.rate + network.outpoing.packets_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - network.outpoing.packets + network.outgoing.bytes_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.outgoing.bytes disk.device.capacity_b_single_1b: - b_single_1b - disk.device.capacity disk.latency_b_single_1b: - b_single_1b - disk.latency - network.incoming.packets_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - network.incoming.packets - network.incoming.packets.rate_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.incoming.packets.rate - attachment_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port + attachment_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 - attachment disk.device.write.requests_b_single_1b: - b_single_1b - disk.device.write.requests - binding_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - binding disk.ephemeral.size_b_single_1b: - b_single_1b - disk.ephemeral.size disk.write.requests.rate_b_single_1b: - b_single_1b - disk.write.requests.rate - network.outpoing.packets_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - network.outpoing.packets disk.device.iops_b_single_1b: - b_single_1b - disk.device.iops @@ -339,15 +345,18 @@ topology_template: memory.resident_b_single_1b: - b_single_1b - memory.resident + network.outgoing.bytes.rate_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.outgoing.bytes.rate disk.root.size_b_single_1b: - b_single_1b - disk.root.size - feature_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - feature - network.outgoing.bytes_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - network.outgoing.bytes + network.incoming.packets_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - network.incoming.packets + network.outgoing.bytes.rate_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - network.outgoing.bytes.rate disk.capacity_b_single_1b: - b_single_1b - disk.capacity @@ -366,45 +375,39 @@ topology_template: disk.write.requests_b_single_1b: - b_single_1b - disk.write.requests - network.outgoing.packets.rate_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.outgoing.packets.rate + network.incoming.packets_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.incoming.packets disk.device.usage_b_single_1b: - b_single_1b - disk.device.usage disk.read.bytes.rate_b_single_1b: - b_single_1b - disk.read.bytes.rate - network.outgoing.bytes_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.outgoing.bytes disk.device.read.requests_b_single_1b: - b_single_1b - disk.device.read.requests - network.incoming.packets_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.incoming.packets - binding_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - binding - network.outpoing.packets_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.outpoing.packets + attachment_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - attachment disk.device.write.requests.rate_b_single_1b: - b_single_1b - disk.device.write.requests.rate + network.outgoing.packets.rate_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - network.outgoing.packets.rate + network.outpoing.packets_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.outpoing.packets memory.usage_b_single_1b: - b_single_1b - memory.usage + network.outgoing.bytes_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - network.outgoing.bytes disk.write.bytes.rate_b_single_1b: - b_single_1b - disk.write.bytes.rate - network.incoming.bytes_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - network.incoming.bytes - network.outgoing.bytes.rate_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.outgoing.bytes.rate cpu.delta_b_single_1b: - b_single_1b - cpu.delta @@ -423,25 +426,22 @@ topology_template: binding_b_single_1b: - b_single_1b - binding - feature_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - feature requirements: local_storage_b_single_1b: - b_single_1b - local_storage - dependency_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - dependency + link_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - link dependency_b_single_1b: - b_single_1b - dependency - link_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - link - link_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - link - dependency_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - dependency
\ No newline at end of file + dependency_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - dependency + dependency_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - dependency + link_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - link
\ No newline at end of file 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 488f239c43..ec6bd707c2 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 @@ -11,35 +11,45 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_1b_t1_port_order: - type: integer + port_b_single_1b_t1_port_0_network_role_tag: + type: string + required: true + port_b_single_1b_t1_port_0_related_networks: + type: list required: true - port_1b_t1_port_network_role: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_b_single_1b_t2_port_0_subnetpoolid: type: string required: true - port_1b_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_b_single_1b_t1_port_0_network_role: + type: string + required: true + port_b_single_1b_t2_port_0_network: + type: list required: true + entry_schema: + type: string vm_flavor_name: type: string required: true - port_1b_t2_port_related_networks: + port_b_single_1b_t1_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1b_t1_port_ip_requirements: + type: org.openecomp.datatypes.network.VlanRequirements + port_b_single_1b_t2_port_0_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true - port_1b_t2_port_network_role: - type: string + port_b_single_1b_t2_port_0_order: + type: integer required: true - port_1b_t2_port_order: + port_b_single_1b_t1_port_0_order: type: integer required: true compute_b_single_1b_user_data_format: @@ -47,28 +57,27 @@ topology_template: required: true entry_schema: type: string - port_1b_t2_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_1b_t2_port_network_role_tag: - type: string + port_b_single_1b_t2_port_0_vlan_requirements: + type: list required: true - port_1b_t2_port_subnetpoolid: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_b_single_1b_t2_port_0_network_role: type: string required: true - port_1b_t1_port_related_networks: + port_b_single_1b_t1_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1b_t2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true + type: org.openecomp.datatypes.network.IpRequirements compute_b_single_1b_availability_zone: type: list required: true entry_schema: type: string + port_b_single_1b_t1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -81,17 +90,13 @@ topology_template: required: true entry_schema: type: json - port_1b_t2_port_vlan_requirements: - type: list + port_b_single_1b_t1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1b_t2_port_ip_requirements: - type: list + port_b_single_1b_t1_port_0_subnetpoolid: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_1b_t1_port_network_role_tag: + port_b_single_1b_t2_port_0_network_role_tag: type: string required: true compute_b_single_1b_metadata: @@ -99,22 +104,17 @@ topology_template: required: true entry_schema: type: json - port_1b_t1_port_subnetpoolid: - type: string - required: true - port_1b_t1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_1b_t2_port_network: + port_b_single_1b_t2_port_0_ip_requirements: type: list required: true entry_schema: - type: string - port_1b_t1_port_vlan_requirements: - type: list + type: org.openecomp.datatypes.network.IpRequirements + port_b_single_1b_t2_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_b_single_1b_t2_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements compute_b_single_1b_name: type: list required: true @@ -148,63 +148,63 @@ topology_template: get_input: - compute_b_single_1b_user_data_format - index_value - b_single_1b_1b_t1_port: + b_single_1b_b_single_1b_t2_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_1b_t1_port_exCP_naming + get_input: port_b_single_1b_t2_port_0_exCP_naming vlan_requirements: - get_input: port_1b_t1_port_vlan_requirements + get_input: port_b_single_1b_t2_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_1b_t1_port_related_networks + get_input: port_b_single_1b_t2_port_0_related_networks ip_requirements: - get_input: port_1b_t1_port_ip_requirements + get_input: port_b_single_1b_t2_port_0_ip_requirements network_role_tag: - get_input: port_1b_t1_port_network_role_tag + get_input: port_b_single_1b_t2_port_0_network_role_tag mac_requirements: - get_input: port_1b_t1_port_mac_requirements + get_input: port_b_single_1b_t2_port_0_mac_requirements order: - get_input: port_1b_t1_port_order + get_input: port_b_single_1b_t2_port_0_order network_role: - get_input: port_1b_t1_port_network_role + get_input: port_b_single_1b_t2_port_0_network_role subnetpoolid: - get_input: port_1b_t1_port_subnetpoolid + get_input: port_b_single_1b_t2_port_0_subnetpoolid network: - get_attribute: - - b_single_1b - - accessIPv6 + get_input: + - port_b_single_1b_t2_port_0_network + - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: b_single_1b relationship: tosca.relationships.network.BindsTo - b_single_1b_1b_t2_port: + b_single_1b_b_single_1b_t1_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_1b_t2_port_exCP_naming + get_input: port_b_single_1b_t1_port_0_exCP_naming vlan_requirements: - get_input: port_1b_t2_port_vlan_requirements + get_input: port_b_single_1b_t1_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_1b_t2_port_related_networks + get_input: port_b_single_1b_t1_port_0_related_networks ip_requirements: - get_input: port_1b_t2_port_ip_requirements + get_input: port_b_single_1b_t1_port_0_ip_requirements network_role_tag: - get_input: port_1b_t2_port_network_role_tag + get_input: port_b_single_1b_t1_port_0_network_role_tag mac_requirements: - get_input: port_1b_t2_port_mac_requirements + get_input: port_b_single_1b_t1_port_0_mac_requirements order: - get_input: port_1b_t2_port_order + get_input: port_b_single_1b_t1_port_0_order network_role: - get_input: port_1b_t2_port_network_role + get_input: port_b_single_1b_t1_port_0_network_role subnetpoolid: - get_input: port_1b_t2_port_subnetpoolid + get_input: port_b_single_1b_t1_port_0_subnetpoolid network: - get_input: - - port_1b_t2_port_network - - index_value + get_attribute: + - b_single_1b + - accessIPv6 requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -217,21 +217,15 @@ topology_template: get_attribute: - b_single_1b - instance_name - b_single_1b_1b_t1_port_tenant_id: + b_single_1b_b_single_1b_t1_port_0_tenant_id: type: string value: get_attribute: - - b_single_1b_1b_t1_port + - b_single_1b_b_single_1b_t1_port_0 - tenant_id substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.b_single_1b_1 capabilities: - attachment_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - attachment - forwarder_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - forwarder endpoint_b_single_1b: - b_single_1b - endpoint @@ -241,15 +235,30 @@ topology_template: disk.iops_b_single_1b: - b_single_1b - disk.iops - network.incoming.bytes.rate_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port + network.incoming.bytes_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - network.incoming.bytes + network.incoming.packets.rate_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.incoming.packets.rate + network.incoming.bytes_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.incoming.bytes + binding_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - binding + feature_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - feature + feature_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - feature + network.incoming.bytes.rate_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 - network.incoming.bytes.rate - network.outgoing.bytes.rate_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - network.outgoing.bytes.rate - forwarder_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - forwarder + binding_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - binding scalable_b_single_1b: - b_single_1b - scalable @@ -259,24 +268,30 @@ topology_template: os_b_single_1b: - b_single_1b - os + forwarder_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - forwarder + forwarder_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - forwarder vcpus_b_single_1b: - b_single_1b - vcpus cpu_b_single_1b: - b_single_1b - cpu + network.incoming.bytes.rate_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.incoming.bytes.rate disk.device.read.requests.rate_b_single_1b: - b_single_1b - disk.device.read.requests.rate - network.incoming.packets.rate_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port + network.incoming.packets.rate_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 - network.incoming.packets.rate instance_b_single_1b: - b_single_1b - instance - network.incoming.bytes.rate_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.incoming.bytes.rate disk.read.bytes_b_single_1b: - b_single_1b - disk.read.bytes @@ -286,45 +301,36 @@ topology_template: disk.usage_b_single_1b: - b_single_1b - disk.usage - network.incoming.bytes_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.incoming.bytes disk.device.allocation_b_single_1b: - b_single_1b - disk.device.allocation - network.outgoing.packets.rate_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port + network.outgoing.packets.rate_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 - network.outgoing.packets.rate + network.outpoing.packets_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - network.outpoing.packets + network.outgoing.bytes_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.outgoing.bytes disk.device.capacity_b_single_1b: - b_single_1b - disk.device.capacity disk.latency_b_single_1b: - b_single_1b - disk.latency - network.incoming.packets_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - network.incoming.packets - network.incoming.packets.rate_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.incoming.packets.rate - attachment_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port + attachment_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 - attachment disk.device.write.requests_b_single_1b: - b_single_1b - disk.device.write.requests - binding_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - binding disk.ephemeral.size_b_single_1b: - b_single_1b - disk.ephemeral.size disk.write.requests.rate_b_single_1b: - b_single_1b - disk.write.requests.rate - network.outpoing.packets_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - network.outpoing.packets disk.device.iops_b_single_1b: - b_single_1b - disk.device.iops @@ -334,15 +340,18 @@ topology_template: memory.resident_b_single_1b: - b_single_1b - memory.resident + network.outgoing.bytes.rate_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.outgoing.bytes.rate disk.root.size_b_single_1b: - b_single_1b - disk.root.size - feature_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - feature - network.outgoing.bytes_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - network.outgoing.bytes + network.incoming.packets_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - network.incoming.packets + network.outgoing.bytes.rate_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - network.outgoing.bytes.rate disk.capacity_b_single_1b: - b_single_1b - disk.capacity @@ -361,45 +370,39 @@ topology_template: disk.write.requests_b_single_1b: - b_single_1b - disk.write.requests - network.outgoing.packets.rate_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.outgoing.packets.rate + network.incoming.packets_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.incoming.packets disk.device.usage_b_single_1b: - b_single_1b - disk.device.usage disk.read.bytes.rate_b_single_1b: - b_single_1b - disk.read.bytes.rate - network.outgoing.bytes_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.outgoing.bytes disk.device.read.requests_b_single_1b: - b_single_1b - disk.device.read.requests - network.incoming.packets_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.incoming.packets - binding_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - binding - network.outpoing.packets_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.outpoing.packets + attachment_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - attachment disk.device.write.requests.rate_b_single_1b: - b_single_1b - disk.device.write.requests.rate + network.outgoing.packets.rate_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - network.outgoing.packets.rate + network.outpoing.packets_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - network.outpoing.packets memory.usage_b_single_1b: - b_single_1b - memory.usage + network.outgoing.bytes_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - network.outgoing.bytes disk.write.bytes.rate_b_single_1b: - b_single_1b - disk.write.bytes.rate - network.incoming.bytes_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - network.incoming.bytes - network.outgoing.bytes.rate_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - network.outgoing.bytes.rate cpu.delta_b_single_1b: - b_single_1b - cpu.delta @@ -418,25 +421,22 @@ topology_template: binding_b_single_1b: - b_single_1b - binding - feature_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - feature requirements: local_storage_b_single_1b: - b_single_1b - local_storage - dependency_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - dependency + link_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - link dependency_b_single_1b: - b_single_1b - dependency - link_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - link - link_b_single_1b_1b_t1_port: - - b_single_1b_1b_t1_port - - link - dependency_b_single_1b_1b_t2_port: - - b_single_1b_1b_t2_port - - dependency
\ No newline at end of file + dependency_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - dependency + dependency_b_single_1b_b_single_1b_t1_port_0: + - b_single_1b_b_single_1b_t1_port_0 + - dependency + link_b_single_1b_b_single_1b_t2_port_0: + - b_single_1b_b_single_1b_t2_port_0 + - link
\ No newline at end of file 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_2bServiceTemplate.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_2bServiceTemplate.yaml index 58e103ec0e..a6faf92d01 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_2bServiceTemplate.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_2bServiceTemplate.yaml @@ -11,64 +11,60 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_1b_t1_port_order: - type: integer - required: true - port_1b_t1_port_network_role: + port_b_single_2b_t2_port_0_network_role: type: string required: true - port_1b_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true vm_flavor_name: type: string required: true - port_1b_t2_port_related_networks: + port_b_single_2b_t1_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_1b_t1_port_ip_requirements: + type: org.openecomp.datatypes.network.IpRequirements + port_b_single_2b_t1_port_0_network_role_tag: + type: string + required: true + port_b_single_2b_t2_port_0_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true + port_b_single_2b_t2_port_0_subnetpoolid: + type: string + required: true + port_b_single_2b_t2_port_0_network: + type: list + required: true + entry_schema: + type: string compute_b_single_2b_scheduler_hints: type: list required: true entry_schema: type: json - port_1b_t2_port_network_role: - type: string - required: true - port_1b_t2_port_order: - type: integer - required: true - port_1b_t2_port_exCP_naming: + port_b_single_2b_t1_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_1b_t2_port_network_role_tag: - type: string - required: true - port_1b_t2_port_subnetpoolid: - type: string + port_b_single_2b_t1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_1b_t1_port_related_networks: - type: list + port_b_single_2b_t2_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_b_single_2b_availability_zone: type: list required: true entry_schema: type: string - port_1b_t2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_b_single_2b_t1_port_0_vlan_requirements: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -76,55 +72,59 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_1b_t2_port_vlan_requirements: + compute_b_single_2b_name: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1b_t2_port_ip_requirements: + type: string + port_b_single_2b_t1_port_0_order: + type: integer + required: true + port_b_single_2b_t2_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_b_single_2b_t2_port_0_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - compute_b_single_2b_name: + compute_b_single_2b_user_data_format: type: list required: true entry_schema: type: string - port_1b_t1_port_value_specs: + port_b_single_2b_t2_port_0_vlan_requirements: type: list required: true entry_schema: - type: json - compute_b_single_2b_user_data_format: + type: org.openecomp.datatypes.network.VlanRequirements + port_b_single_2b_t1_port_0_related_networks: type: list required: true entry_schema: - type: string - port_1b_t1_port_network_role_tag: - type: string - required: true - port_1b_t1_port_subnetpoolid: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_b_single_2b_t1_port_0_network_role: type: string required: true - port_1b_t1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_1b_t2_port_network: + port_b_single_2b_t1_port_0_value_specs: type: list required: true entry_schema: - type: string - port_1b_t1_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1b_t1_port_network: + type: json + port_b_single_2b_t1_port_0_network: type: list required: true entry_schema: type: string + port_b_single_2b_t2_port_0_order: + type: integer + required: true + port_b_single_2b_t1_port_0_subnetpoolid: + type: string + required: true + port_b_single_2b_t2_port_0_network_role_tag: + type: string + required: true node_templates: b_single_2b: type: org.openecomp.resource.vfc.compute.nodes.heat.b_single_2b @@ -149,66 +149,66 @@ topology_template: get_input: - compute_b_single_2b_user_data_format - index_value - b_single_2b_1b_t1_port: + b_single_2b_b_single_2b_t1_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_1b_t1_port_mac_requirements + get_input: port_b_single_2b_t1_port_0_mac_requirements order: - get_input: port_1b_t1_port_order + get_input: port_b_single_2b_t1_port_0_order value_specs: get_input: - - port_1b_t1_port_value_specs + - port_b_single_2b_t1_port_0_value_specs - index_value exCP_naming: - get_input: port_1b_t1_port_exCP_naming + get_input: port_b_single_2b_t1_port_0_exCP_naming vlan_requirements: - get_input: port_1b_t1_port_vlan_requirements + get_input: port_b_single_2b_t1_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_1b_t1_port_ip_requirements + get_input: port_b_single_2b_t1_port_0_ip_requirements related_networks: - get_input: port_1b_t1_port_related_networks + get_input: port_b_single_2b_t1_port_0_related_networks network_role_tag: - get_input: port_1b_t1_port_network_role_tag + get_input: port_b_single_2b_t1_port_0_network_role_tag network_role: - get_input: port_1b_t1_port_network_role + get_input: port_b_single_2b_t1_port_0_network_role subnetpoolid: - get_input: port_1b_t1_port_subnetpoolid + get_input: port_b_single_2b_t1_port_0_subnetpoolid network: get_input: - - port_1b_t1_port_network + - port_b_single_2b_t1_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: b_single_2b relationship: tosca.relationships.network.BindsTo - b_single_2b_1b_t2_port: + b_single_2b_b_single_2b_t2_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_1b_t2_port_exCP_naming + get_input: port_b_single_2b_t2_port_0_exCP_naming vlan_requirements: - get_input: port_1b_t2_port_vlan_requirements + get_input: port_b_single_2b_t2_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_1b_t2_port_related_networks + get_input: port_b_single_2b_t2_port_0_related_networks ip_requirements: - get_input: port_1b_t2_port_ip_requirements + get_input: port_b_single_2b_t2_port_0_ip_requirements network_role_tag: - get_input: port_1b_t2_port_network_role_tag + get_input: port_b_single_2b_t2_port_0_network_role_tag mac_requirements: - get_input: port_1b_t2_port_mac_requirements + get_input: port_b_single_2b_t2_port_0_mac_requirements order: - get_input: port_1b_t2_port_order + get_input: port_b_single_2b_t2_port_0_order network_role: - get_input: port_1b_t2_port_network_role + get_input: port_b_single_2b_t2_port_0_network_role subnetpoolid: - get_input: port_1b_t2_port_subnetpoolid + get_input: port_b_single_2b_t2_port_0_subnetpoolid network: get_input: - - port_1b_t2_port_network + - port_b_single_2b_t2_port_0_network - index_value requirements: - binding: @@ -228,18 +228,12 @@ topology_template: disk.usage_b_single_2b: - b_single_2b - disk.usage - forwarder_b_single_2b_1b_t2_port: - - b_single_2b_1b_t2_port - - forwarder - network.incoming.bytes.rate_b_single_2b_1b_t2_port: - - b_single_2b_1b_t2_port - - network.incoming.bytes.rate - network.outgoing.bytes.rate_b_single_2b_1b_t2_port: - - b_single_2b_1b_t2_port - - network.outgoing.bytes.rate - attachment_b_single_2b_1b_t2_port: - - b_single_2b_1b_t2_port - - attachment + feature_b_single_2b_b_single_2b_t1_port_0: + - b_single_2b_b_single_2b_t1_port_0 + - feature + feature_b_single_2b_b_single_2b_t2_port_0: + - b_single_2b_b_single_2b_t2_port_0 + - feature disk.write.bytes.rate_b_single_2b: - b_single_2b - disk.write.bytes.rate @@ -255,30 +249,30 @@ topology_template: disk.device.write.requests_b_single_2b: - b_single_2b - disk.device.write.requests - network.incoming.packets.rate_b_single_2b_1b_t2_port: - - b_single_2b_1b_t2_port - - network.incoming.packets.rate disk.read.bytes_b_single_2b: - b_single_2b - disk.read.bytes - forwarder_b_single_2b_1b_t1_port: - - b_single_2b_1b_t1_port - - forwarder + network.incoming.bytes_b_single_2b_b_single_2b_t2_port_0: + - b_single_2b_b_single_2b_t2_port_0 + - network.incoming.bytes + network.incoming.bytes_b_single_2b_b_single_2b_t1_port_0: + - b_single_2b_b_single_2b_t1_port_0 + - network.incoming.bytes disk.device.iops_b_single_2b: - b_single_2b - disk.device.iops disk.ephemeral.size_b_single_2b: - b_single_2b - disk.ephemeral.size - network.incoming.bytes.rate_b_single_2b_1b_t1_port: - - b_single_2b_1b_t1_port - - network.incoming.bytes.rate - network.incoming.bytes_b_single_2b_1b_t1_port: - - b_single_2b_1b_t1_port - - network.incoming.bytes + network.outgoing.packets.rate_b_single_2b_b_single_2b_t2_port_0: + - b_single_2b_b_single_2b_t2_port_0 + - network.outgoing.packets.rate disk.write.requests.rate_b_single_2b: - b_single_2b - disk.write.requests.rate + network.incoming.bytes.rate_b_single_2b_b_single_2b_t2_port_0: + - b_single_2b_b_single_2b_t2_port_0 + - network.incoming.bytes.rate feature_b_single_2b: - b_single_2b - feature @@ -288,66 +282,69 @@ topology_template: disk.write.requests_b_single_2b: - b_single_2b - disk.write.requests - network.outgoing.packets.rate_b_single_2b_1b_t2_port: - - b_single_2b_1b_t2_port - - network.outgoing.packets.rate + forwarder_b_single_2b_b_single_2b_t1_port_0: + - b_single_2b_b_single_2b_t1_port_0 + - forwarder disk.capacity_b_single_2b: - b_single_2b - disk.capacity disk.device.read.bytes_b_single_2b: - b_single_2b - disk.device.read.bytes - network.incoming.packets.rate_b_single_2b_1b_t1_port: - - b_single_2b_1b_t1_port + network.incoming.packets.rate_b_single_2b_b_single_2b_t2_port_0: + - b_single_2b_b_single_2b_t2_port_0 - network.incoming.packets.rate - attachment_b_single_2b_1b_t1_port: - - b_single_2b_1b_t1_port - - attachment disk.write.bytes_b_single_2b: - b_single_2b - disk.write.bytes - network.incoming.packets_b_single_2b_1b_t2_port: - - b_single_2b_1b_t2_port - - network.incoming.packets + binding_b_single_2b_b_single_2b_t2_port_0: + - b_single_2b_b_single_2b_t2_port_0 + - binding + network.outpoing.packets_b_single_2b_b_single_2b_t1_port_0: + - b_single_2b_b_single_2b_t1_port_0 + - network.outpoing.packets vcpus_b_single_2b: - b_single_2b - vcpus + network.outgoing.bytes_b_single_2b_b_single_2b_t2_port_0: + - b_single_2b_b_single_2b_t2_port_0 + - network.outgoing.bytes disk.device.read.requests.rate_b_single_2b: - b_single_2b - disk.device.read.requests.rate - binding_b_single_2b_1b_t2_port: - - b_single_2b_1b_t2_port - - binding instance_b_single_2b: - b_single_2b - instance - network.outpoing.packets_b_single_2b_1b_t2_port: - - b_single_2b_1b_t2_port - - network.outpoing.packets + network.incoming.packets_b_single_2b_b_single_2b_t2_port_0: + - b_single_2b_b_single_2b_t2_port_0 + - network.incoming.packets disk.device.read.requests_b_single_2b: - b_single_2b - disk.device.read.requests + network.incoming.packets_b_single_2b_b_single_2b_t1_port_0: + - b_single_2b_b_single_2b_t1_port_0 + - network.incoming.packets + network.outgoing.bytes.rate_b_single_2b_b_single_2b_t2_port_0: + - b_single_2b_b_single_2b_t2_port_0 + - network.outgoing.bytes.rate disk.device.latency_b_single_2b: - b_single_2b - disk.device.latency - network.outgoing.bytes_b_single_2b_1b_t2_port: - - b_single_2b_1b_t2_port - - network.outgoing.bytes disk.device.allocation_b_single_2b: - b_single_2b - disk.device.allocation disk.latency_b_single_2b: - b_single_2b - disk.latency - feature_b_single_2b_1b_t1_port: - - b_single_2b_1b_t1_port - - feature disk.device.read.bytes.rate_b_single_2b: - b_single_2b - disk.device.read.bytes.rate - network.outpoing.packets_b_single_2b_1b_t1_port: - - b_single_2b_1b_t1_port - - network.outpoing.packets + attachment_b_single_2b_b_single_2b_t2_port_0: + - b_single_2b_b_single_2b_t2_port_0 + - attachment + attachment_b_single_2b_b_single_2b_t1_port_0: + - b_single_2b_b_single_2b_t1_port_0 + - attachment disk.device.write.bytes.rate_b_single_2b: - b_single_2b - disk.device.write.bytes.rate @@ -357,33 +354,30 @@ topology_template: memory_b_single_2b: - b_single_2b - memory - network.outgoing.packets.rate_b_single_2b_1b_t1_port: - - b_single_2b_1b_t1_port - - network.outgoing.packets.rate + network.outgoing.bytes.rate_b_single_2b_b_single_2b_t1_port_0: + - b_single_2b_b_single_2b_t1_port_0 + - network.outgoing.bytes.rate binding_b_single_2b: - b_single_2b - binding - network.incoming.packets_b_single_2b_1b_t1_port: - - b_single_2b_1b_t1_port - - network.incoming.packets - network.outgoing.bytes_b_single_2b_1b_t1_port: - - b_single_2b_1b_t1_port - - network.outgoing.bytes - binding_b_single_2b_1b_t1_port: - - b_single_2b_1b_t1_port - - binding - feature_b_single_2b_1b_t2_port: - - b_single_2b_1b_t2_port - - feature os_b_single_2b: - b_single_2b - os + binding_b_single_2b_b_single_2b_t1_port_0: + - b_single_2b_b_single_2b_t1_port_0 + - binding + forwarder_b_single_2b_b_single_2b_t2_port_0: + - b_single_2b_b_single_2b_t2_port_0 + - forwarder disk.root.size_b_single_2b: - b_single_2b - disk.root.size disk.read.requests_b_single_2b: - b_single_2b - disk.read.requests + network.incoming.bytes.rate_b_single_2b_b_single_2b_t1_port_0: + - b_single_2b_b_single_2b_t1_port_0 + - network.incoming.bytes.rate endpoint_b_single_2b: - b_single_2b - endpoint @@ -393,6 +387,9 @@ topology_template: disk.device.write.bytes_b_single_2b: - b_single_2b - disk.device.write.bytes + network.incoming.packets.rate_b_single_2b_b_single_2b_t1_port_0: + - b_single_2b_b_single_2b_t1_port_0 + - network.incoming.packets.rate scalable_b_single_2b: - b_single_2b - scalable @@ -405,37 +402,40 @@ topology_template: disk.device.usage_b_single_2b: - b_single_2b - disk.device.usage + network.outpoing.packets_b_single_2b_b_single_2b_t2_port_0: + - b_single_2b_b_single_2b_t2_port_0 + - network.outpoing.packets disk.device.write.requests.rate_b_single_2b: - b_single_2b - disk.device.write.requests.rate cpu_b_single_2b: - b_single_2b - cpu + network.outgoing.packets.rate_b_single_2b_b_single_2b_t1_port_0: + - b_single_2b_b_single_2b_t1_port_0 + - network.outgoing.packets.rate disk.read.bytes.rate_b_single_2b: - b_single_2b - disk.read.bytes.rate - network.incoming.bytes_b_single_2b_1b_t2_port: - - b_single_2b_1b_t2_port - - network.incoming.bytes - network.outgoing.bytes.rate_b_single_2b_1b_t1_port: - - b_single_2b_1b_t1_port - - network.outgoing.bytes.rate + network.outgoing.bytes_b_single_2b_b_single_2b_t1_port_0: + - b_single_2b_b_single_2b_t1_port_0 + - network.outgoing.bytes requirements: local_storage_b_single_2b: - b_single_2b - local_storage + dependency_b_single_2b_b_single_2b_t2_port_0: + - b_single_2b_b_single_2b_t2_port_0 + - dependency dependency_b_single_2b: - b_single_2b - dependency - link_b_single_2b_1b_t2_port: - - b_single_2b_1b_t2_port - - link - link_b_single_2b_1b_t1_port: - - b_single_2b_1b_t1_port - - link - dependency_b_single_2b_1b_t2_port: - - b_single_2b_1b_t2_port + dependency_b_single_2b_b_single_2b_t1_port_0: + - b_single_2b_b_single_2b_t1_port_0 - dependency - dependency_b_single_2b_1b_t1_port: - - b_single_2b_1b_t1_port - - dependency
\ No newline at end of file + link_b_single_2b_b_single_2b_t2_port_0: + - b_single_2b_b_single_2b_t2_port_0 + - link + link_b_single_2b_b_single_2b_t1_port_0: + - b_single_2b_b_single_2b_t1_port_0 + - link
\ No newline at end of file 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 25a923862c..cf13bf47d0 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 @@ -11,19 +11,21 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_1b_t1_port_order: - type: integer + port_b_single_2b_t2_port_0_network_role: + type: string required: true - port_1b_t1_port_network_role: + vm_flavor_name: type: string required: true - port_1b_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_b_single_2b_t1_port_0_ip_requirements: + type: list required: true - vm_flavor_name: + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_b_single_2b_t1_port_0_network_role_tag: type: string required: true - port_1b_t2_port_related_networks: + port_b_single_2b_t2_port_0_related_networks: type: list required: true entry_schema: @@ -33,47 +35,41 @@ topology_template: required: true entry_schema: type: json - port_1b_t1_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements vm_image_name: type: string required: true + port_b_single_2b_t2_port_0_subnetpoolid: + type: string + required: true + port_b_single_2b_t2_port_0_network: + type: list + required: true + entry_schema: + type: string compute_b_single_2b_scheduler_hints: type: list required: true entry_schema: type: json - port_1b_t2_port_network_role: - type: string - required: true - port_1b_t2_port_order: - type: integer - required: true - port_1b_t2_port_exCP_naming: + port_b_single_2b_t1_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_1b_t2_port_network_role_tag: - type: string - required: true - port_1b_t2_port_subnetpoolid: - type: string + port_b_single_2b_t1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_1b_t1_port_related_networks: - type: list + port_b_single_2b_t2_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_b_single_2b_availability_zone: type: list required: true entry_schema: type: string - port_1b_t2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_b_single_2b_t1_port_0_vlan_requirements: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -81,45 +77,49 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_1b_t2_port_vlan_requirements: + compute_b_single_2b_name: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_1b_t2_port_ip_requirements: + type: string + port_b_single_2b_t1_port_0_order: + type: integer + required: true + port_b_single_2b_t2_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_b_single_2b_t2_port_0_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - compute_b_single_2b_name: + compute_b_single_2b_user_data_format: type: list required: true entry_schema: type: string - compute_b_single_2b_user_data_format: + port_b_single_2b_t2_port_0_vlan_requirements: type: list required: true entry_schema: - type: string - port_1b_t1_port_network_role_tag: - type: string + type: org.openecomp.datatypes.network.VlanRequirements + port_b_single_2b_t1_port_0_related_networks: + type: list required: true - port_1b_t1_port_subnetpoolid: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_b_single_2b_t1_port_0_network_role: type: string required: true - port_1b_t1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_b_single_2b_t2_port_0_order: + type: integer required: true - port_1b_t2_port_network: - type: list + port_b_single_2b_t1_port_0_subnetpoolid: + type: string required: true - entry_schema: - type: string - port_1b_t1_port_vlan_requirements: - type: list + port_b_single_2b_t2_port_0_network_role_tag: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements node_templates: b_single_2b: type: org.openecomp.resource.vfc.compute.nodes.heat.b_single_2b @@ -148,28 +148,28 @@ topology_template: get_input: - compute_b_single_2b_user_data_format - index_value - b_single_2b_1b_t1_port: + b_single_2b_b_single_2b_t1_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_1b_t1_port_exCP_naming + get_input: port_b_single_2b_t1_port_0_exCP_naming vlan_requirements: - get_input: port_1b_t1_port_vlan_requirements + get_input: port_b_single_2b_t1_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_1b_t1_port_related_networks + get_input: port_b_single_2b_t1_port_0_related_networks ip_requirements: - get_input: port_1b_t1_port_ip_requirements + get_input: port_b_single_2b_t1_port_0_ip_requirements network_role_tag: - get_input: port_1b_t1_port_network_role_tag + get_input: port_b_single_2b_t1_port_0_network_role_tag mac_requirements: - get_input: port_1b_t1_port_mac_requirements + get_input: port_b_single_2b_t1_port_0_mac_requirements order: - get_input: port_1b_t1_port_order + get_input: port_b_single_2b_t1_port_0_order network_role: - get_input: port_1b_t1_port_network_role + get_input: port_b_single_2b_t1_port_0_network_role subnetpoolid: - get_input: port_1b_t1_port_subnetpoolid + get_input: port_b_single_2b_t1_port_0_subnetpoolid network: get_attribute: - b_single_2b @@ -179,31 +179,31 @@ topology_template: capability: tosca.capabilities.network.Bindable node: b_single_2b relationship: tosca.relationships.network.BindsTo - b_single_2b_1b_t2_port: + b_single_2b_b_single_2b_t2_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_1b_t2_port_exCP_naming + get_input: port_b_single_2b_t2_port_0_exCP_naming vlan_requirements: - get_input: port_1b_t2_port_vlan_requirements + get_input: port_b_single_2b_t2_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_1b_t2_port_related_networks + get_input: port_b_single_2b_t2_port_0_related_networks ip_requirements: - get_input: port_1b_t2_port_ip_requirements + get_input: port_b_single_2b_t2_port_0_ip_requirements network_role_tag: - get_input: port_1b_t2_port_network_role_tag + get_input: port_b_single_2b_t2_port_0_network_role_tag mac_requirements: - get_input: port_1b_t2_port_mac_requirements + get_input: port_b_single_2b_t2_port_0_mac_requirements order: - get_input: port_1b_t2_port_order + get_input: port_b_single_2b_t2_port_0_order network_role: - get_input: port_1b_t2_port_network_role + get_input: port_b_single_2b_t2_port_0_network_role subnetpoolid: - get_input: port_1b_t2_port_subnetpoolid + get_input: port_b_single_2b_t2_port_0_subnetpoolid network: get_input: - - port_1b_t2_port_network + - port_b_single_2b_t2_port_0_network - index_value requirements: - binding: @@ -223,18 +223,12 @@ topology_template: disk.usage_b_single_2b: - b_single_2b - disk.usage - forwarder_b_single_2b_1b_t2_port: - - b_single_2b_1b_t2_port - - forwarder - network.incoming.bytes.rate_b_single_2b_1b_t2_port: - - b_single_2b_1b_t2_port - - network.incoming.bytes.rate - network.outgoing.bytes.rate_b_single_2b_1b_t2_port: - - b_single_2b_1b_t2_port - - network.outgoing.bytes.rate - attachment_b_single_2b_1b_t2_port: - - b_single_2b_1b_t2_port - - attachment + feature_b_single_2b_b_single_2b_t1_port_0: + - b_single_2b_b_single_2b_t1_port_0 + - feature + feature_b_single_2b_b_single_2b_t2_port_0: + - b_single_2b_b_single_2b_t2_port_0 + - feature disk.write.bytes.rate_b_single_2b: - b_single_2b - disk.write.bytes.rate @@ -250,30 +244,30 @@ topology_template: disk.device.write.requests_b_single_2b: - b_single_2b - disk.device.write.requests - network.incoming.packets.rate_b_single_2b_1b_t2_port: - - b_single_2b_1b_t2_port - - network.incoming.packets.rate disk.read.bytes_b_single_2b: - b_single_2b - disk.read.bytes - forwarder_b_single_2b_1b_t1_port: - - b_single_2b_1b_t1_port - - forwarder + network.incoming.bytes_b_single_2b_b_single_2b_t2_port_0: + - b_single_2b_b_single_2b_t2_port_0 + - network.incoming.bytes + network.incoming.bytes_b_single_2b_b_single_2b_t1_port_0: + - b_single_2b_b_single_2b_t1_port_0 + - network.incoming.bytes disk.device.iops_b_single_2b: - b_single_2b - disk.device.iops disk.ephemeral.size_b_single_2b: - b_single_2b - disk.ephemeral.size - network.incoming.bytes.rate_b_single_2b_1b_t1_port: - - b_single_2b_1b_t1_port - - network.incoming.bytes.rate - network.incoming.bytes_b_single_2b_1b_t1_port: - - b_single_2b_1b_t1_port - - network.incoming.bytes + network.outgoing.packets.rate_b_single_2b_b_single_2b_t2_port_0: + - b_single_2b_b_single_2b_t2_port_0 + - network.outgoing.packets.rate disk.write.requests.rate_b_single_2b: - b_single_2b - disk.write.requests.rate + network.incoming.bytes.rate_b_single_2b_b_single_2b_t2_port_0: + - b_single_2b_b_single_2b_t2_port_0 + - network.incoming.bytes.rate feature_b_single_2b: - b_single_2b - feature @@ -283,66 +277,69 @@ topology_template: disk.write.requests_b_single_2b: - b_single_2b - disk.write.requests - network.outgoing.packets.rate_b_single_2b_1b_t2_port: - - b_single_2b_1b_t2_port - - network.outgoing.packets.rate + forwarder_b_single_2b_b_single_2b_t1_port_0: + - b_single_2b_b_single_2b_t1_port_0 + - forwarder disk.capacity_b_single_2b: - b_single_2b - disk.capacity disk.device.read.bytes_b_single_2b: - b_single_2b - disk.device.read.bytes - network.incoming.packets.rate_b_single_2b_1b_t1_port: - - b_single_2b_1b_t1_port + network.incoming.packets.rate_b_single_2b_b_single_2b_t2_port_0: + - b_single_2b_b_single_2b_t2_port_0 - network.incoming.packets.rate - attachment_b_single_2b_1b_t1_port: - - b_single_2b_1b_t1_port - - attachment disk.write.bytes_b_single_2b: - b_single_2b - disk.write.bytes - network.incoming.packets_b_single_2b_1b_t2_port: - - b_single_2b_1b_t2_port - - network.incoming.packets + binding_b_single_2b_b_single_2b_t2_port_0: + - b_single_2b_b_single_2b_t2_port_0 + - binding + network.outpoing.packets_b_single_2b_b_single_2b_t1_port_0: + - b_single_2b_b_single_2b_t1_port_0 + - network.outpoing.packets vcpus_b_single_2b: - b_single_2b - vcpus + network.outgoing.bytes_b_single_2b_b_single_2b_t2_port_0: + - b_single_2b_b_single_2b_t2_port_0 + - network.outgoing.bytes disk.device.read.requests.rate_b_single_2b: - b_single_2b - disk.device.read.requests.rate - binding_b_single_2b_1b_t2_port: - - b_single_2b_1b_t2_port - - binding instance_b_single_2b: - b_single_2b - instance - network.outpoing.packets_b_single_2b_1b_t2_port: - - b_single_2b_1b_t2_port - - network.outpoing.packets + network.incoming.packets_b_single_2b_b_single_2b_t2_port_0: + - b_single_2b_b_single_2b_t2_port_0 + - network.incoming.packets disk.device.read.requests_b_single_2b: - b_single_2b - disk.device.read.requests + network.incoming.packets_b_single_2b_b_single_2b_t1_port_0: + - b_single_2b_b_single_2b_t1_port_0 + - network.incoming.packets + network.outgoing.bytes.rate_b_single_2b_b_single_2b_t2_port_0: + - b_single_2b_b_single_2b_t2_port_0 + - network.outgoing.bytes.rate disk.device.latency_b_single_2b: - b_single_2b - disk.device.latency - network.outgoing.bytes_b_single_2b_1b_t2_port: - - b_single_2b_1b_t2_port - - network.outgoing.bytes disk.device.allocation_b_single_2b: - b_single_2b - disk.device.allocation disk.latency_b_single_2b: - b_single_2b - disk.latency - feature_b_single_2b_1b_t1_port: - - b_single_2b_1b_t1_port - - feature disk.device.read.bytes.rate_b_single_2b: - b_single_2b - disk.device.read.bytes.rate - network.outpoing.packets_b_single_2b_1b_t1_port: - - b_single_2b_1b_t1_port - - network.outpoing.packets + attachment_b_single_2b_b_single_2b_t2_port_0: + - b_single_2b_b_single_2b_t2_port_0 + - attachment + attachment_b_single_2b_b_single_2b_t1_port_0: + - b_single_2b_b_single_2b_t1_port_0 + - attachment disk.device.write.bytes.rate_b_single_2b: - b_single_2b - disk.device.write.bytes.rate @@ -352,33 +349,30 @@ topology_template: memory_b_single_2b: - b_single_2b - memory - network.outgoing.packets.rate_b_single_2b_1b_t1_port: - - b_single_2b_1b_t1_port - - network.outgoing.packets.rate + network.outgoing.bytes.rate_b_single_2b_b_single_2b_t1_port_0: + - b_single_2b_b_single_2b_t1_port_0 + - network.outgoing.bytes.rate binding_b_single_2b: - b_single_2b - binding - network.incoming.packets_b_single_2b_1b_t1_port: - - b_single_2b_1b_t1_port - - network.incoming.packets - network.outgoing.bytes_b_single_2b_1b_t1_port: - - b_single_2b_1b_t1_port - - network.outgoing.bytes - binding_b_single_2b_1b_t1_port: - - b_single_2b_1b_t1_port - - binding - feature_b_single_2b_1b_t2_port: - - b_single_2b_1b_t2_port - - feature os_b_single_2b: - b_single_2b - os + binding_b_single_2b_b_single_2b_t1_port_0: + - b_single_2b_b_single_2b_t1_port_0 + - binding + forwarder_b_single_2b_b_single_2b_t2_port_0: + - b_single_2b_b_single_2b_t2_port_0 + - forwarder disk.root.size_b_single_2b: - b_single_2b - disk.root.size disk.read.requests_b_single_2b: - b_single_2b - disk.read.requests + network.incoming.bytes.rate_b_single_2b_b_single_2b_t1_port_0: + - b_single_2b_b_single_2b_t1_port_0 + - network.incoming.bytes.rate endpoint_b_single_2b: - b_single_2b - endpoint @@ -388,6 +382,9 @@ topology_template: disk.device.write.bytes_b_single_2b: - b_single_2b - disk.device.write.bytes + network.incoming.packets.rate_b_single_2b_b_single_2b_t1_port_0: + - b_single_2b_b_single_2b_t1_port_0 + - network.incoming.packets.rate scalable_b_single_2b: - b_single_2b - scalable @@ -400,37 +397,40 @@ topology_template: disk.device.usage_b_single_2b: - b_single_2b - disk.device.usage + network.outpoing.packets_b_single_2b_b_single_2b_t2_port_0: + - b_single_2b_b_single_2b_t2_port_0 + - network.outpoing.packets disk.device.write.requests.rate_b_single_2b: - b_single_2b - disk.device.write.requests.rate cpu_b_single_2b: - b_single_2b - cpu + network.outgoing.packets.rate_b_single_2b_b_single_2b_t1_port_0: + - b_single_2b_b_single_2b_t1_port_0 + - network.outgoing.packets.rate disk.read.bytes.rate_b_single_2b: - b_single_2b - disk.read.bytes.rate - network.incoming.bytes_b_single_2b_1b_t2_port: - - b_single_2b_1b_t2_port - - network.incoming.bytes - network.outgoing.bytes.rate_b_single_2b_1b_t1_port: - - b_single_2b_1b_t1_port - - network.outgoing.bytes.rate + network.outgoing.bytes_b_single_2b_b_single_2b_t1_port_0: + - b_single_2b_b_single_2b_t1_port_0 + - network.outgoing.bytes requirements: local_storage_b_single_2b: - b_single_2b - local_storage + dependency_b_single_2b_b_single_2b_t2_port_0: + - b_single_2b_b_single_2b_t2_port_0 + - dependency dependency_b_single_2b: - b_single_2b - dependency - link_b_single_2b_1b_t2_port: - - b_single_2b_1b_t2_port - - link - link_b_single_2b_1b_t1_port: - - b_single_2b_1b_t1_port - - link - dependency_b_single_2b_1b_t2_port: - - b_single_2b_1b_t2_port + dependency_b_single_2b_b_single_2b_t1_port_0: + - b_single_2b_b_single_2b_t1_port_0 - dependency - dependency_b_single_2b_1b_t1_port: - - b_single_2b_1b_t1_port - - dependency
\ No newline at end of file + link_b_single_2b_b_single_2b_t2_port_0: + - b_single_2b_b_single_2b_t2_port_0 + - link + link_b_single_2b_b_single_2b_t1_port_0: + - b_single_2b_b_single_2b_t1_port_0 + - link
\ No newline at end of file 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_pcma_server_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_pcma_server_1ServiceTemplate.yaml index a149bdc39c..25ffdd165b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_pcma_server_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_pcma_server_1ServiceTemplate.yaml @@ -11,14 +11,14 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_pcm_port_0_network_role: - type: string - required: true port_pcm_port_1_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pcm_port_0_network_role: + type: string + required: true port_pcm_port_1_network_role_tag: type: string required: true @@ -65,10 +65,10 @@ topology_template: port_pcm_port_0_network_role_tag: type: string required: true - port_pcm_port_0_exCP_naming: + port_pcm_port_1_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_pcm_port_1_exCP_naming: + port_pcm_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true port_pcm_port_1_network_role: @@ -79,16 +79,16 @@ topology_template: required: true entry_schema: type: string - port_pcm_port_0_ip_requirements: + port_pcm_port_1_security_groups: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pcm_port_1_security_groups: + type: json + port_pcm_port_0_ip_requirements: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements compute_pcma_server_config_drive: type: list required: true @@ -129,14 +129,14 @@ topology_template: required: true entry_schema: type: string - port_pcm_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true port_pcm_port_1_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_pcm_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true port_pcm_port_1_order: type: integer 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-no_vfc_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-no_vfc_v0.1ServiceTemplate.yaml index 394046886b..06c80bf68b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-no_vfc_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-no_vfc_v0.1ServiceTemplate.yaml @@ -127,14 +127,14 @@ topology_template: port_pcm_port_0_network_role_tag: cps port_pcm_port_1_network: - get_input: oam_net_name + port_pcm_port_1_security_groups: + - - get_input: security_group_name port_pcm_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_pcm_port_1_security_groups: - - - get_input: security_group_name compute_pcma_server_config_drive: - true compute_pcma_server_user_data_format: @@ -149,15 +149,15 @@ topology_template: get_input: oam_net_ip compute_pcma_server_name: - get_input: pcma_server_name - port_pcm_port_0_mac_requirements: - mac_count_required: - is_required: false port_pcm_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false + port_pcm_port_0_mac_requirements: + mac_count_required: + is_required: false service_template_filter: substitute_service_template: Nested_pcma_server_1ServiceTemplate.yaml count: 1 @@ -669,4 +669,4 @@ topology_template: - dependency_pcma_server_pcm_port_1 dependency_pcm_port_2: - abstract_pcma_server - - dependency_pcma_server_pcm_port_2 + - dependency_pcma_server_pcm_port_2
\ No newline at end of file |