diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out')
3 files changed, 284 insertions, 284 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml index 14b52bc131..49ac20889a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -1493,43 +1493,41 @@ node_types: org.openecomp.resource.abstract.nodes.heat.pcm_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_pcm_port_0_network_role: + availabilityzone_name: type: string + description: availabilityzone name required: true status: SUPPORTED - port_pcm_port_1_network_role_tag: + pcm_image_name: type: string + description: PCRF CM image name required: true status: SUPPORTED - availabilityzone_name: - type: string - description: availabilityzone name + port_pcm_port_00_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pcm_port_0_vlan_requirements: + port_pcm_port_01_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - pcm_image_name: + type: org.openecomp.datatypes.network.IpRequirements + port_pcm_port_00_subnetpoolid: type: string - description: PCRF CM image name required: true status: SUPPORTED - port_pcm_port_0_order: - type: integer - required: true - status: SUPPORTED - port_pcm_port_0_subnetpoolid: - type: string + port_pcm_port_01_vlan_requirements: + type: list required: true status: SUPPORTED - port_pcm_port_1_subnetpoolid: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pcm_port_01_network_role: type: string required: true status: SUPPORTED - port_pcm_port_0_network_role_tag: + port_pcm_port_01_subnetpoolid: type: string required: true status: SUPPORTED @@ -1543,33 +1541,29 @@ node_types: description: CPS network mask required: true status: SUPPORTED - port_pcm_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pcm_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED oam_net_name: type: string description: OAM network name required: true status: SUPPORTED - port_pcm_port_1_network_role: + port_pcm_port_01_network_role_tag: type: string required: true status: SUPPORTED - server_group: + port_pcm_port_00_network_role: type: string required: true status: SUPPORTED - port_pcm_port_0_ip_requirements: + port_pcm_port_00_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements + server_group: + type: string + required: true + status: SUPPORTED oam_net_gw: type: string description: CPS network gateway @@ -1585,36 +1579,42 @@ node_types: description: CPS network ip required: true status: SUPPORTED - port_pcm_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pcm_port_00_network_role_tag: + type: string required: true status: SUPPORTED - port_pcm_port_1_vlan_requirements: - type: list + port_pcm_port_01_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements pcm_flavor_name: type: string description: flavor name of PCRF CM instance required: true status: SUPPORTED + port_pcm_port_00_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pcm_port_00_order: + type: integer + required: true + status: SUPPORTED + port_pcm_port_01_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED pcm_vol: type: string description: CPS Cluman Cinder Volume required: true status: SUPPORTED - port_pcm_port_1_ip_requirements: + port_pcm_port_00_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pcm_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED + type: org.openecomp.datatypes.network.VlanRequirements cps_net_name: type: string description: CPS network name @@ -1630,8 +1630,8 @@ node_types: description: CPS network mask required: true status: SUPPORTED - port_pcm_port_1_order: - type: integer + port_pcm_port_01_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED attributes: @@ -1640,14 +1640,14 @@ node_types: description: the pcm nova service id status: SUPPORTED requirements: - - dependency_pcm_port_1: + - dependency_pcm_port_00: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pcm_port_1: + - link_pcm_port_00: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1667,57 +1667,55 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pcm_port_0: + - dependency_pcm_port_01: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pcm_port_0: + - link_pcm_port_01: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - network.incoming.packets.rate_pcm_port_0: + cpu_server_pcm: type: org.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_server_pcm: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pcm_port_00: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pcm_port_1: + memory_server_pcm: type: org.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_pcm_port_1: + network.incoming.packets_pcm_port_01: type: org.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_server_pcm: + disk.write.requests_server_pcm: type: org.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_server_pcm: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pcm_port_01: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pcm_port_0: + network.incoming.packets_pcm_port_00: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1741,150 +1739,132 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.usage_server_pcm: + network.outgoing.packets.rate_pcm_port_00: type: org.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_server_pcm: + network.incoming.bytes_pcm_port_00: type: org.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_server_pcm: + network.incoming.bytes_pcm_port_01: type: org.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_server_pcm: + disk.device.usage_server_pcm: type: org.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_server_pcm: + disk.allocation_server_pcm: type: org.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_server_pcm: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pcm_port_00: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.device.latency_server_pcm: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pcm_port_01: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pcm_port_0: + disk.usage_server_pcm: type: org.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_pcm_port_1: + disk.device.write.bytes_server_pcm: type: org.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_pcm_port_0: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - binding_pcm_port_1: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - memory.usage_server_pcm: + network.outgoing.bytes_pcm_port_00: type: org.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_server_pcm: + disk.root.size_server_pcm: type: org.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_server_pcm: + disk.ephemeral.size_server_pcm: type: org.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_server_pcm: - type: tosca.capabilities.OperatingSystem - occurrences: - - 1 - - UNBOUNDED - disk.read.bytes_server_pcm: + disk.device.latency_server_pcm: type: org.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_pcm_port_0: + network.outgoing.packets.rate_pcm_port_01: type: org.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_pcm_port_1: + memory.usage_server_pcm: type: org.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_pcm_port_1: - type: tosca.capabilities.Node + network.outgoing.bytes_pcm_port_01: + type: org.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_pcm_port_0: + disk.read.requests_server_pcm: type: org.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_server_pcm: + disk.capacity_server_pcm: type: org.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_pcm_port_0: - type: tosca.capabilities.Node + os_server_pcm: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pcm_port_1: + disk.read.bytes_server_pcm: type: org.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_pcm_port_0: - type: tosca.capabilities.Attachment + disk.device.read.bytes_server_pcm: + type: org.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_pcm_port_1: - type: tosca.capabilities.Attachment + network.incoming.bytes.rate_pcm_port_00: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -1893,6 +1873,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_pcm_port_01: + type: org.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_server_pcm: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1946,61 +1932,75 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.requests.rate_server_pcm: + network.outgoing.bytes.rate_pcm_port_01: type: org.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_server_pcm: + network.incoming.packets.rate_pcm_port_01: type: org.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_server_pcm: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent - occurrences: - - 1 - - UNBOUNDED - cpu.delta_server_pcm: + network.incoming.packets.rate_pcm_port_00: type: org.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_pcm_port_1: + binding_pcm_port_01: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + disk.write.requests.rate_server_pcm: type: org.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_pcm_port_0: + binding_pcm_port_00: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + disk.device.write.bytes.rate_server_pcm: type: org.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_server_pcm: - type: tosca.capabilities.network.Bindable + host_server_pcm: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pcm_port_0: + network.outgoing.bytes.rate_pcm_port_00: type: org.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_server_pcm: + cpu.delta_server_pcm: type: org.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_pcm_port_1: + binding_server_pcm: + type: tosca.capabilities.network.Bindable + occurrences: + - 1 + - UNBOUNDED + disk.device.capacity_server_pcm: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2035,7 +2035,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pcm_port_0: + network.outpoing.packets_pcm_port_00: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2047,7 +2047,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pcm_port_1: + network.outpoing.packets_pcm_port_01: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5375,4 +5375,4 @@ node_types: type: tosca.capabilities.Node occurrences: - 1 - - UNBOUNDED + - 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/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml index 6f11bd999a..e4577fe60e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml @@ -222,32 +222,31 @@ topology_template: directives: - substitutable properties: - server_group: BE_Affinity_group - port_pcm_port_1_network_role_tag: oam - port_pcm_port_0_ip_requirements: + port_pcm_port_00_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false + server_group: BE_Affinity_group pcm_image_name: get_input: pcm_image_name - security_group_name: jsa_security_group - port_pcm_port_1_mac_requirements: + port_pcm_port_00_mac_requirements: mac_count_required: is_required: false - pcm_flavor_name: - get_input: pcm_flavor_name - service_template_filter: - substitute_service_template: nested-pcm_v0.1ServiceTemplate.yaml - port_pcm_port_1_ip_requirements: + security_group_name: jsa_security_group + port_pcm_port_01_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_pcm_port_0_network_role_tag: cps - port_pcm_port_0_mac_requirements: + port_pcm_port_00_network_role_tag: cps + pcm_flavor_name: + get_input: pcm_flavor_name + service_template_filter: + substitute_service_template: nested-pcm_v0.1ServiceTemplate.yaml + port_pcm_port_01_mac_requirements: mac_count_required: is_required: false pcm_server_name: @@ -255,8 +254,9 @@ topology_template: - pcm_server_names - 0 cps_net_name: nested_network + port_pcm_port_01_network_role_tag: oam requirements: - - link_pcm_port_0: + - link_pcm_port_00: capability: tosca.capabilities.network.Linkable node: nested_network relationship: tosca.relationships.network.LinksTo @@ -656,11 +656,11 @@ topology_template: direction: ingress requirements: - port: - capability: attachment_pcm_port_0 + capability: attachment_pcm_port_00 node: 4p_nested relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_pcm_port_1 + capability: attachment_pcm_port_01 node: 4p_nested relationship: org.openecomp.relationships.AttachesTo - port: @@ -844,4 +844,4 @@ topology_template: name: def affinity: host targets: - - BE_Affinity_group + - BE_Affinity_group
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-pcm_v0.1ServiceTemplate.yaml index 198b4c8e9a..293a19f311 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -11,39 +11,38 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_pcm_port_0_network_role: - type: string - required: true - port_pcm_port_1_network_role_tag: - type: string - required: true availabilityzone_name: label: availabilityzone name hidden: false immutable: false type: string description: availabilityzone name - port_pcm_port_0_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements pcm_image_name: label: image name hidden: false immutable: false type: string description: PCRF CM image name - port_pcm_port_0_order: - type: integer + port_pcm_port_00_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pcm_port_0_subnetpoolid: + port_pcm_port_01_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pcm_port_00_subnetpoolid: type: string required: true - port_pcm_port_1_subnetpoolid: + port_pcm_port_01_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pcm_port_01_network_role: type: string required: true - port_pcm_port_0_network_role_tag: + port_pcm_port_01_subnetpoolid: type: string required: true pcm_server_name: @@ -58,30 +57,27 @@ topology_template: immutable: false type: string description: CPS network mask - port_pcm_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pcm_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true oam_net_name: label: OAM network name hidden: false immutable: false type: string description: OAM network name - port_pcm_port_1_network_role: + port_pcm_port_01_network_role_tag: type: string required: true - server_group: - hidden: false - immutable: false + port_pcm_port_00_network_role: type: string - port_pcm_port_0_ip_requirements: + required: true + port_pcm_port_00_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements + server_group: + hidden: false + immutable: false + type: string oam_net_gw: label: CPS network gateway hidden: false @@ -100,34 +96,38 @@ topology_template: immutable: false type: string description: CPS network ip - port_pcm_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pcm_port_00_network_role_tag: + type: string required: true - port_pcm_port_1_vlan_requirements: - type: list + port_pcm_port_01_order: + type: integer required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements pcm_flavor_name: label: PCRF CM flavor name hidden: false immutable: false type: string description: flavor name of PCRF CM instance + port_pcm_port_00_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pcm_port_00_order: + type: integer + required: true + port_pcm_port_01_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true pcm_vol: label: CPS Cluman Cinder Volume hidden: false immutable: false type: string description: CPS Cluman Cinder Volume - port_pcm_port_1_ip_requirements: + port_pcm_port_00_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pcm_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true + type: org.openecomp.datatypes.network.VlanRequirements cps_net_name: label: CPS network name hidden: false @@ -146,36 +146,36 @@ topology_template: immutable: false type: string description: CPS network mask - port_pcm_port_1_order: - type: integer + port_pcm_port_01_exCP_naming: + type: org.openecomp.datatypes.Naming required: true node_templates: - pcm_port_1: + pcm_port_00: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: ip_requirements: - get_input: port_pcm_port_1_ip_requirements + get_input: port_pcm_port_00_ip_requirements security_groups: - get_input: security_group_name network_role: - get_input: port_pcm_port_1_network_role + get_input: port_pcm_port_00_network_role fixed_ips: - ip_address: - get_input: oam_net_ip + get_input: cps_net_ip subnetpoolid: - get_input: port_pcm_port_1_subnetpoolid + get_input: port_pcm_port_00_subnetpoolid mac_requirements: - get_input: port_pcm_port_1_mac_requirements + get_input: port_pcm_port_00_mac_requirements exCP_naming: - get_input: port_pcm_port_1_exCP_naming + get_input: port_pcm_port_00_exCP_naming vlan_requirements: - get_input: port_pcm_port_1_vlan_requirements + get_input: port_pcm_port_00_vlan_requirements network_role_tag: - get_input: port_pcm_port_1_network_role_tag + get_input: port_pcm_port_00_network_role_tag network: - get_input: oam_net_name + get_input: cps_net_name order: - get_input: port_pcm_port_1_order + get_input: port_pcm_port_00_order requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -197,32 +197,32 @@ topology_template: scheduler_hints: group: get_input: server_group - pcm_port_0: + pcm_port_01: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: ip_requirements: - get_input: port_pcm_port_0_ip_requirements + get_input: port_pcm_port_01_ip_requirements security_groups: - get_input: security_group_name network_role: - get_input: port_pcm_port_0_network_role + get_input: port_pcm_port_01_network_role fixed_ips: - ip_address: - get_input: cps_net_ip + get_input: oam_net_ip subnetpoolid: - get_input: port_pcm_port_0_subnetpoolid + get_input: port_pcm_port_01_subnetpoolid mac_requirements: - get_input: port_pcm_port_0_mac_requirements + get_input: port_pcm_port_01_mac_requirements exCP_naming: - get_input: port_pcm_port_0_exCP_naming + get_input: port_pcm_port_01_exCP_naming vlan_requirements: - get_input: port_pcm_port_0_vlan_requirements + get_input: port_pcm_port_01_vlan_requirements network_role_tag: - get_input: port_pcm_port_0_network_role_tag + get_input: port_pcm_port_01_network_role_tag network: - get_input: cps_net_name + get_input: oam_net_name order: - get_input: port_pcm_port_0_order + get_input: port_pcm_port_01_order requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -235,9 +235,9 @@ topology_template: heat_file: ../Artifacts/nested-pcm_v0.1.yaml description: heat template that creates PCRF Cluman stack members: - - pcm_port_1 + - pcm_port_00 - server_pcm - - pcm_port_0 + - pcm_port_01 outputs: server_pcm_id: description: the pcm nova service id @@ -245,27 +245,27 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.pcm_server capabilities: - network.incoming.packets.rate_pcm_port_0: - - pcm_port_0 - - network.incoming.packets.rate cpu_server_pcm: - server_pcm - cpu - network.incoming.packets.rate_pcm_port_1: - - pcm_port_1 - - network.incoming.packets.rate - network.outpoing.packets_pcm_port_1: - - pcm_port_1 - - network.outpoing.packets + feature_pcm_port_00: + - pcm_port_00 + - feature memory_server_pcm: - server_pcm - memory + network.incoming.packets_pcm_port_01: + - pcm_port_01 + - network.incoming.packets disk.write.requests_server_pcm: - server_pcm - disk.write.requests - network.outpoing.packets_pcm_port_0: - - pcm_port_0 - - network.outpoing.packets + feature_pcm_port_01: + - pcm_port_01 + - feature + network.incoming.packets_pcm_port_00: + - pcm_port_00 + - network.incoming.packets disk.device.iops_server_pcm: - server_pcm - disk.device.iops @@ -275,18 +275,36 @@ topology_template: disk.device.write.requests_server_pcm: - server_pcm - disk.device.write.requests + network.outgoing.packets.rate_pcm_port_00: + - pcm_port_00 + - network.outgoing.packets.rate + network.incoming.bytes_pcm_port_00: + - pcm_port_00 + - network.incoming.bytes + network.incoming.bytes_pcm_port_01: + - pcm_port_01 + - network.incoming.bytes disk.device.usage_server_pcm: - server_pcm - disk.device.usage disk.allocation_server_pcm: - server_pcm - disk.allocation + attachment_pcm_port_00: + - pcm_port_00 + - attachment + attachment_pcm_port_01: + - pcm_port_01 + - attachment disk.usage_server_pcm: - server_pcm - disk.usage disk.device.write.bytes_server_pcm: - server_pcm - disk.device.write.bytes + network.outgoing.bytes_pcm_port_00: + - pcm_port_00 + - network.outgoing.bytes disk.root.size_server_pcm: - server_pcm - disk.root.size @@ -296,21 +314,15 @@ topology_template: disk.device.latency_server_pcm: - server_pcm - disk.device.latency - network.incoming.bytes_pcm_port_0: - - pcm_port_0 - - network.incoming.bytes - network.incoming.bytes_pcm_port_1: - - pcm_port_1 - - network.incoming.bytes - binding_pcm_port_0: - - pcm_port_0 - - binding - binding_pcm_port_1: - - pcm_port_1 - - binding + network.outgoing.packets.rate_pcm_port_01: + - pcm_port_01 + - network.outgoing.packets.rate memory.usage_server_pcm: - server_pcm - memory.usage + network.outgoing.bytes_pcm_port_01: + - pcm_port_01 + - network.outgoing.bytes disk.read.requests_server_pcm: - server_pcm - disk.read.requests @@ -323,36 +335,18 @@ topology_template: disk.read.bytes_server_pcm: - server_pcm - disk.read.bytes - network.outgoing.packets.rate_pcm_port_0: - - pcm_port_0 - - network.outgoing.packets.rate - network.outgoing.packets.rate_pcm_port_1: - - pcm_port_1 - - network.outgoing.packets.rate - feature_pcm_port_1: - - pcm_port_1 - - feature - network.outgoing.bytes_pcm_port_0: - - pcm_port_0 - - network.outgoing.bytes disk.device.read.bytes_server_pcm: - server_pcm - disk.device.read.bytes - feature_pcm_port_0: - - pcm_port_0 - - feature - network.outgoing.bytes_pcm_port_1: - - pcm_port_1 - - network.outgoing.bytes - attachment_pcm_port_0: - - pcm_port_0 - - attachment - attachment_pcm_port_1: - - pcm_port_1 - - attachment + network.incoming.bytes.rate_pcm_port_00: + - pcm_port_00 + - network.incoming.bytes.rate endpoint_server_pcm: - server_pcm - endpoint + network.incoming.bytes.rate_pcm_port_01: + - pcm_port_01 + - network.incoming.bytes.rate disk.device.read.requests.rate_server_pcm: - server_pcm - disk.device.read.requests.rate @@ -380,36 +374,42 @@ topology_template: cpu_util_server_pcm: - server_pcm - cpu_util + network.outgoing.bytes.rate_pcm_port_01: + - pcm_port_01 + - network.outgoing.bytes.rate + network.incoming.packets.rate_pcm_port_01: + - pcm_port_01 + - network.incoming.packets.rate + network.incoming.packets.rate_pcm_port_00: + - pcm_port_00 + - network.incoming.packets.rate + binding_pcm_port_01: + - pcm_port_01 + - binding disk.write.requests.rate_server_pcm: - server_pcm - disk.write.requests.rate + binding_pcm_port_00: + - pcm_port_00 + - binding disk.device.write.bytes.rate_server_pcm: - server_pcm - disk.device.write.bytes.rate host_server_pcm: - server_pcm - host + network.outgoing.bytes.rate_pcm_port_00: + - pcm_port_00 + - network.outgoing.bytes.rate cpu.delta_server_pcm: - server_pcm - cpu.delta - network.outgoing.bytes.rate_pcm_port_1: - - pcm_port_1 - - network.outgoing.bytes.rate - network.incoming.packets_pcm_port_0: - - pcm_port_0 - - network.incoming.packets binding_server_pcm: - server_pcm - binding - network.outgoing.bytes.rate_pcm_port_0: - - pcm_port_0 - - network.outgoing.bytes.rate disk.device.capacity_server_pcm: - server_pcm - disk.device.capacity - network.incoming.packets_pcm_port_1: - - pcm_port_1 - - network.incoming.packets instance_server_pcm: - server_pcm - instance @@ -425,31 +425,31 @@ topology_template: feature_server_pcm: - server_pcm - feature - network.incoming.bytes.rate_pcm_port_0: - - pcm_port_0 - - network.incoming.bytes.rate + network.outpoing.packets_pcm_port_00: + - pcm_port_00 + - network.outpoing.packets disk.write.bytes.rate_server_pcm: - server_pcm - disk.write.bytes.rate - network.incoming.bytes.rate_pcm_port_1: - - pcm_port_1 - - network.incoming.bytes.rate + network.outpoing.packets_pcm_port_01: + - pcm_port_01 + - network.outpoing.packets requirements: - link_pcm_port_0: - - pcm_port_0 - - link - link_pcm_port_1: - - pcm_port_1 - - link + dependency_pcm_port_00: + - pcm_port_00 + - dependency local_storage_server_pcm: - server_pcm - local_storage - dependency_pcm_port_0: - - pcm_port_0 + dependency_pcm_port_01: + - pcm_port_01 - dependency + link_pcm_port_01: + - pcm_port_01 + - link + link_pcm_port_00: + - pcm_port_00 + - link dependency_server_pcm: - server_pcm - - dependency - dependency_pcm_port_1: - - pcm_port_1 - - dependency + - dependency
\ No newline at end of file |