diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface')
4 files changed, 272 insertions, 272 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/in/main.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/in/main.yml index 5d2410ce66..490ae7caf5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/in/main.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/in/main.yml @@ -154,7 +154,7 @@ resources: name: get_param: vdbe_name_2 networks: - - port: {get_resource: vdbe_untr_port_2} + - port: {get_resource: vdbe_1_untr_port_1} vdbe_untr_port_1: type: OS::ContrailV2::VirtualMachineInterface properties: @@ -198,7 +198,7 @@ resources: virtual_network_refs: - get_resource: control_int_net - vdbe_untr_port_2: + vdbe_1_untr_port_1: type: OS::ContrailV2::VirtualMachineInterface properties: name: Untr_Port_2 @@ -310,7 +310,7 @@ resources: mac_address: get_param: vdbe_hw_untr_mac_1 parent_interface: - get_resource: vdbe_untr_port_2 + get_resource: vdbe_1_untr_port_1 subinterfaces_name_prefix: str_replace: params: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml index 27074c4f90..7ac84b0fcf 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,10 +8,6 @@ node_types: org.openecomp.resource.abstract.nodes.vdbe: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_vdbe_untr_port_network_role_tag: - type: string - required: true - status: SUPPORTED subinterface_nested_parent_interface: type: list required: true @@ -30,8 +26,8 @@ node_types: status: SUPPORTED entry_schema: type: json - port_vdbe_untr_port_subnetpoolid: - type: string + port_vdbe_untr_port_1_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs required: true status: SUPPORTED compute_vdbe_availability_zone: @@ -52,12 +48,28 @@ node_types: status: SUPPORTED entry_schema: type: string + port_vdbe_untr_port_1_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_vdbe_untr_port_1_network_role: + type: string + required: true + status: SUPPORTED vm_flavor_name: type: string required: true status: SUPPORTED - port_vdbe_untr_port_order: - type: integer + port_vdbe_untr_port_1_virtual_machine_interface_mac_addresses: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_vdbe_untr_port_1_network_role_tag: + type: string required: true status: SUPPORTED subinterface_nested_aap_untrusted_ip_prefix: @@ -66,12 +78,12 @@ node_types: status: SUPPORTED entry_schema: type: string - vm_image_name: - type: string + port_vdbe_untr_port_1_order: + type: integer required: true status: SUPPORTED - port_vdbe_untr_port_exCP_naming: - type: org.openecomp.datatypes.Naming + vm_image_name: + type: string required: true status: SUPPORTED subinterface_nested_aap_sec_untrusted_ip_prefix_len: @@ -104,32 +116,42 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs - required: true - status: SUPPORTED subinterface_nested_ip_address: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_virtual_network_refs: + port_vdbe_untr_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested_ip_v6_address: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_mac_requirements: + port_vdbe_untr_port_1_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_port_1_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_vdbe_untr_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED + port_vdbe_untr_port_1_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 @@ -150,28 +172,12 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_name: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_vdbe_untr_port_vlan_requirements: + port_vdbe_untr_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_vdbe_untr_port_network_role: - type: string - required: true - status: SUPPORTED - port_vdbe_untr_port_virtual_machine_interface_mac_addresses: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json subinterface_nested_aap_untrusted_ip_prefix_len: type: list required: true @@ -208,76 +214,68 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_related_networks: + port_vdbe_untr_port_1_virtual_network_refs: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_vdbe_untr_port_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: json requirements: - - dependency_vdbe: + - dependency_vdbe_vdbe_untr_port_1_nested: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_vdbe: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: - - 0 - - UNBOUNDED - - dependency_vdbe_vdbe_untr_port: + - dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_port_1_nested: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_vdbe_vdbe_untr_port: + - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_port_1_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_vdbe_vdbe_untr_port_nested: + - dependency_vdbe: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_port_nested: + - local_storage_vdbe: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED + - dependency_vdbe_vdbe_untr_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_port_nested: + - link_vdbe_vdbe_untr_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - network.outgoing.packets.rate_vdbe_vdbe_untr_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_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_port_1_nested: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_vdbe_vdbe_untr_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_vdbe_vdbe_untr_port_1: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -286,11 +284,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_vdbe_vdbe_untr_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.iops_vdbe: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -338,13 +331,24 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_vdbe_vdbe_untr_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.write.bytes.rate_vdbe: 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_vdbe_vdbe_untr_port: + network.incoming.bytes.rate_vdbe_vdbe_untr_port_1: + 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_vdbe_vdbe_untr_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -367,37 +371,37 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.capacity_vdbe: + network.outgoing.packets.rate_vdbe_vdbe_untr_port_1: 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_vdbe: + disk.device.capacity_vdbe: 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_vdbe: + network.outgoing.bytes_vdbe_vdbe_untr_port_1: 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_vdbe: + disk.device.allocation_vdbe: 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_vdbe_vdbe_untr_port: + disk.usage_vdbe: 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_vdbe_vdbe_untr_port: + memory.usage_vdbe: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -409,17 +413,7 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_vdbe_vdbe_untr_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_port_nested: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - binding_vdbe_vdbe_untr_port: + binding_vdbe_vdbe_untr_port_1: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -427,13 +421,19 @@ node_types: occurrences: - 0 - UNBOUNDED + network.incoming.bytes_vdbe_vdbe_untr_port_1: + 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_vdbe: 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_vdbe_vdbe_untr_port: + network.outgoing.bytes.rate_vdbe_vdbe_untr_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -463,11 +463,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_vdbe_vdbe_untr_port_nested: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.write.requests.rate_vdbe: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -504,12 +499,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_vdbe_vdbe_untr_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.capacity_vdbe: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -529,17 +518,34 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_vdbe_vdbe_untr_port_1: + 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_vdbe: 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_vdbe_vdbe_untr_port_1: + 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_vdbe: type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED + feature_vdbe_vdbe_untr_port_1_nested: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.device.read.requests_vdbe: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -581,12 +587,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_vdbe_vdbe_untr_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 org.openecomp.resource.abstract.nodes.heat.subinterface.nested: derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute properties: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/MainServiceTemplate.yaml index 60c5fb643a..f5c296dd4f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/MainServiceTemplate.yaml @@ -488,7 +488,7 @@ topology_template: properties: subinterface_nested_parent_interface: - vdbe_untr_port_1 - - vdbe_untr_port_2 + - vdbe_1_untr_port_1 subinterface_nested_aap_address_mode: - get_input: aap_address_mode - get_input: aap_address_mode @@ -501,8 +501,14 @@ topology_template: subinterface_nested_aap_untrusted_v6_ip_prefix_len: - get_input: vdbe_aap_untrusted_v6_ip_prefix_len - get_input: vdbe_aap_untrusted_v6_ip_prefix_len + port_vdbe_untr_port_1_name: + - Untr_Port_1 + - Untr_Port_2 vm_flavor_name: get_input: vdbe_flavor_name + port_vdbe_untr_port_1_virtual_machine_interface_mac_addresses: + - - get_input: vdbe_hw_untr_mac_1 + - - get_input: vdbe_hw_untr_mac_1 subinterface_nested_aap_untrusted_ip_prefix: - get_input: vdbe_aap_untrusted_ip_prefix - get_input: vdbe_aap_untrusted_ip_prefix @@ -536,9 +542,6 @@ topology_template: subinterface_nested_ip_address: - get_input: vdbe_untrusted_ip_1 - get_input: vdbe_untrusted_ip_1 - port_vdbe_untr_port_virtual_network_refs: - - - control_int_net - - - control_int_net subinterface_nested_ip_v6_address: - get_input: vdbe_untrusted_v6_ip_1 - get_input: vdbe_untrusted_v6_ip_1 @@ -548,12 +551,6 @@ topology_template: subinterface_nested_vn_network_list: - get_input: untrusted_vn_networks - get_input: untrusted_vn_networks - port_vdbe_untr_port_name: - - Untr_Port_1 - - Untr_Port_2 - port_vdbe_untr_port_virtual_machine_interface_mac_addresses: - - - get_input: vdbe_hw_untr_mac_1 - - - get_input: vdbe_hw_untr_mac_1 subinterface_nested_aap_untrusted_ip_prefix_len: - get_input: vdbe_aap_untrusted_ip_prefix_len - get_input: vdbe_aap_untrusted_ip_prefix_len @@ -584,6 +581,9 @@ topology_template: subinterface_nested_optional_property_2: - null - OPTIONAL_VALUE_SUBPORT_2 + port_vdbe_untr_port_1_virtual_network_refs: + - - control_int_net + - - control_int_net service_template_filter: substitute_service_template: Nested_vdbeServiceTemplate.yaml count: 2 @@ -593,7 +593,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_vdbe_vdbe_untr_port: + - link_vdbe_vdbe_untr_port_1: capability: tosca.capabilities.network.Linkable node: control_int_net relationship: tosca.relationships.network.LinksTo @@ -606,4 +606,4 @@ topology_template: Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - control_int_net - - abstract_vdbe + - abstract_vdbe
\ 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/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/Nested_vdbeServiceTemplate.yaml index c25df79fc7..b04f04dd3d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/Nested_vdbeServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/Nested_vdbeServiceTemplate.yaml @@ -11,9 +11,6 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_vdbe_untr_port_network_role_tag: - type: string - required: true subinterface_nested_parent_interface: type: list required: true @@ -29,8 +26,8 @@ topology_template: required: true entry_schema: type: json - port_vdbe_untr_port_subnetpoolid: - type: string + port_vdbe_untr_port_1_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs required: true compute_vdbe_availability_zone: type: list @@ -47,23 +44,36 @@ topology_template: required: true entry_schema: type: string + port_vdbe_untr_port_1_name: + type: list + required: true + entry_schema: + type: string + port_vdbe_untr_port_1_network_role: + type: string + required: true vm_flavor_name: type: string required: true - port_vdbe_untr_port_order: - type: integer + port_vdbe_untr_port_1_virtual_machine_interface_mac_addresses: + type: list + required: true + entry_schema: + type: json + port_vdbe_untr_port_1_network_role_tag: + type: string required: true subinterface_nested_aap_untrusted_ip_prefix: type: list required: true entry_schema: type: string + port_vdbe_untr_port_1_order: + type: integer + required: true vm_image_name: type: string required: true - port_vdbe_untr_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true subinterface_nested_aap_sec_untrusted_ip_prefix_len: type: list required: true @@ -89,27 +99,35 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_port_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs - required: true subinterface_nested_ip_address: type: list required: true entry_schema: type: string - port_vdbe_untr_port_virtual_network_refs: + port_vdbe_untr_port_1_related_networks: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested_ip_v6_address: type: list required: true entry_schema: type: string - port_vdbe_untr_port_mac_requirements: + port_vdbe_untr_port_1_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_port_1_subnetpoolid: + type: string + required: true + port_vdbe_untr_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true + port_vdbe_untr_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -127,24 +145,11 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_port_name: - type: list - required: true - entry_schema: - type: string - port_vdbe_untr_port_vlan_requirements: + port_vdbe_untr_port_1_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_vdbe_untr_port_network_role: - type: string - required: true - port_vdbe_untr_port_virtual_machine_interface_mac_addresses: - type: list - required: true - entry_schema: - type: json subinterface_nested_aap_untrusted_ip_prefix_len: type: list required: true @@ -175,80 +180,13 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_port_related_networks: + port_vdbe_untr_port_1_virtual_network_refs: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_vdbe_untr_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: json node_templates: - vdbe: - type: org.openecomp.resource.vfc.compute.nodes.heat.vdbe - properties: - availability_zone: - get_input: - - compute_vdbe_availability_zone - - index_value - flavor: - get_input: vm_flavor_name - metadata: - get_input: - - compute_vdbe_metadata - - index_value - image: - get_input: vm_image_name - name: - get_input: - - compute_vdbe_name - - index_value - vdbe_vdbe_untr_port: - type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface - properties: - mac_requirements: - get_input: port_vdbe_untr_port_mac_requirements - order: - get_input: port_vdbe_untr_port_order - exCP_naming: - get_input: port_vdbe_untr_port_exCP_naming - virtual_machine_interface_allowed_address_pairs: - get_input: - - port_vdbe_untr_port_virtual_machine_interface_allowed_address_pairs - - index_value - vlan_requirements: - get_input: port_vdbe_untr_port_vlan_requirements - subinterface_indicator: true - related_networks: - get_input: port_vdbe_untr_port_related_networks - virtual_network_refs: - get_input: - - port_vdbe_untr_port_virtual_network_refs - - index_value - ip_requirements: - get_input: port_vdbe_untr_port_ip_requirements - network_role_tag: - get_input: port_vdbe_untr_port_network_role_tag - virtual_machine_interface_mac_addresses: - get_input: - - port_vdbe_untr_port_virtual_machine_interface_mac_addresses - - index_value - network_role: - get_input: port_vdbe_untr_port_network_role - subnetpoolid: - get_input: port_vdbe_untr_port_subnetpoolid - name: - get_input: - - port_vdbe_untr_port_name - - index_value - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: vdbe - relationship: tosca.relationships.network.BindsTo - vdbe_vdbe_untr_port_nested: + vdbe_vdbe_untr_port_1_nested: type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested directives: - substitutable @@ -334,23 +272,82 @@ topology_template: requirements: - binding_vdbe_untr_x_vlan1-Network-Role_vmi_subport: capability: tosca.capabilities.network.Bindable - node: vdbe_vdbe_untr_port + node: vdbe_vdbe_untr_port_1 + relationship: tosca.relationships.network.BindsTo + vdbe: + type: org.openecomp.resource.vfc.compute.nodes.heat.vdbe + properties: + availability_zone: + get_input: + - compute_vdbe_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + metadata: + get_input: + - compute_vdbe_metadata + - index_value + image: + get_input: vm_image_name + name: + get_input: + - compute_vdbe_name + - index_value + vdbe_vdbe_untr_port_1: + type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface + properties: + mac_requirements: + get_input: port_vdbe_untr_port_1_mac_requirements + order: + get_input: port_vdbe_untr_port_1_order + exCP_naming: + get_input: port_vdbe_untr_port_1_exCP_naming + virtual_machine_interface_allowed_address_pairs: + get_input: + - port_vdbe_untr_port_1_virtual_machine_interface_allowed_address_pairs + - index_value + vlan_requirements: + get_input: port_vdbe_untr_port_1_vlan_requirements + subinterface_indicator: true + related_networks: + get_input: port_vdbe_untr_port_1_related_networks + virtual_network_refs: + get_input: + - port_vdbe_untr_port_1_virtual_network_refs + - index_value + ip_requirements: + get_input: port_vdbe_untr_port_1_ip_requirements + network_role_tag: + get_input: port_vdbe_untr_port_1_network_role_tag + virtual_machine_interface_mac_addresses: + get_input: + - port_vdbe_untr_port_1_virtual_machine_interface_mac_addresses + - index_value + network_role: + get_input: port_vdbe_untr_port_1_network_role + subnetpoolid: + get_input: port_vdbe_untr_port_1_subnetpoolid + name: + get_input: + - port_vdbe_untr_port_1_name + - index_value + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: vdbe relationship: tosca.relationships.network.BindsTo substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.vdbe capabilities: - network.outgoing.packets.rate_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.outgoing.packets.rate - network.outgoing.bytes_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.outgoing.bytes + feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_port_1_nested: + - vdbe_vdbe_untr_port_1_nested + - feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport + forwarder_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - forwarder feature_vdbe: - vdbe - feature - feature_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - feature disk.device.iops_vdbe: - vdbe - disk.device.iops @@ -375,12 +372,18 @@ topology_template: disk.device.write.requests.rate_vdbe: - vdbe - disk.device.write.requests.rate + feature_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - feature disk.write.bytes.rate_vdbe: - vdbe - disk.write.bytes.rate - network.incoming.packets_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.incoming.packets + network.incoming.bytes.rate_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.incoming.bytes.rate + network.incoming.packets.rate_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.incoming.packets.rate scalable_vdbe: - vdbe - scalable @@ -390,9 +393,15 @@ topology_template: disk.device.write.requests_vdbe: - vdbe - disk.device.write.requests + network.outgoing.packets.rate_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.outgoing.packets.rate disk.device.capacity_vdbe: - vdbe - disk.device.capacity + network.outgoing.bytes_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.outgoing.bytes disk.device.allocation_vdbe: - vdbe - disk.device.allocation @@ -402,30 +411,21 @@ topology_template: memory.usage_vdbe: - vdbe - memory.usage - network.outpoing.packets_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.outpoing.packets - network.outgoing.bytes.rate_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.outgoing.bytes.rate disk.read.requests_vdbe: - vdbe - disk.read.requests - forwarder_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - forwarder - feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_port_nested: - - vdbe_vdbe_untr_port_nested - - feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport - binding_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port + binding_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 - binding + network.incoming.bytes_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.incoming.bytes instance_vdbe: - vdbe - instance - network.incoming.bytes.rate_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.incoming.bytes.rate + network.outgoing.bytes.rate_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.outgoing.bytes.rate cpu.delta_vdbe: - vdbe - cpu.delta @@ -438,9 +438,6 @@ topology_template: memory.resident_vdbe: - vdbe - memory.resident - feature_vdbe_vdbe_untr_port_nested: - - vdbe_vdbe_untr_port_nested - - feature disk.write.requests.rate_vdbe: - vdbe - disk.write.requests.rate @@ -459,9 +456,6 @@ topology_template: disk.latency_vdbe: - vdbe - disk.latency - network.incoming.bytes_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.incoming.bytes disk.capacity_vdbe: - vdbe - disk.capacity @@ -471,12 +465,21 @@ topology_template: disk.allocation_vdbe: - vdbe - disk.allocation + network.outpoing.packets_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.outpoing.packets disk.read.bytes.rate_vdbe: - vdbe - disk.read.bytes.rate + network.incoming.packets_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.incoming.packets os_vdbe: - vdbe - os + feature_vdbe_vdbe_untr_port_1_nested: + - vdbe_vdbe_untr_port_1_nested + - feature disk.device.read.requests_vdbe: - vdbe - disk.device.read.requests @@ -498,28 +501,25 @@ topology_template: disk.read.bytes_vdbe: - vdbe - disk.read.bytes - network.incoming.packets.rate_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.incoming.packets.rate requirements: - dependency_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port + dependency_vdbe_vdbe_untr_port_1_nested: + - vdbe_vdbe_untr_port_1_nested - dependency - link_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port + dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_port_1_nested: + - vdbe_vdbe_untr_port_1_nested + - dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport + dependency_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - dependency + subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_port_1_nested: + - vdbe_vdbe_untr_port_1_nested + - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport + link_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 - link local_storage_vdbe: - vdbe - local_storage - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_port_nested: - - vdbe_vdbe_untr_port_nested - - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport - dependency_vdbe_vdbe_untr_port_nested: - - vdbe_vdbe_untr_port_nested - - dependency dependency_vdbe: - vdbe - - dependency - dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_port_nested: - - vdbe_vdbe_untr_port_nested - - dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport
\ No newline at end of file + - dependency
\ No newline at end of file |