diff options
author | 2017-06-09 02:39:56 +0300 | |
---|---|---|
committer | 2017-06-09 02:39:56 +0300 | |
commit | 280f8015d06af1f41a3ef12e8300801c7a5e0d54 (patch) | |
tree | 9c1d3978c04cd28068f02073038c936bb49ca9e0 /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources | |
parent | fd3821dad11780d33c5373d74c957c442489945e (diff) |
[SDC-29] Amdocs OnBoard 1707 initial commit.
Change-Id: Ie4d12a3f574008b792899b368a0902a8b46b5370
Signed-off-by: AviZi <avi.ziv@amdocs.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources')
6 files changed, 2892 insertions, 228 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/GlobalSubstitutionTypesServiceTemplate.yaml index 4814d1c086..bcb8046664 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/GlobalSubstitutionTypesServiceTemplate.yaml @@ -2,32 +2,8 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: GlobalSubstitutionTypes imports: - ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml - CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml - ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml - AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml - NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml - NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml - CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml - ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml - NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml - NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml - ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml +- openecomp_heat_index: + file: openecomp-heat/_index.yml node_types: org.openecomp.resource.abstract.nodes.heat.eca_oam: derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute @@ -35,140 +11,213 @@ node_types: metadata: type: string description: cmaui metadata + required: true + status: SUPPORTED oam_flavor: type: string description: OAM flavor name + required: false default: lc.xlarge4 + status: SUPPORTED eca_eca_mgmt_ips: type: list description: internal eca_mgmt network ips for eca VM + required: false default: - 172.25.137.242 - 172.25.137.243 + status: SUPPORTED entry_schema: type: string eca_mgmt_net_name: type: string description: the name of the internal network + required: false default: int_mms_eca_mgmt_net_1 + status: SUPPORTED ECA_OAM_volume_type: type: string description: the name of the target volume backend + required: false default: Platinum + status: SUPPORTED arb_eca_mgmt_ips: type: list description: internal eca_mgmt network ips for arb VM + required: false default: - 172.25.137.244 + status: SUPPORTED entry_schema: type: string networks: type: string description: cmaui network name + required: true + status: SUPPORTED cmaui_name: type: string description: cmaui name + required: true + status: SUPPORTED arb_volume_size: type: float description: the size of the ARB volume + required: false default: 40 + status: SUPPORTED vnf_id: type: string description: Unique ID for this VNF instance + required: false default: This_is_ths_MMSC-ECA_id + status: SUPPORTED availability_zone_0: type: string description: availabilityzone name + required: false default: nova + status: SUPPORTED oam_image_name: type: string description: the OAM image name + required: false default: ECABASE + status: SUPPORTED oam_volume_size: type: float description: the size of the OAM volume + required: false default: 1800 + status: SUPPORTED swift_eca_url: type: string description: Base URL for eca swift object store + required: false default: http://object-store.rdm2.cci.com:8080/v1/AUTH_1bbab536a19b4756926e7d0ec1eb543c/eca + status: SUPPORTED oam_net_name: type: string description: the name of the oam network + required: false default: oam_protected_net_0 + status: SUPPORTED ARB_volume_type: type: string description: the name of the target volume backend + required: false default: Platinum + status: SUPPORTED eca_names: type: list description: the names of the OAM1,OAM2 VM instances + required: false default: - ZRDM1MMSC02OAM001 - ZRDM1MMSC02OAM002 + status: SUPPORTED entry_schema: type: string arbiter_flavor: type: string description: arbiter flavor name + required: false default: m1.large2 + status: SUPPORTED eca_oam_ips: type: list description: the ips of oam networks for eca VM + required: false default: - 107.250.172.44 - 107.250.172.45 + status: SUPPORTED entry_schema: type: string security_group_name: type: string description: the name of security group + required: false default: mmsc_security_group_1 + status: SUPPORTED user_data: type: string description: cmaui user data + required: true + status: SUPPORTED cmaui_image: type: string description: cmaui image + required: true + status: SUPPORTED arb_names: type: list description: the names of the arbiter VM instances + required: false default: - ZRDM1MMSC02ARB001 + status: SUPPORTED entry_schema: type: string cmaui_flavor: type: string description: cmaui flavor name + required: true + status: SUPPORTED user_data_format: type: string description: cmaui user data + required: true + status: SUPPORTED eca_oam_gateway: type: string description: the ip of oam gateway + required: false default: 107.250.172.1 + status: SUPPORTED arb_oam_ips: type: list description: oam network ips for eca VM + required: false default: - 107.250.172.46 + status: SUPPORTED entry_schema: type: string requirements: + - dependency_arb_mgmt_port: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_arb_mgmt_port: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 + - dependency_oam2_mgmt_port: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_oam2_mgmt_port: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 + - dependency_arb_instance: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - local_storage_arb_instance: capability: tosca.capabilities.Attachment node: tosca.nodes.BlockStorage @@ -176,6 +225,20 @@ node_types: occurrences: - 0 - UNBOUNDED + - dependency_arb_volume: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - dependency_oam1_instance: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - local_storage_oam1_instance: capability: tosca.capabilities.Attachment node: tosca.nodes.BlockStorage @@ -183,34 +246,79 @@ node_types: occurrences: - 0 - UNBOUNDED + - dependency_oam2_volume: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - dependency_oam1_volume: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - dependency_oam1_int_port: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_oam1_int_port: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 + - dependency_oam1_mgmt_port: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_oam1_mgmt_port: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 + - dependency_arb_int_port: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_arb_int_port: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 + - dependency_oam2_int_port: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_oam2_int_port: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 + - dependency_oam2_instance: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - local_storage_oam2_instance: capability: tosca.capabilities.Attachment node: tosca.nodes.BlockStorage @@ -219,60 +327,301 @@ node_types: - 0 - UNBOUNDED capabilities: - attachment_oam2_volume: - type: tosca.capabilities.Attachment + disk.usage_arb_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_oam2_instance: - type: tosca.capabilities.network.Bindable + disk.capacity_arb_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_oam2_int_port: + disk.write.bytes.rate_oam1_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_oam1_int_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 + endpoint_oam2_instance: + type: tosca.capabilities.Endpoint.Admin + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_oam1_int_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_oam2_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_arb_mgmt_port: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED + feature_oam2_volume: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + memory.resident_arb_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.usage_oam1_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.allocation_oam2_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_oam1_int_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_oam2_mgmt_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 + feature_oam1_int_port: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_oam1_mgmt_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_oam1_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_arb_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_oam1_volume: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - os_oam1_instance: - type: tosca.capabilities.OperatingSystem + network.incoming.packets.rate_oam2_int_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_oam2_instance: - type: tosca.capabilities.Scalable + network.outgoing.bytes.rate_arb_int_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 + memory.usage_arb_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_oam2_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_oam1_mgmt_port: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.read.bytes.rate_arb_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_arb_mgmt_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 + binding_arb_mgmt_port: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + network.outpoing.packets_oam2_mgmt_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_oam2_mgmt_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_arb_int_port: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + disk.device.write.bytes_oam2_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_oam1_mgmt_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 + binding_oam1_mgmt_port: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED scalable_arb_instance: type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - endpoint_oam1_instance: - type: tosca.capabilities.Endpoint.Admin + cpu.delta_arb_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_arb_instance: + disk.usage_oam1_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_arb_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_oam1_mgmt_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_arb_int_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.bytes_oam1_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.iops_arb_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_oam2_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_oam2_instance: + type: tosca.capabilities.OperatingSystem + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes.rate_oam1_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_oam2_mgmt_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 + binding_oam2_instance: type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - host_arb_instance: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + network.outpoing.packets_oam1_int_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 - endpoint_arb_instance: - type: tosca.capabilities.Endpoint.Admin + network.incoming.bytes.rate_oam1_mgmt_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 + cpu_oam1_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.capacity_oam2_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_oam1_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 @@ -281,8 +630,15 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_arb_volume: - type: tosca.capabilities.Attachment + disk.iops_arb_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_oam1_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 @@ -293,13 +649,86 @@ node_types: occurrences: - 1 - UNBOUNDED - os_oam2_instance: - type: tosca.capabilities.OperatingSystem + network.incoming.bytes_arb_mgmt_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 - endpoint_oam2_instance: - type: tosca.capabilities.Endpoint.Admin + network.outgoing.bytes_arb_int_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.write.bytes_arb_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 + instance_arb_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.latency_oam1_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_oam2_int_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 + memory_oam1_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_arb_instance: + type: tosca.capabilities.network.Bindable + occurrences: + - 1 + - UNBOUNDED + feature_arb_volume: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.write.bytes_arb_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_oam1_int_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 + binding_oam1_int_port: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + disk.iops_oam1_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_arb_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 @@ -308,10 +737,236 @@ node_types: occurrences: - 1 - UNBOUNDED - host_oam2_instance: - type: tosca.capabilities.Container + disk.root.size_arb_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_oam2_int_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.rate_arb_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 + instance_oam1_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_oam1_instance: + type: tosca.capabilities.OperatingSystem + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_oam1_mgmt_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 + memory.usage_oam2_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.bytes.rate_oam2_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_oam2_mgmt_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 + binding_oam2_mgmt_port: + type: tosca.capabilities.network.Bindable valid_source_types: - - tosca.nodes.SoftwareComponent + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + network.outgoing.bytes.rate_oam2_mgmt_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.requests_arb_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.iops_oam2_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_oam1_mgmt_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_oam2_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.bytes_oam1_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_oam2_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.bytes.rate_oam2_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_oam1_mgmt_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.bytes_oam2_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 + cpu_arb_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.read.requests_oam1_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_arb_int_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_arb_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 + cpu.delta_oam2_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 + cpu_util_oam2_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.bytes.rate_arb_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_oam2_int_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_oam1_int_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.rate_oam2_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.allocation_oam1_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.capacity_oam1_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_oam2_int_port: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.device.allocation_oam1_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_arb_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_arb_int_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_oam2_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_oam2_int_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.bytes.rate_arb_int_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 @@ -320,22 +975,435 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_oam1_mgmt_port: + network.incoming.packets.rate_oam1_int_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 + feature_oam1_volume: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.write.bytes.rate_arb_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.capacity_arb_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_arb_int_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.usage_oam2_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_oam2_volume: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - attachment_arb_int_port: + disk.write.bytes.rate_oam2_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 + endpoint_oam1_instance: + type: tosca.capabilities.Endpoint.Admin + occurrences: + - 1 + - UNBOUNDED + disk.iops_oam2_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_arb_mgmt_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 + host_arb_instance: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent + occurrences: + - 1 + - UNBOUNDED + disk.device.write.requests.rate_oam2_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 + cpu_util_oam1_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.ephemeral.size_oam1_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_arb_int_port: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + network.outgoing.bytes_arb_mgmt_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_oam2_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_oam1_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_arb_instance: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.device.read.requests.rate_oam1_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_oam2_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_oam2_int_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.write.bytes.rate_arb_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_oam1_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.usage_arb_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.latency_arb_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_arb_int_port: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_oam2_mgmt_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_arb_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_oam1_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 + cpu.delta_oam1_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_oam2_mgmt_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.write.bytes.rate_oam1_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.iops_oam1_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_oam2_mgmt_port: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - attachment_arb_mgmt_port: + memory.usage_oam1_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.ephemeral.size_arb_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_oam1_instance: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.write.requests_arb_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.bytes_oam2_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.latency_oam2_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_arb_volume: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - attachment_oam2_mgmt_port: + network.outpoing.packets_arb_int_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_oam2_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.bytes_oam1_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_oam1_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.read.bytes_oam2_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.allocation_arb_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 + cpu_util_arb_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_arb_mgmt_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 + instance_oam2_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_oam2_instance: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + cpu_oam2_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_oam1_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_arb_mgmt_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_oam2_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.read.requests_oam2_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.bytes_arb_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 + host_oam2_instance: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent + occurrences: + - 1 + - UNBOUNDED + disk.device.write.requests.rate_arb_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_oam2_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 + scalable_oam2_instance: + type: tosca.capabilities.Scalable + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_oam1_int_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 + endpoint_arb_instance: + type: tosca.capabilities.Endpoint.Admin + occurrences: + - 1 + - UNBOUNDED + disk.device.capacity_oam1_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.latency_arb_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_arb_mgmt_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_oam1_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_arb_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.latency_oam1_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_arb_mgmt_port: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_oam2_mgmt_port: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + attachment_oam1_mgmt_port: type: tosca.capabilities.Attachment occurrences: - 1 @@ -344,4 +1412,64 @@ node_types: type: tosca.capabilities.network.Bindable occurrences: - 1 + - UNBOUNDED + attachment_oam2_int_port: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + disk.device.latency_oam2_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_oam2_int_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 + binding_oam2_int_port: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + disk.write.requests.rate_oam2_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_oam2_int_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_oam1_mgmt_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.ephemeral.size_oam2_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_arb_mgmt_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.write.requests_oam1_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
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/MainServiceTemplate.yaml index d9f89dfc0e..4f1398af5e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/MainServiceTemplate.yaml @@ -2,34 +2,10 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: Main imports: - ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml - CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml - ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml - AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml - GlobalSubstitutionTypes: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml - NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml - NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml - CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml - ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml - NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml - NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml - ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml node_types: org.openecomp.resource.vfc.nodes.heat.nems_be: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server @@ -1226,6 +1202,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -1233,6 +1215,10 @@ topology_template: get_input: - lb_oam_ips - 0 + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: oam network: get_input: oam_net_name requirements: @@ -1244,11 +1230,20 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: true security_groups: - get_input: security_group_name fixed_ips: - ip_address: get_input: mms_traffic_net_local_ip2 + mac_requirements: + mac_count_required: + is_required: false allowed_address_pairs: - ip_address: get_input: mms_traffic_net_floating_ip @@ -1266,6 +1261,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -1273,6 +1274,9 @@ topology_template: get_input: - nems_fe_nems_traffic_net_ips - 0 + mac_requirements: + mac_count_required: + is_required: false network: nems_traffic_net requirements: - link: @@ -1287,6 +1291,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -1294,6 +1304,9 @@ topology_template: get_input: - nems_fe_nems_internal_net_ips - 1 + mac_requirements: + mac_count_required: + is_required: false network: nems_internal_net requirements: - link: @@ -1324,6 +1337,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -1331,6 +1350,9 @@ topology_template: get_input: - nems_fe_nems_user_web_net_ips - 0 + mac_requirements: + mac_count_required: + is_required: false network: nems_user_web_net requirements: - link: @@ -1345,6 +1367,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -1352,6 +1380,9 @@ topology_template: get_input: - nems_fe_nems_user_web_net_ips - 1 + mac_requirements: + mac_count_required: + is_required: false network: nems_user_web_net requirements: - link: @@ -1366,6 +1397,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -1373,6 +1410,9 @@ topology_template: get_input: - nems_fe_nems_traffic_net_ips - 1 + mac_requirements: + mac_count_required: + is_required: false network: nems_traffic_net requirements: - link: @@ -1387,6 +1427,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -1394,6 +1440,10 @@ topology_template: get_input: - nems_fe_oam_ips - 0 + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: oam network: get_input: oam_net_name requirements: @@ -1405,6 +1455,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -1412,6 +1468,10 @@ topology_template: get_input: - nems_fe_oam_ips - 1 + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: oam network: get_input: oam_net_name requirements: @@ -1423,6 +1483,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -1430,6 +1496,9 @@ topology_template: get_input: - nems_fe_nems_internal_net_ips - 0 + mac_requirements: + mac_count_required: + is_required: false network: nems_internal_net requirements: - link: @@ -1444,6 +1513,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -1451,6 +1526,9 @@ topology_template: get_input: - nems_fe_nems_imap_net_ips - 0 + mac_requirements: + mac_count_required: + is_required: false network: nems_imap_net requirements: - link: @@ -1465,6 +1543,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -1472,6 +1556,9 @@ topology_template: get_input: - nems_fe_nems_imap_net_ips - 1 + mac_requirements: + mac_count_required: + is_required: false network: nems_imap_net requirements: - link: @@ -1531,11 +1618,20 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: true security_groups: - get_input: security_group_name fixed_ips: - ip_address: get_input: eca_traffic_net_local_ip2 + mac_requirements: + mac_count_required: + is_required: false allowed_address_pairs: - ip_address: get_input: eca_traffic_net_floating_ip @@ -1553,11 +1649,20 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: - ip_address: get_input: ha_net_local_ip2 + mac_requirements: + mac_count_required: + is_required: false network: ha_net requirements: - link: @@ -1588,11 +1693,20 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: - ip_address: get_input: ha_net_local_ip1 + mac_requirements: + mac_count_required: + is_required: false network: ha_net requirements: - link: @@ -1635,6 +1749,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -1642,6 +1762,10 @@ topology_template: get_input: - eca_trx_oam_ips - 15 + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: oam network: get_input: oam_net_name requirements: @@ -1653,6 +1777,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -1660,6 +1790,9 @@ topology_template: get_input: - eca_trx_eca_traffic_net_ips - 18 + mac_requirements: + mac_count_required: + is_required: false network: eca_traffic_net requirements: - link: @@ -1674,6 +1807,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -1681,6 +1820,10 @@ topology_template: get_input: - eca_trx_mgmt_ips - 15 + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: eca_mgmt network: get_input: eca_mgmt_net_name requirements: @@ -1692,6 +1835,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -1699,6 +1848,10 @@ topology_template: get_input: - eca_trx_mgmt_ips - 18 + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: eca_mgmt network: get_input: eca_mgmt_net_name requirements: @@ -1710,6 +1863,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -1717,6 +1876,10 @@ topology_template: get_input: - eca_trx_oam_ips - 14 + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: oam network: get_input: oam_net_name requirements: @@ -1728,6 +1891,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -1735,6 +1904,10 @@ topology_template: get_input: - eca_trx_oam_ips - 18 + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: oam network: get_input: oam_net_name requirements: @@ -1746,11 +1919,20 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: true security_groups: - get_input: security_group_name fixed_ips: - ip_address: get_input: nems_traffic_net_local_ip1 + mac_requirements: + mac_count_required: + is_required: false allowed_address_pairs: - ip_address: get_input: nems_traffic_net_floating_ip @@ -1768,6 +1950,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -1775,6 +1963,10 @@ topology_template: get_input: - eca_trx_mgmt_ips - 10 + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: eca_mgmt network: get_input: eca_mgmt_net_name requirements: @@ -1786,6 +1978,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -1793,6 +1991,9 @@ topology_template: get_input: - eca_trx_eca_traffic_net_ips - 10 + mac_requirements: + mac_count_required: + is_required: false network: eca_traffic_net requirements: - link: @@ -1807,6 +2008,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -1814,6 +2021,9 @@ topology_template: get_input: - eca_trx_eca_traffic_net_ips - 11 + mac_requirements: + mac_count_required: + is_required: false network: eca_traffic_net requirements: - link: @@ -1828,6 +2038,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -1835,6 +2051,10 @@ topology_template: get_input: - eca_trx_mgmt_ips - 11 + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: eca_mgmt network: get_input: eca_mgmt_net_name requirements: @@ -1846,6 +2066,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -1853,6 +2079,10 @@ topology_template: get_input: - eca_trx_oam_ips - 10 + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: oam network: get_input: oam_net_name requirements: @@ -1864,6 +2094,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -1871,6 +2107,10 @@ topology_template: get_input: - eca_trx_oam_ips - 11 + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: oam network: get_input: oam_net_name requirements: @@ -1882,6 +2122,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -1889,6 +2135,10 @@ topology_template: get_input: - mmsc_oam_ips - 3 + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: oam network: get_input: oam_net_name requirements: @@ -1900,6 +2150,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -1907,6 +2163,10 @@ topology_template: get_input: - cmaui_oam_ips - 1 + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: oam network: get_input: oam_net_name requirements: @@ -1918,6 +2178,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -1925,6 +2191,10 @@ topology_template: get_input: - mmsc_oam_ips - 2 + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: oam network: get_input: oam_net_name requirements: @@ -1936,6 +2206,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -1943,6 +2219,9 @@ topology_template: get_input: - eca_trx_eca_traffic_net_ips - 14 + mac_requirements: + mac_count_required: + is_required: false network: eca_traffic_net requirements: - link: @@ -1957,6 +2236,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -1964,6 +2249,9 @@ topology_template: get_input: - mmsc_mms_traffic_net_ips - 2 + mac_requirements: + mac_count_required: + is_required: false network: mms_traffic_net requirements: - link: @@ -1978,6 +2266,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -1985,6 +2279,9 @@ topology_template: get_input: - mmsc_mms_traffic_net_ips - 3 + mac_requirements: + mac_count_required: + is_required: false network: mms_traffic_net requirements: - link: @@ -1999,6 +2296,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -2006,6 +2309,10 @@ topology_template: get_input: - eca_trx_mgmt_ips - 14 + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: eca_mgmt network: get_input: eca_mgmt_net_name requirements: @@ -2017,6 +2324,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -2024,6 +2337,9 @@ topology_template: get_input: - eca_trx_eca_traffic_net_ips - 15 + mac_requirements: + mac_count_required: + is_required: false network: eca_traffic_net requirements: - link: @@ -2038,6 +2354,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -2045,6 +2367,10 @@ topology_template: get_input: - lb_oam_ips - 1 + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: oam network: get_input: oam_net_name requirements: @@ -2062,6 +2388,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -2069,6 +2401,9 @@ topology_template: get_input: - eca_trx_eca_traffic_net_ips - 6 + mac_requirements: + mac_count_required: + is_required: false network: eca_traffic_net requirements: - link: @@ -2135,6 +2470,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -2142,6 +2483,10 @@ topology_template: get_input: - eca_trx_oam_ips - 6 + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: oam network: get_input: oam_net_name requirements: @@ -2153,6 +2498,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -2160,6 +2511,10 @@ topology_template: get_input: - eca_trx_mgmt_ips - 6 + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: eca_mgmt network: get_input: eca_mgmt_net_name requirements: @@ -2177,6 +2532,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -2184,6 +2545,10 @@ topology_template: get_input: - eca_trx_mgmt_ips - 2 + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: eca_mgmt network: get_input: eca_mgmt_net_name requirements: @@ -2195,6 +2560,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -2202,6 +2573,10 @@ topology_template: get_input: - eca_trx_oam_ips - 2 + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: oam network: get_input: oam_net_name requirements: @@ -2213,6 +2588,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -2220,6 +2601,9 @@ topology_template: get_input: - eca_trx_eca_traffic_net_ips - 2 + mac_requirements: + mac_count_required: + is_required: false network: eca_traffic_net requirements: - link: @@ -2278,6 +2662,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -2285,6 +2675,9 @@ topology_template: get_input: - lb_dmz_protected_ips - 1 + mac_requirements: + mac_count_required: + is_required: false allowed_address_pairs: - ip_address: get_input: @@ -2314,6 +2707,7 @@ topology_template: get_input: - mmsc_dmz_protected_snat_ips - 3 + network_role_tag: dmz_protected network: get_input: dmz_protected_net_name requirements: @@ -2325,11 +2719,20 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: true security_groups: - get_input: security_group_name fixed_ips: - ip_address: get_input: eca_traffic_net_local_ip1 + mac_requirements: + mac_count_required: + is_required: false allowed_address_pairs: - ip_address: get_input: eca_traffic_net_floating_ip @@ -2347,6 +2750,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -2354,6 +2763,9 @@ topology_template: get_input: - lb_dmz_protected_ips - 0 + mac_requirements: + mac_count_required: + is_required: false allowed_address_pairs: - ip_address: get_input: @@ -2383,6 +2795,7 @@ topology_template: get_input: - mmsc_dmz_protected_snat_ips - 3 + network_role_tag: dmz_protected network: get_input: dmz_protected_net_name requirements: @@ -2394,11 +2807,20 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: true security_groups: - get_input: security_group_name fixed_ips: - ip_address: get_input: mms_traffic_net_local_ip1 + mac_requirements: + mac_count_required: + is_required: false allowed_address_pairs: - ip_address: get_input: mms_traffic_net_floating_ip @@ -2432,6 +2854,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -2439,6 +2867,9 @@ topology_template: get_input: - eca_trx_eca_traffic_net_ips - 0 + mac_requirements: + mac_count_required: + is_required: false network: eca_traffic_net requirements: - link: @@ -2523,6 +2954,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -2530,6 +2967,9 @@ topology_template: get_input: - lb_cor_direct_ips - 1 + mac_requirements: + mac_count_required: + is_required: false allowed_address_pairs: - ip_address: get_input: @@ -2559,6 +2999,7 @@ topology_template: get_input: - mmsc_core_snat_ips - 4 + network_role_tag: cor_direct network: get_input: cor_direct_net_name requirements: @@ -2570,6 +3011,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -2577,6 +3024,10 @@ topology_template: get_input: - eca_trx_oam_ips - 19 + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: oam network: get_input: oam_net_name requirements: @@ -2588,6 +3039,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -2595,6 +3052,9 @@ topology_template: get_input: - eca_trx_eca_traffic_net_ips - 19 + mac_requirements: + mac_count_required: + is_required: false network: eca_traffic_net requirements: - link: @@ -2609,6 +3069,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -2616,6 +3082,10 @@ topology_template: get_input: - eca_trx_mgmt_ips - 19 + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: eca_mgmt network: get_input: eca_mgmt_net_name requirements: @@ -2627,6 +3097,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -2634,6 +3110,10 @@ topology_template: get_input: - eca_trx_oam_ips - 7 + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: oam network: get_input: oam_net_name requirements: @@ -2645,6 +3125,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -2652,6 +3138,10 @@ topology_template: get_input: - eca_trx_oam_ips - 5 + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: oam network: get_input: oam_net_name requirements: @@ -2663,11 +3153,20 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: true security_groups: - get_input: security_group_name fixed_ips: - ip_address: get_input: nems_user_web_net_local_ip2 + mac_requirements: + mac_count_required: + is_required: false allowed_address_pairs: - ip_address: get_input: nems_user_web_net_floating_ip @@ -2701,6 +3200,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -2708,6 +3213,9 @@ topology_template: get_input: - eca_trx_eca_traffic_net_ips - 5 + mac_requirements: + mac_count_required: + is_required: false network: eca_traffic_net requirements: - link: @@ -2722,6 +3230,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -2729,6 +3243,9 @@ topology_template: get_input: - eca_trx_eca_traffic_net_ips - 7 + mac_requirements: + mac_count_required: + is_required: false network: eca_traffic_net requirements: - link: @@ -2743,11 +3260,20 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: true security_groups: - get_input: security_group_name fixed_ips: - ip_address: get_input: nems_user_web_net_local_ip1 + mac_requirements: + mac_count_required: + is_required: false allowed_address_pairs: - ip_address: get_input: nems_user_web_net_floating_ip @@ -2765,6 +3291,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -2772,6 +3304,10 @@ topology_template: get_input: - eca_trx_mgmt_ips - 5 + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: eca_mgmt network: get_input: eca_mgmt_net_name requirements: @@ -2783,6 +3319,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -2790,6 +3332,10 @@ topology_template: get_input: - eca_trx_mgmt_ips - 7 + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: eca_mgmt network: get_input: eca_mgmt_net_name requirements: @@ -2839,11 +3385,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: - ip_address: get_input: nems_be_oam_ips + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: oam network: get_input: oam_net_name requirements: @@ -2855,6 +3411,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -2862,6 +3424,10 @@ topology_template: get_input: - eca_trx_oam_ips - 1 + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: oam network: get_input: oam_net_name requirements: @@ -2895,11 +3461,20 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: - ip_address: get_input: nems_be_nems_internal_net_ips + mac_requirements: + mac_count_required: + is_required: false network: nems_internal_net requirements: - link: @@ -2914,6 +3489,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -2921,6 +3502,10 @@ topology_template: get_input: - eca_trx_mgmt_ips - 1 + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: eca_mgmt network: get_input: eca_mgmt_net_name requirements: @@ -2932,6 +3517,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -2939,6 +3530,10 @@ topology_template: get_input: - eca_trx_mgmt_ips - 3 + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: eca_mgmt network: get_input: eca_mgmt_net_name requirements: @@ -2972,11 +3567,20 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: - ip_address: get_input: nems_be_nems_imap_net_ips + mac_requirements: + mac_count_required: + is_required: false network: nems_imap_net requirements: - link: @@ -2991,6 +3595,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -2998,6 +3608,9 @@ topology_template: get_input: - eca_trx_eca_traffic_net_ips - 1 + mac_requirements: + mac_count_required: + is_required: false network: eca_traffic_net requirements: - link: @@ -3012,6 +3625,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -3019,6 +3638,9 @@ topology_template: get_input: - eca_trx_eca_traffic_net_ips - 3 + mac_requirements: + mac_count_required: + is_required: false network: eca_traffic_net requirements: - link: @@ -3049,6 +3671,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -3056,6 +3684,10 @@ topology_template: get_input: - eca_trx_oam_ips - 3 + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: oam network: get_input: oam_net_name requirements: @@ -3117,6 +3749,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -3124,6 +3762,10 @@ topology_template: get_input: - eca_trx_oam_ips - 16 + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: oam network: get_input: oam_net_name requirements: @@ -3135,6 +3777,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -3142,6 +3790,9 @@ topology_template: get_input: - eca_trx_eca_traffic_net_ips - 17 + mac_requirements: + mac_count_required: + is_required: false network: eca_traffic_net requirements: - link: @@ -3156,6 +3807,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -3163,6 +3820,9 @@ topology_template: get_input: - lb_cor_direct_ips - 0 + mac_requirements: + mac_count_required: + is_required: false allowed_address_pairs: - ip_address: get_input: @@ -3192,6 +3852,7 @@ topology_template: get_input: - mmsc_core_snat_ips - 4 + network_role_tag: cor_direct network: get_input: cor_direct_net_name requirements: @@ -3203,6 +3864,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -3210,6 +3877,10 @@ topology_template: get_input: - mmsc_oam_ips - 0 + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: oam network: get_input: oam_net_name requirements: @@ -3221,6 +3892,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -3228,6 +3905,9 @@ topology_template: get_input: - eca_trx_eca_traffic_net_ips - 16 + mac_requirements: + mac_count_required: + is_required: false network: eca_traffic_net requirements: - link: @@ -3242,6 +3922,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -3249,6 +3935,10 @@ topology_template: get_input: - eca_trx_oam_ips - 17 + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: oam network: get_input: oam_net_name requirements: @@ -3260,6 +3950,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -3267,6 +3963,9 @@ topology_template: get_input: - mmsc_mms_traffic_net_ips - 0 + mac_requirements: + mac_count_required: + is_required: false network: mms_traffic_net requirements: - link: @@ -3281,6 +3980,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -3288,6 +3993,9 @@ topology_template: get_input: - mmsc_mms_traffic_net_ips - 1 + mac_requirements: + mac_count_required: + is_required: false network: mms_traffic_net requirements: - link: @@ -3302,6 +4010,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -3309,6 +4023,10 @@ topology_template: get_input: - eca_trx_mgmt_ips - 16 + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: eca_mgmt network: get_input: eca_mgmt_net_name requirements: @@ -3320,6 +4038,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -3327,6 +4051,10 @@ topology_template: get_input: - eca_trx_mgmt_ips - 17 + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: eca_mgmt network: get_input: eca_mgmt_net_name requirements: @@ -3354,6 +4082,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -3361,12 +4095,22 @@ topology_template: get_input: - cmaui_oam_ips - 0 + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: oam network: get_input: oam_net_name eca_trx10_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -3374,6 +4118,10 @@ topology_template: get_input: - eca_trx_mgmt_ips - 9 + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: eca_mgmt network: get_input: eca_mgmt_net_name requirements: @@ -3417,6 +4165,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -3424,6 +4178,10 @@ topology_template: get_input: - eca_trx_oam_ips - 9 + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: oam network: get_input: oam_net_name requirements: @@ -3473,6 +4231,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -3480,6 +4244,9 @@ topology_template: get_input: - eca_trx_eca_traffic_net_ips - 9 + mac_requirements: + mac_count_required: + is_required: false network: eca_traffic_net requirements: - link: @@ -3558,6 +4325,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -3565,6 +4338,10 @@ topology_template: get_input: - eca_trx_mgmt_ips - 13 + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: eca_mgmt network: get_input: eca_mgmt_net_name requirements: @@ -3576,6 +4353,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -3583,6 +4366,10 @@ topology_template: get_input: - eca_trx_oam_ips - 12 + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: oam network: get_input: oam_net_name requirements: @@ -3594,6 +4381,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -3601,6 +4394,10 @@ topology_template: get_input: - eca_trx_oam_ips - 13 + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: oam network: get_input: oam_net_name requirements: @@ -3612,6 +4409,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -3619,6 +4422,9 @@ topology_template: get_input: - mmsc_mms_traffic_net_ips - 4 + mac_requirements: + mac_count_required: + is_required: false network: mms_traffic_net requirements: - link: @@ -3633,6 +4439,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -3640,6 +4452,10 @@ topology_template: get_input: - eca_trx_mgmt_ips - 12 + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: eca_mgmt network: get_input: eca_mgmt_net_name requirements: @@ -3651,6 +4467,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -3658,6 +4480,10 @@ topology_template: get_input: - mmsc_oam_ips - 4 + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: oam network: get_input: oam_net_name requirements: @@ -3669,6 +4495,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -3676,6 +4508,9 @@ topology_template: get_input: - eca_trx_eca_traffic_net_ips - 12 + mac_requirements: + mac_count_required: + is_required: false network: eca_traffic_net requirements: - link: @@ -3690,6 +4525,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -3697,6 +4538,9 @@ topology_template: get_input: - eca_trx_eca_traffic_net_ips - 13 + mac_requirements: + mac_count_required: + is_required: false network: eca_traffic_net requirements: - link: @@ -3711,6 +4555,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -3718,6 +4568,10 @@ topology_template: get_input: - mmsc_oam_ips - 1 + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: oam network: get_input: oam_net_name requirements: @@ -3777,6 +4631,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -3784,6 +4644,10 @@ topology_template: get_input: - eca_trx_oam_ips - 8 + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: oam network: get_input: oam_net_name requirements: @@ -3795,6 +4659,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -3802,6 +4672,10 @@ topology_template: get_input: - eca_trx_mgmt_ips - 8 + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: eca_mgmt network: get_input: eca_mgmt_net_name requirements: @@ -3813,6 +4687,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -3820,6 +4700,9 @@ topology_template: get_input: - eca_trx_eca_traffic_net_ips - 8 + mac_requirements: + mac_count_required: + is_required: false network: eca_traffic_net requirements: - link: @@ -3834,11 +4717,20 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: true security_groups: - get_input: security_group_name fixed_ips: - ip_address: get_input: nems_traffic_net_local_ip2 + mac_requirements: + mac_count_required: + is_required: false allowed_address_pairs: - ip_address: get_input: nems_traffic_net_floating_ip @@ -3856,6 +4748,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -3863,6 +4761,9 @@ topology_template: get_input: - eca_trx_eca_traffic_net_ips - 4 + mac_requirements: + mac_count_required: + is_required: false network: eca_traffic_net requirements: - link: @@ -3893,6 +4794,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -3900,6 +4807,10 @@ topology_template: get_input: - eca_trx_mgmt_ips - 0 + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: eca_mgmt network: get_input: eca_mgmt_net_name requirements: @@ -3911,6 +4822,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -3918,6 +4835,10 @@ topology_template: get_input: - eca_trx_mgmt_ips - 4 + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: eca_mgmt network: get_input: eca_mgmt_net_name requirements: @@ -3929,6 +4850,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -3936,6 +4863,10 @@ topology_template: get_input: - eca_trx_oam_ips - 0 + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: oam network: get_input: oam_net_name requirements: @@ -3947,6 +4878,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -3954,6 +4891,10 @@ topology_template: get_input: - eca_trx_oam_ips - 4 + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: oam network: get_input: oam_net_name requirements: @@ -3969,57 +4910,69 @@ topology_template: size: '(get_input : mmsc_cinder_volume_size) * 1024' relationship_templates: nems1_fe_volume_attachment: - type: org.openecomp.relationships.heat.cinder.VolumeAttachesTo + type: org.openecomp.relationships.VolumeAttachesTo properties: volume_id: nems1_fe_volume instance_uuid: server_nems_fe1 mmsc3_volume_attachment: - type: org.openecomp.relationships.heat.cinder.VolumeAttachesTo + type: org.openecomp.relationships.VolumeAttachesTo properties: volume_id: mmsc3_volume instance_uuid: server_mmsc3 mmsc1_volume_attachment: - type: org.openecomp.relationships.heat.cinder.VolumeAttachesTo + type: org.openecomp.relationships.VolumeAttachesTo properties: volume_id: mmsc1_volume instance_uuid: server_mmsc1 cmaui1_volume_attachment: - type: org.openecomp.relationships.heat.cinder.VolumeAttachesTo + type: org.openecomp.relationships.VolumeAttachesTo properties: volume_id: cmaui1_volume instance_uuid: server_cmaui1 mmsc4_volume_attachment: - type: org.openecomp.relationships.heat.cinder.VolumeAttachesTo + type: org.openecomp.relationships.VolumeAttachesTo properties: volume_id: mmsc4_volume instance_uuid: server_mmsc4 nems_volume_attachment: - type: org.openecomp.relationships.heat.cinder.VolumeAttachesTo + type: org.openecomp.relationships.VolumeAttachesTo properties: volume_id: nems_be_volume instance_uuid: server_nems_be1 cmaui_volume_attachment: - type: org.openecomp.relationships.heat.cinder.VolumeAttachesTo + type: org.openecomp.relationships.VolumeAttachesTo properties: volume_id: cmaui_volume instance_uuid: server_cmaui nems2_fe_volume_attachment: - type: org.openecomp.relationships.heat.cinder.VolumeAttachesTo + type: org.openecomp.relationships.VolumeAttachesTo properties: volume_id: nems2_fe_volume instance_uuid: server_nems_fe2 mmsc5_volume_attachment: - type: org.openecomp.relationships.heat.cinder.VolumeAttachesTo + type: org.openecomp.relationships.VolumeAttachesTo properties: volume_id: mmsc5_volume instance_uuid: server_mmsc5 mmsc2_volume_attachment: - type: org.openecomp.relationships.heat.cinder.VolumeAttachesTo + type: org.openecomp.relationships.VolumeAttachesTo properties: volume_id: mmsc2_volume instance_uuid: server_mmsc2 groups: - MMSC_Capacity_Line: + cmaui_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/cmaui.yml + description: cmaui server template for vMMSC + members: + - server_cmaui1 + - server_cmaui + - cmaui1_port_0 + - cmaui_volume + - cmaui1_volume + - cmaui_port_0 + MMSC_Capacity_Line_group: type: org.openecomp.groups.heat.HeatStack properties: heat_file: ../Artifacts/MMSC_Capacity_Line.yml @@ -4170,7 +5123,7 @@ topology_template: - eca_trx1_port_0 - eca_trx5_port_0 - mmsc3_volume - SG_ECA_MGMT: + SG_ECA_MGMT_group: type: org.openecomp.groups.heat.HeatStack properties: heat_file: ../Artifacts/SG_ECA_MGMT.yaml @@ -4178,16 +5131,4 @@ topology_template: HOT template that creates Security Group and ECA network members: - mms_security_group - - eca_mgmt_net - cmaui: - type: org.openecomp.groups.heat.HeatStack - properties: - heat_file: ../Artifacts/cmaui.yml - description: cmaui server template for vMMSC - members: - - server_cmaui1 - - server_cmaui - - cmaui1_port_0 - - cmaui_volume - - cmaui1_volume - - cmaui_port_0
\ No newline at end of file + - eca_mgmt_net
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/eca_oamServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/eca_oamServiceTemplate.yaml index 90d4df7dab..663ab05b24 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/eca_oamServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/eca_oamServiceTemplate.yaml @@ -2,34 +2,10 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: eca_oam imports: - ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml - CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml - ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml - AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml - GlobalSubstitutionTypes: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml - NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml - NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml - CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml - ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml - ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml - NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml - NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml - ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml node_types: org.openecomp.resource.vfc.nodes.heat.eca: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server @@ -244,6 +220,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -251,6 +233,10 @@ topology_template: get_input: - arb_oam_ips - 0 + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: oam network: get_input: oam_net_name requirements: @@ -262,6 +248,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -269,6 +261,10 @@ topology_template: get_input: - eca_oam_ips - 1 + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: oam network: get_input: oam_net_name requirements: @@ -340,6 +336,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -347,6 +349,10 @@ topology_template: get_input: - eca_eca_mgmt_ips - 0 + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: eca_mgmt network: get_input: eca_mgmt_net_name requirements: @@ -358,6 +364,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -365,6 +377,10 @@ topology_template: get_input: - eca_oam_ips - 0 + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: oam network: get_input: oam_net_name requirements: @@ -376,6 +392,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -383,6 +405,10 @@ topology_template: get_input: - arb_eca_mgmt_ips - 0 + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: eca_mgmt network: get_input: eca_mgmt_net_name requirements: @@ -394,6 +420,12 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -401,6 +433,10 @@ topology_template: get_input: - eca_eca_mgmt_ips - 1 + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: eca_mgmt network: get_input: eca_mgmt_net_name requirements: @@ -431,22 +467,22 @@ topology_template: relationship: oam2_volume_attachment relationship_templates: oam2_volume_attachment: - type: org.openecomp.relationships.heat.cinder.VolumeAttachesTo + type: org.openecomp.relationships.VolumeAttachesTo properties: volume_id: oam2_volume instance_uuid: oam2_instance oam1_volume_attachment: - type: org.openecomp.relationships.heat.cinder.VolumeAttachesTo + type: org.openecomp.relationships.VolumeAttachesTo properties: volume_id: oam1_volume instance_uuid: oam1_instance arb_volume_attachment: - type: org.openecomp.relationships.heat.cinder.VolumeAttachesTo + type: org.openecomp.relationships.VolumeAttachesTo properties: volume_id: arb_volume instance_uuid: arb_instance groups: - eca_oam: + eca_oam_group: type: org.openecomp.groups.heat.HeatStack properties: heat_file: ../Artifacts/eca_oam.yaml @@ -467,103 +503,652 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.eca_oam capabilities: - attachment_oam2_volume: + disk.usage_arb_instance: + - arb_instance + - disk.usage + disk.capacity_arb_instance: + - arb_instance + - disk.capacity + disk.write.bytes.rate_oam1_instance: + - oam1_instance + - disk.write.bytes.rate + network.incoming.bytes_oam1_int_port: + - oam1_int_port + - network.incoming.bytes + endpoint_oam2_instance: + - oam2_instance + - endpoint + network.incoming.packets_oam1_int_port: + - oam1_int_port + - network.incoming.packets + disk.allocation_oam2_instance: + - oam2_instance + - disk.allocation + attachment_arb_mgmt_port: + - arb_mgmt_port + - attachment + feature_oam2_volume: - oam2_volume + - feature + memory.resident_arb_instance: + - arb_instance + - memory.resident + disk.device.usage_oam1_instance: + - oam1_instance + - disk.device.usage + disk.device.allocation_oam2_instance: + - oam2_instance + - disk.device.allocation + network.incoming.bytes.rate_oam1_int_port: + - oam1_int_port + - network.incoming.bytes.rate + network.incoming.packets.rate_oam2_mgmt_port: + - oam2_mgmt_port + - network.incoming.packets.rate + feature_oam1_int_port: + - oam1_int_port + - feature + network.incoming.packets_oam1_mgmt_port: + - oam1_mgmt_port + - network.incoming.packets + disk.read.bytes_oam1_instance: + - oam1_instance + - disk.read.bytes + disk.device.read.requests_arb_instance: + - arb_instance + - disk.device.read.requests + attachment_oam1_volume: + - oam1_volume - attachment - binding_oam2_instance: + network.incoming.packets.rate_oam2_int_port: + - oam2_int_port + - network.incoming.packets.rate + network.outgoing.bytes.rate_arb_int_port: + - arb_int_port + - network.outgoing.bytes.rate + memory.usage_arb_instance: + - arb_instance + - memory.usage + disk.device.write.requests_oam2_instance: - oam2_instance + - disk.device.write.requests + feature_oam1_mgmt_port: + - oam1_mgmt_port + - feature + disk.read.bytes.rate_arb_instance: + - arb_instance + - disk.read.bytes.rate + network.outgoing.packets.rate_arb_mgmt_port: + - arb_mgmt_port + - network.outgoing.packets.rate + binding_arb_mgmt_port: + - arb_mgmt_port - binding - attachment_oam2_int_port: - - oam2_int_port + network.outpoing.packets_oam2_mgmt_port: + - oam2_mgmt_port + - network.outpoing.packets + network.incoming.packets_oam2_mgmt_port: + - oam2_mgmt_port + - network.incoming.packets + attachment_arb_int_port: + - arb_int_port - attachment - attachment_oam1_volume: - - oam1_volume + disk.device.write.bytes_oam2_instance: + - oam2_instance + - disk.device.write.bytes + network.outgoing.packets.rate_oam1_mgmt_port: + - oam1_mgmt_port + - network.outgoing.packets.rate + binding_oam1_mgmt_port: + - oam1_mgmt_port + - binding + scalable_arb_instance: + - arb_instance + - scalable + cpu.delta_arb_instance: + - arb_instance + - cpu.delta + disk.usage_oam1_instance: + - oam1_instance + - disk.usage + disk.device.write.requests_arb_instance: + - arb_instance + - disk.device.write.requests + network.outgoing.bytes.rate_oam1_mgmt_port: + - oam1_mgmt_port + - network.outgoing.bytes.rate + network.incoming.packets_arb_int_port: + - arb_int_port + - network.incoming.packets + disk.device.read.bytes_oam1_instance: + - oam1_instance + - disk.device.read.bytes + disk.device.iops_arb_instance: + - arb_instance + - disk.device.iops + memory_oam2_instance: + - oam2_instance + - memory + os_oam2_instance: + - oam2_instance + - os + disk.device.read.bytes.rate_oam1_instance: + - oam1_instance + - disk.device.read.bytes.rate + network.incoming.bytes_oam2_mgmt_port: + - oam2_mgmt_port + - network.incoming.bytes + binding_oam2_instance: + - oam2_instance + - binding + network.outpoing.packets_oam1_int_port: + - oam1_int_port + - network.outpoing.packets + network.incoming.bytes.rate_oam1_mgmt_port: + - oam1_mgmt_port + - network.incoming.bytes.rate + cpu_oam1_instance: + - oam1_instance + - cpu + disk.device.capacity_oam2_instance: + - oam2_instance + - disk.device.capacity + disk.root.size_oam1_instance: + - oam1_instance + - disk.root.size + attachment_oam1_int_port: + - oam1_int_port - attachment + disk.iops_arb_instance: + - arb_instance + - disk.iops + memory.resident_oam1_instance: + - oam1_instance + - memory.resident + host_oam1_instance: + - oam1_instance + - host + network.incoming.bytes_arb_mgmt_port: + - arb_mgmt_port + - network.incoming.bytes + network.outgoing.bytes_arb_int_port: + - arb_int_port + - network.outgoing.bytes + disk.device.write.bytes_arb_instance: + - arb_instance + - disk.device.write.bytes + instance_arb_instance: + - arb_instance + - instance + disk.device.latency_oam1_instance: + - oam1_instance + - disk.device.latency + network.incoming.bytes.rate_oam2_int_port: + - oam2_int_port + - network.incoming.bytes.rate + memory_oam1_instance: + - oam1_instance + - memory + binding_arb_instance: + - arb_instance + - binding + feature_arb_volume: + - arb_volume + - feature + disk.write.bytes_arb_instance: + - arb_instance + - disk.write.bytes + network.outgoing.packets.rate_oam1_int_port: + - oam1_int_port + - network.outgoing.packets.rate + binding_oam1_int_port: + - oam1_int_port + - binding + disk.iops_oam1_instance: + - oam1_instance + - disk.iops + disk.write.requests.rate_arb_instance: + - arb_instance + - disk.write.requests.rate + scalable_oam1_instance: + - oam1_instance + - scalable + disk.root.size_arb_instance: + - arb_instance + - disk.root.size + network.outpoing.packets_oam2_int_port: + - oam2_int_port + - network.outpoing.packets + disk.device.read.requests.rate_arb_instance: + - arb_instance + - disk.device.read.requests.rate + instance_oam1_instance: + - oam1_instance + - instance os_oam1_instance: - oam1_instance - os - scalable_oam2_instance: + network.incoming.packets.rate_oam1_mgmt_port: + - oam1_mgmt_port + - network.incoming.packets.rate + memory.usage_oam2_instance: - oam2_instance - - scalable - scalable_arb_instance: + - memory.usage + disk.device.read.bytes.rate_oam2_instance: + - oam2_instance + - disk.device.read.bytes.rate + network.outgoing.packets.rate_oam2_mgmt_port: + - oam2_mgmt_port + - network.outgoing.packets.rate + binding_oam2_mgmt_port: + - oam2_mgmt_port + - binding + network.outgoing.bytes.rate_oam2_mgmt_port: + - oam2_mgmt_port + - network.outgoing.bytes.rate + disk.read.requests_arb_instance: - arb_instance - - scalable + - disk.read.requests + disk.device.iops_oam2_instance: + - oam2_instance + - disk.device.iops + network.outgoing.bytes_oam1_mgmt_port: + - oam1_mgmt_port + - network.outgoing.bytes + disk.write.requests_oam2_instance: + - oam2_instance + - disk.write.requests + disk.device.write.bytes_oam1_instance: + - oam1_instance + - disk.device.write.bytes + disk.root.size_oam2_instance: + - oam2_instance + - disk.root.size + disk.device.write.bytes.rate_oam2_instance: + - oam2_instance + - disk.device.write.bytes.rate + network.incoming.bytes_oam1_mgmt_port: + - oam1_mgmt_port + - network.incoming.bytes + disk.write.bytes_oam2_instance: + - oam2_instance + - disk.write.bytes + cpu_arb_instance: + - arb_instance + - cpu + disk.read.requests_oam1_instance: + - oam1_instance + - disk.read.requests + network.outgoing.packets.rate_arb_int_port: + - arb_int_port + - network.outgoing.packets.rate + disk.allocation_arb_instance: + - arb_instance + - disk.allocation + cpu.delta_oam2_instance: + - oam2_instance + - cpu.delta + cpu_util_oam2_instance: + - oam2_instance + - cpu_util + disk.device.read.bytes.rate_arb_instance: + - arb_instance + - disk.device.read.bytes.rate + network.incoming.packets_oam2_int_port: + - oam2_int_port + - network.incoming.packets + network.outgoing.bytes_oam1_int_port: + - oam1_int_port + - network.outgoing.bytes + disk.device.read.requests.rate_oam2_instance: + - oam2_instance + - disk.device.read.requests.rate + disk.allocation_oam1_instance: + - oam1_instance + - disk.allocation + disk.capacity_oam1_instance: + - oam1_instance + - disk.capacity + feature_oam2_int_port: + - oam2_int_port + - feature + disk.device.allocation_oam1_instance: + - oam1_instance + - disk.device.allocation + vcpus_arb_instance: + - arb_instance + - vcpus + network.incoming.packets.rate_arb_int_port: + - arb_int_port + - network.incoming.packets.rate + disk.read.bytes.rate_oam2_instance: + - oam2_instance + - disk.read.bytes.rate + network.outgoing.bytes.rate_oam2_int_port: + - oam2_int_port + - network.outgoing.bytes.rate + network.incoming.bytes.rate_arb_int_port: + - arb_int_port + - network.incoming.bytes.rate + os_arb_instance: + - arb_instance + - os + network.incoming.packets.rate_oam1_int_port: + - oam1_int_port + - network.incoming.packets.rate + feature_oam1_volume: + - oam1_volume + - feature + disk.write.bytes.rate_arb_instance: + - arb_instance + - disk.write.bytes.rate + disk.device.capacity_arb_instance: + - arb_instance + - disk.device.capacity + network.incoming.bytes_arb_int_port: + - arb_int_port + - network.incoming.bytes + disk.device.usage_oam2_instance: + - oam2_instance + - disk.device.usage + attachment_oam2_volume: + - oam2_volume + - attachment + disk.write.bytes.rate_oam2_instance: + - oam2_instance + - disk.write.bytes.rate endpoint_oam1_instance: - oam1_instance - endpoint - binding_arb_instance: - - arb_instance - - binding + disk.iops_oam2_instance: + - oam2_instance + - disk.iops + network.outgoing.bytes.rate_arb_mgmt_port: + - arb_mgmt_port + - network.outgoing.bytes.rate host_arb_instance: - arb_instance - host - endpoint_arb_instance: + disk.device.write.requests.rate_oam2_instance: + - oam2_instance + - disk.device.write.requests.rate + cpu_util_oam1_instance: + - oam1_instance + - cpu_util + disk.ephemeral.size_oam1_instance: + - oam1_instance + - disk.ephemeral.size + binding_arb_int_port: + - arb_int_port + - binding + network.outgoing.bytes_arb_mgmt_port: + - arb_mgmt_port + - network.outgoing.bytes + disk.capacity_oam2_instance: + - oam2_instance + - disk.capacity + vcpus_oam1_instance: + - oam1_instance + - vcpus + feature_arb_instance: - arb_instance - - endpoint - attachment_oam1_int_port: - - oam1_int_port + - feature + disk.device.read.requests.rate_oam1_instance: + - oam1_instance + - disk.device.read.requests.rate + memory.resident_oam2_instance: + - oam2_instance + - memory.resident + network.outgoing.bytes_oam2_int_port: + - oam2_int_port + - network.outgoing.bytes + disk.device.write.bytes.rate_arb_instance: + - arb_instance + - disk.device.write.bytes.rate + disk.write.requests_oam1_instance: + - oam1_instance + - disk.write.requests + disk.device.usage_arb_instance: + - arb_instance + - disk.device.usage + disk.device.latency_arb_instance: + - arb_instance + - disk.device.latency + feature_arb_int_port: + - arb_int_port + - feature + network.outgoing.bytes_oam2_mgmt_port: + - oam2_mgmt_port + - network.outgoing.bytes + disk.read.bytes_arb_instance: + - arb_instance + - disk.read.bytes + disk.write.requests.rate_oam1_instance: + - oam1_instance + - disk.write.requests.rate + cpu.delta_oam1_instance: + - oam1_instance + - cpu.delta + network.incoming.bytes.rate_oam2_mgmt_port: + - oam2_mgmt_port + - network.incoming.bytes.rate + disk.device.write.bytes.rate_oam1_instance: + - oam1_instance + - disk.device.write.bytes.rate + disk.device.iops_oam1_instance: + - oam1_instance + - disk.device.iops + attachment_oam2_mgmt_port: + - oam2_mgmt_port - attachment + memory.usage_oam1_instance: + - oam1_instance + - memory.usage + disk.ephemeral.size_arb_instance: + - arb_instance + - disk.ephemeral.size + feature_oam1_instance: + - oam1_instance + - feature + disk.write.requests_arb_instance: + - arb_instance + - disk.write.requests + disk.device.read.bytes_oam2_instance: + - oam2_instance + - disk.device.read.bytes + disk.latency_oam2_instance: + - oam2_instance + - disk.latency attachment_arb_volume: - arb_volume - attachment - host_oam1_instance: + network.outpoing.packets_arb_int_port: + - arb_int_port + - network.outpoing.packets + disk.usage_oam2_instance: + - oam2_instance + - disk.usage + disk.write.bytes_oam1_instance: - oam1_instance - - host - os_oam2_instance: + - disk.write.bytes + disk.device.write.requests.rate_oam1_instance: + - oam1_instance + - disk.device.write.requests.rate + disk.read.bytes_oam2_instance: - oam2_instance - - os - endpoint_oam2_instance: + - disk.read.bytes + disk.device.allocation_arb_instance: + - arb_instance + - disk.device.allocation + cpu_util_arb_instance: + - arb_instance + - cpu_util + network.incoming.packets_arb_mgmt_port: + - arb_mgmt_port + - network.incoming.packets + instance_oam2_instance: - oam2_instance - - endpoint - scalable_oam1_instance: + - instance + feature_oam2_instance: + - oam2_instance + - feature + cpu_oam2_instance: + - oam2_instance + - cpu + disk.device.read.requests_oam1_instance: - oam1_instance - - scalable + - disk.device.read.requests + network.incoming.packets.rate_arb_mgmt_port: + - arb_mgmt_port + - network.incoming.packets.rate + disk.device.read.requests_oam2_instance: + - oam2_instance + - disk.device.read.requests + disk.read.requests_oam2_instance: + - oam2_instance + - disk.read.requests + disk.device.read.bytes_arb_instance: + - arb_instance + - disk.device.read.bytes host_oam2_instance: - oam2_instance - host - os_arb_instance: + disk.device.write.requests.rate_arb_instance: - arb_instance - - os - attachment_oam1_mgmt_port: - - oam1_mgmt_port - - attachment - attachment_arb_int_port: - - arb_int_port - - attachment - attachment_arb_mgmt_port: + - disk.device.write.requests.rate + vcpus_oam2_instance: + - oam2_instance + - vcpus + scalable_oam2_instance: + - oam2_instance + - scalable + network.outgoing.bytes.rate_oam1_int_port: + - oam1_int_port + - network.outgoing.bytes.rate + endpoint_arb_instance: + - arb_instance + - endpoint + disk.device.capacity_oam1_instance: + - oam1_instance + - disk.device.capacity + disk.latency_arb_instance: + - arb_instance + - disk.latency + network.incoming.bytes.rate_arb_mgmt_port: - arb_mgmt_port - - attachment - attachment_oam2_mgmt_port: + - network.incoming.bytes.rate + disk.read.bytes.rate_oam1_instance: + - oam1_instance + - disk.read.bytes.rate + memory_arb_instance: + - arb_instance + - memory + disk.latency_oam1_instance: + - oam1_instance + - disk.latency + feature_arb_mgmt_port: + - arb_mgmt_port + - feature + feature_oam2_mgmt_port: - oam2_mgmt_port + - feature + attachment_oam1_mgmt_port: + - oam1_mgmt_port - attachment binding_oam1_instance: - oam1_instance - binding + attachment_oam2_int_port: + - oam2_int_port + - attachment + disk.device.latency_oam2_instance: + - oam2_instance + - disk.device.latency + network.outgoing.packets.rate_oam2_int_port: + - oam2_int_port + - network.outgoing.packets.rate + binding_oam2_int_port: + - oam2_int_port + - binding + disk.write.requests.rate_oam2_instance: + - oam2_instance + - disk.write.requests.rate + network.incoming.bytes_oam2_int_port: + - oam2_int_port + - network.incoming.bytes + network.outpoing.packets_oam1_mgmt_port: + - oam1_mgmt_port + - network.outpoing.packets + disk.ephemeral.size_oam2_instance: + - oam2_instance + - disk.ephemeral.size + network.outpoing.packets_arb_mgmt_port: + - arb_mgmt_port + - network.outpoing.packets + disk.device.write.requests_oam1_instance: + - oam1_instance + - disk.device.write.requests requirements: link_oam2_mgmt_port: - oam2_mgmt_port - link + dependency_oam2_volume: + - oam2_volume + - dependency + dependency_oam1_volume: + - oam1_volume + - dependency + link_oam1_mgmt_port: + - oam1_mgmt_port + - link + dependency_oam2_instance: + - oam2_instance + - dependency + local_storage_oam2_instance: + - oam2_instance + - local_storage + link_arb_int_port: + - arb_int_port + - link + dependency_oam1_instance: + - oam1_instance + - dependency + dependency_arb_instance: + - arb_instance + - dependency link_oam1_int_port: - oam1_int_port - link - link_oam1_mgmt_port: + dependency_oam1_mgmt_port: - oam1_mgmt_port - - link + - dependency + dependency_oam1_int_port: + - oam1_int_port + - dependency local_storage_arb_instance: - arb_instance - local_storage + dependency_arb_mgmt_port: + - arb_mgmt_port + - dependency + dependency_oam2_mgmt_port: + - oam2_mgmt_port + - dependency link_arb_mgmt_port: - arb_mgmt_port - link - local_storage_oam2_instance: - - oam2_instance - - local_storage - link_arb_int_port: - - arb_int_port - - link + dependency_arb_volume: + - arb_volume + - dependency + dependency_oam2_int_port: + - oam2_int_port + - dependency link_oam2_int_port: - oam2_int_port - link local_storage_oam1_instance: - oam1_instance - - local_storage
\ No newline at end of file + - local_storage + dependency_arb_int_port: + - arb_int_port + - 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/multiHeat/referencedHeatResources/inputs/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/inputs/MANIFEST.json index 167ae4e9d8..b57a01b8d1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/inputs/MANIFEST.json +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/inputs/MANIFEST.json @@ -1,37 +1,47 @@ { - "name": "multiple_not_nested", - "description": "multiple heat files in zip, no nesting", - "version": "2013-05-23", - "data": [{ - "file": "cmaui.yml", - "type": "HEAT", - "data": [{ - "file": "cmaui.env", - "type": "HEAT_ENV" - }] - }, - { - "file": "eca_oam.yaml", - "type": "HEAT", - "data": [{ - "file": "eca_oam.env", - "type": "HEAT_ENV" - }] - }, - { - "file": "MMSC_Capacity_Line.yml", - "type": "HEAT", - "data": [{ - "file": "MMSC_Capacity_Line_1.env", - "type": "HEAT_ENV" - }] - }, - { - "file": "SG_ECA_MGMT.yaml", - "type": "HEAT", - "data": [{ - "file": "sg_eca_mgmt.env", - "type": "HEAT_ENV" - }] - }] + "name": "multiple_not_nested", + "description": "multiple heat files in zip, no nesting", + "version": "2013-05-23", + "data": [ + { + "file": "cmaui.yml", + "type": "HEAT", + "data": [ + { + "file": "cmaui.env", + "type": "HEAT_ENV" + } + ] + }, + { + "file": "eca_oam.yaml", + "type": "HEAT", + "data": [ + { + "file": "eca_oam.env", + "type": "HEAT_ENV" + } + ] + }, + { + "file": "MMSC_Capacity_Line.yml", + "type": "HEAT", + "data": [ + { + "file": "MMSC_Capacity_Line_1.env", + "type": "HEAT_ENV" + } + ] + }, + { + "file": "SG_ECA_MGMT.yaml", + "type": "HEAT", + "data": [ + { + "file": "sg_eca_mgmt.env", + "type": "HEAT_ENV" + } + ] + } + ] }
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/inputs/cmaui.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/inputs/cmaui.yml index 6d094be26f..83d398d218 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/inputs/cmaui.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/inputs/cmaui.yml @@ -3,7 +3,7 @@ heat_template_version: 2013-05-23 ################################# # # Changes from MSO 01/26/2016 -# Updated per ECOMP feedback +# Updated per OPENECOMP feedback # ################################# diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/inputs/eca_oam.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/inputs/eca_oam.yaml index db5ab5c26b..885e61c91c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/inputs/eca_oam.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/inputs/eca_oam.yaml @@ -3,7 +3,7 @@ heat_template_version: 2013-05-23 ########################################################## # # Changes from MSO -# - Updated per ECOMP Feedback +# - Updated per OPENECOMP Feedback # # ########################################################## |